Merge pull request #600 from xmtp/ar/consent-proofs

fix: updated consent proof text

package.json

@@ -98,6 +98,7 @@
   },
   "dependencies": {
     "@noble/secp256k1": "1.7.1",
+    "@xmtp/consent-proof-signature": "^0.1.2",
     "@xmtp/proto": "3.54.0",
     "@xmtp/user-preferences-bindings-wasm": "^0.3.6",
     "async-mutex": "^0.5.0",

src/Contacts.ts

@@ -1,6 +1,7 @@
+import { createConsentMessage } from '@xmtp/consent-proof-signature'
 import { privatePreferences, type invitation } from '@xmtp/proto'
 import { hashMessage, hexToBytes } from 'viem'
-import { ecdsaSignerKey, WalletSigner } from '@/crypto/Signature'
+import { ecdsaSignerKey } from '@/crypto/Signature'
 import { splitSignature } from '@/crypto/utils'
 import type { EnvelopeWithMessage } from '@/utils/async'
 import { fromNanoString } from '@/utils/date'
@@ -275,10 +276,7 @@ export class Contacts {
       return false
     }
     const signatureData = splitSignature(signature as `0x${string}`)
-    const message = WalletSigner.consentProofRequestText(
-      peerAddress,
-      timestampMs
-    )
+    const message = createConsentMessage(peerAddress, timestampMs)
     const digest = hexToBytes(hashMessage(message))
     // Recover public key
     const publicKey = ecdsaSignerKey(digest, signatureData)

src/crypto/Signature.ts

@@ -159,20 +159,6 @@ export class WalletSigner implements KeySigner {
     )
   }
 
-  static consentProofRequestText(
-    peerAddress: string,
-    timestamp: number
-  ): string {
-    return (
-      'XMTP : Grant inbox consent to sender\n' +
-      '\n' +
-      `Current Time: ${timestamp}\n` +
-      `From Address: ${peerAddress}\n` +
-      '\n' +
-      'For more info: https://xmtp.org/signatures/'
-    )
-  }
-
   static signerKey(
     key: SignedPublicKey,
     signature: ECDSACompactWithRecovery

test/Contacts.test.ts

@@ -1,3 +1,4 @@
+import { createConsentMessage } from '@xmtp/consent-proof-signature'
 import { invitation } from '@xmtp/proto'
 import Client from '@/Client'
 import { Contacts } from '@/Contacts'
@@ -202,10 +203,7 @@ describe('Contacts', () => {
         env: 'local',
       })
       const timestamp = Date.now()
-      const consentMessage = WalletSigner.consentProofRequestText(
-        bo.address,
-        timestamp
-      )
+      const consentMessage = createConsentMessage(bo.address, timestamp)
       const signedMessage = await keySigner.wallet.signMessage(consentMessage)
       const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
         signature: signedMessage,
@@ -239,10 +237,7 @@ describe('Contacts', () => {
         env: 'local',
       })
       const timestamp = Date.now()
-      const consentMessage = WalletSigner.consentProofRequestText(
-        bo.address,
-        timestamp
-      )
+      const consentMessage = createConsentMessage(bo.address, timestamp)
       const signedMessage = await keySigner.wallet.signMessage(consentMessage)
       const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
         signature: signedMessage,
@@ -272,10 +267,7 @@ describe('Contacts', () => {
         env: 'local',
       })
       const timestamp = Date.now()
-      const consentMessage = WalletSigner.consentProofRequestText(
-        bo.address,
-        timestamp + 1
-      )
+      const consentMessage = createConsentMessage(bo.address, timestamp + 1)
       const signedMessage = await keySigner.wallet.signMessage(consentMessage)
       const consentProofPayload = invitation.ConsentProofPayload.fromPartial({
         signature: signedMessage,

yarn.lock

@@ -3154,6 +3154,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@xmtp/consent-proof-signature@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "@xmtp/consent-proof-signature@npm:0.1.2"
+  dependencies:
+    "@xmtp/proto": "npm:3.56.0"