feat: verify consent proof signature

Verified consent proofs
Added tests for consent proofs

src/Invitation.ts

@@ -26,6 +26,7 @@ export class InvitationV1 implements invitation.InvitationV1 {
     topic,
     context,
     aes256GcmHkdfSha256,
+    consentProof,
   }: invitation.InvitationV1) {
     if (!topic || !topic.length) {
       throw new Error('Missing topic')
@@ -40,6 +41,7 @@ export class InvitationV1 implements invitation.InvitationV1 {
     this.topic = topic
     this.context = context
     this.aes256GcmHkdfSha256 = aes256GcmHkdfSha256
+    this.consentProof = consentProof
   }
 
   static createRandom(

src/conversations/Conversations.ts

@@ -5,13 +5,16 @@ import type {
   messageApi,
 } from '@xmtp/proto'
 import Long from 'long'
+import { hashMessage, hexToBytes } from 'viem'
 import { SortDirection, type OnConnectionLostCallback } from '@/ApiClient'
 import type { ListMessagesOptions } from '@/Client'
 import type Client from '@/Client'
 import {
   PublicKeyBundle,
   SignedPublicKeyBundle,
 } from '@/crypto/PublicKeyBundle'
+import { ecdsaSignerKey, WalletSigner } from '@/crypto/Signature'
+import { splitSignature } from '@/crypto/utils'
 import type { InvitationContext } from '@/Invitation'
 import { DecodedMessage, MessageV1 } from '@/Message'
 import Stream from '@/Stream'
@@ -157,6 +160,43 @@ export default class Conversations<ContentTypes = any> {
     return this.decodeInvites(envelopes)
   }
 
+  private async validateConsentSignature(
+    signature: `0x${string}`,
+    timestamp: number,
+    peerAddress: string
+  ): Promise<boolean> {
+    const signatureData = splitSignature(signature)
+    const message = WalletSigner.consentProofRequestText(peerAddress, timestamp)
+    const digest = hexToBytes(hashMessage(message))
+    // Recover public key
+    const publicKey = ecdsaSignerKey(digest, signatureData)
+    if (!publicKey) {
+      return false
+    }
+    console.log('Recovered public key: ', typeof publicKey)
+    console.log('here1116', publicKey.getEthereumAddress())
+    return publicKey.getEthereumAddress() === this.client.address
+  }
+
+  private async handleConsentProof(
+    consentProof: invitation.ConsentProofPayload,
+    peerAddress: string
+  ): Promise<void> {
+    const { signature, timestamp } = consentProof
+    const isValid = await this.validateConsentSignature(
+      signature as `0x${string}`,
+      Number(timestamp),
+      peerAddress
+    )
+    if (!isValid) {
+      return
+    }
+    const consentState = await this.client.contacts.consentState(peerAddress)
+    if (consentState === 'unknown') {
+      this.client.contacts.allow([peerAddress])
+    }
+  }
+
   private async decodeInvites(
     envelopes: messageApi.Envelope[],
     shouldThrow = false
@@ -174,13 +214,12 @@ export default class Conversations<ContentTypes = any> {
     const out: ConversationV2<ContentTypes>[] = []
     for (const response of responses) {
       try {
-        console.log(
-          'here11113',
-          !!response.result?.conversation?.consentProofPayload
-        )
-        // if (response.result?.conversation?.consentProofPayload) {
-
-        // }
+        if (response.result?.conversation?.consentProofPayload) {
+          this.handleConsentProof(
+            response.result.conversation.consentProofPayload,
+            response.result.conversation.peerAddress
+          )
+        }
         out.push(this.saveInviteResponseToConversation(response))
       } catch (e) {
         console.warn('Error saving invite response to conversation: ', e)
@@ -498,7 +537,6 @@ export default class Conversations<ContentTypes = any> {
     if (contact instanceof PublicKeyBundle && !context?.conversationId) {
       return new ConversationV1(this.client, peerAddress, new Date())
     }
-
     // If no conversationId, check and see if we have an existing V1 conversation
     if (!context?.conversationId) {
       const v1Convos = await this.listV1Conversations()
@@ -548,7 +586,6 @@ export default class Conversations<ContentTypes = any> {
       if (newItemMatch) {
         return newItemMatch
       }
-
       return this.createV2Convo(
         contact as SignedPublicKeyBundle,
         context,

test/conversations/Conversations.test.ts

@@ -1,8 +1,6 @@
 import { invitation } from '@xmtp/proto'
 import Client from '@/Client'
 import { ConversationV1, ConversationV2 } from '@/conversations/Conversation'
-// import { PrivateKey, SignedPrivateKey } from '@/crypto/PrivateKey'
-// import { PublicKey, SignedPublicKey } from '@/crypto/PublicKey'
 import { WalletSigner } from '@/crypto/Signature'
 import { sleep } from '@/utils/async'
 import { buildDirectMessageTopic, buildUserIntroTopic } from '@/utils/topic'
@@ -290,30 +288,103 @@ describe('conversations', () => {
       const wallet = newWallet()
       const keySigner = new WalletSigner(wallet)
       const alixAddress = await keySigner.wallet.getAddress()
+      const alix = await Client.create(wallet, {
+        env: 'local',
+      })
       const timestamp = Date.now()
       const consentMessage = WalletSigner.consentProofRequestText(
-        bob.address,
+        bo.address,
+        timestamp
+      )
+      const signedMessage = await keySigner.wallet.signMessage(consentMessage)
+      const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
+        signature: signedMessage,
+        timestamp,
+        payloadVersion:
+          invitation.ConsentProofPayloadVersion.CONSENT_PROOF_PAYLOAD_VERSION_1,
+      })
+      const boConvo = await bo.conversations.newConversation(
+        alixAddress,
+        undefined,
+        consentProofPayload
+      )
+      const conversations = await alix.conversations.list()
+      const convo = conversations.find((c) => c.topic === boConvo.topic)
+      expect(convo).toBeTruthy()
+      await alix.contacts.refreshConsentList()
+      const isApproved = await alix.contacts.isAllowed(bo.address)
+      expect(isApproved).toBeTruthy()
+      await alix.close()
+      await bo.close()
+    })
+
+    it('consent proof yields to network consent', async () => {
+      const bo = await newLocalHostClient()
+      const wallet = newWallet()
+      const keySigner = new WalletSigner(wallet)
+      const alixAddress = await keySigner.wallet.getAddress()
+      const alix = await Client.create(wallet, {
+        env: 'local',
+      })
+      const timestamp = Date.now()
+      const consentMessage = WalletSigner.consentProofRequestText(
+        bo.address,
         timestamp
       )
       const signedMessage = await keySigner.wallet.signMessage(consentMessage)
       const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
         signature: signedMessage,
         timestamp,
+        payloadVersion:
+          invitation.ConsentProofPayloadVersion.CONSENT_PROOF_PAYLOAD_VERSION_1,
       })
       const boConvo = await bo.conversations.newConversation(
         alixAddress,
         undefined,
         consentProofPayload
       )
+      await alix.contacts.deny([bo.address])
+      const conversations = await alix.conversations.list()
+      const convo = conversations.find((c) => c.topic === boConvo.topic)
+      expect(convo).toBeTruthy()
+      await alix.contacts.refreshConsentList()
+      const isDenied = await alix.contacts.isDenied(bo.address)
+      expect(isDenied).toBeTruthy()
+      await alix.close()
+      await bo.close()
+    })
+
+    it('consent proof correctly validates', async () => {
+      const bo = await newLocalHostClient()
+      const wallet = newWallet()
+      const keySigner = new WalletSigner(wallet)
+      const alixAddress = await keySigner.wallet.getAddress()
       const alix = await Client.create(wallet, {
         env: 'local',
       })
+      const timestamp = Date.now() + 1
+      const consentMessage = WalletSigner.consentProofRequestText(
+        bo.address,
+        timestamp
+      )
+      const signedMessage = await keySigner.wallet.signMessage(consentMessage)
+      const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
+        signature: signedMessage,
+        timestamp,
+        payloadVersion:
+          invitation.ConsentProofPayloadVersion.CONSENT_PROOF_PAYLOAD_VERSION_1,
+      })
+      const boConvo = await bo.conversations.newConversation(
+        alixAddress,
+        undefined,
+        consentProofPayload
+      )
       const conversations = await alix.conversations.list()
       const convo = conversations.find((c) => c.topic === boConvo.topic)
       expect(convo).toBeTruthy()
       await alix.contacts.refreshConsentList()
-      const isApproved = await alix.contacts.isAllowed(bob.address)
-      expect(isApproved).toBeTruthy()
+      const isAllowed = await alix.contacts.isAllowed(bo.address)
+      expect(isAllowed).toBeFalsy()
       await alix.close()
       await bo.close()
     })