Merge branch 'main' into cv/group-spike

package.json

@@ -44,10 +44,10 @@
   "license": "MIT",
   "homepage": "https://github.com/xmtp/xmtp-react-native#readme",
   "dependencies": {
+    "@ethersproject/bytes": "^5.7.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@xmtp/proto": "^3.25.0",
-    "buffer": "^6.0.3",
-    "ethers": "^5.7.2"
+    "buffer": "^6.0.3"
   },
   "devDependencies": {
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
@@ -58,7 +58,8 @@
     "expo-modules-core": "^1.5.9",
     "prettier": "^3.1.0",
     "semantic-release": "^21.0.1",
-    "typedoc": "^0.25.2"
+    "typedoc": "^0.25.2",
+    "viem": "^2.4.0"
   },
   "peerDependencies": {
     "expo": "*",

src/hooks/useClient.ts

@@ -1,11 +1,11 @@
-import { Signer } from 'ethers'
 import { useCallback, useRef, useState } from 'react'
 
 import { useXmtp } from './useXmtp'
 import { Client, ClientOptions } from '../lib/Client'
+import { Signer } from '../lib/Signer'
 
 interface InitializeClientOptions {
-  signer: Signer
+  signer: Signer | null
   options?: ClientOptions
 }
 

src/lib/Client.ts

@@ -1,5 +1,6 @@
-import { Signer, utils } from 'ethers'
+import { splitSignature } from '@ethersproject/bytes'
 import { Subscription } from 'expo-modules-core'
+import type { WalletClient } from 'viem'
 
 import Contacts from './Contacts'
 import type {
@@ -11,6 +12,7 @@ import Conversations from './Conversations'
 import { DecodedMessage } from './DecodedMessage'
 import { TextCodec } from './NativeCodecs/TextCodec'
 import { Query } from './Query'
+import { Signer, getSigner } from './Signer'
 import { hexToBytes } from './util'
 import * as XMTPModule from '../index'
 
@@ -49,7 +51,7 @@ export class Client<ContentTypes> {
   static async create<
     ContentCodecs extends XMTPModule.ContentCodec<any>[] = [],
   >(
-    signer: Signer,
+    wallet: Signer | WalletClient | null,
     opts?: Partial<ClientOptions> & { codecs?: ContentCodecs }
   ): Promise<
     Client<
@@ -59,6 +61,10 @@ export class Client<ContentTypes> {
     const options = defaultOptions(opts)
     const { enableSubscription, createSubscription } =
       this.setupSubscriptions(options)
+    const signer = getSigner(wallet)
+    if (!signer) {
+      throw new Error('Signer is not configured')
+    }
     return new Promise<
       Client<
         ExtractDecodedType<[...ContentCodecs, TextCodec][number]> | undefined
@@ -71,7 +77,7 @@ export class Client<ContentTypes> {
             const request: { id: string; message: string } = message
             try {
               const signatureString = await signer.signMessage(request.message)
-              const eSig = utils.splitSignature(signatureString)
+              const eSig = splitSignature(signatureString)
               const r = hexToBytes(eSig.r)
               const s = hexToBytes(eSig.s)
               const sigBytes = new Uint8Array(65)

src/lib/Signer.ts

@@ -0,0 +1,41 @@
+import type { WalletClient } from 'viem'
+
+export interface Signer {
+  getAddress: () => Promise<string>
+  signMessage: (message: string) => Promise<string>
+}
+
+export function getSigner(wallet: Signer | WalletClient | null): Signer | null {
+  if (!wallet) {
+    return null
+  }
+  if (isWalletClient(wallet)) {
+    return convertWalletClientToSigner(wallet)
+  }
+  if (typeof wallet.getAddress !== 'function') {
+    throw new Error('Unknown wallet type')
+  }
+  return wallet
+}
+
+function isWalletClient(wallet: Signer | WalletClient): wallet is WalletClient {
+  return 'type' in wallet && wallet.type === 'walletClient'
+}
+
+export function convertWalletClientToSigner(
+  walletClient: WalletClient
+): Signer {
+  const { account } = walletClient
+  if (!account || !account.address) {
+    throw new Error('WalletClient is not configured')
+  }
+
+  return {
+    getAddress: async () => account.address,
+    signMessage: async (message: string | Uint8Array) =>
+      walletClient.signMessage({
+        message: typeof message === 'string' ? message : { raw: message },
+        account,
+      }),
+  }
+}