Merge pull request #21 from cometh-hq/develop

v1.1.6

Author: yoanslvy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cometh/connect-sdk-viem",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Viem SDK Cometh Connect",
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.4",
-    "@cometh/connect-sdk": "^1.2.10",
+    "@cometh/connect-sdk": "^1.2.11",
     "@rainbow-me/rainbowkit": "^1.3.0",
     "@types/babel__core": "^7.20.0",
     "viem": "^1.16.2",

src/wagmi/connector.ts

@@ -1,6 +1,7 @@
 import {
   ComethWallet,
   ConnectAdaptor,
+  SupportedNetworks,
   UIConfig,
   webAuthnOptions
 } from '@cometh/connect-sdk'
@@ -36,16 +37,20 @@ export type ComethConnectorOptions = WagmiConfigConnectorParams & {
   shimDisconnect?: boolean
 }
 
+type ConnectFunctionConfig = {
+  /** Target chain to connect to. */
+  chainId?: number
+}
+
 export class ComethConnectConnector extends Connector<
   undefined,
   ComethConnectorOptions
 > {
   id = 'cometh-connect'
   name = 'Cometh Connect'
-  ready = true
-  wallet: ComethWallet
-  client: ConnectClient
-  walletAddress?: string
+  ready = false
+  wallet?: ComethWallet
+  client?: ConnectClient
 
   protected shimDisconnectKey = `${this.id}.shimDisconnect`
 
@@ -56,24 +61,21 @@ export class ComethConnectConnector extends Connector<
     chains: Chain[]
     options: WagmiConfigConnectorParams
   }) {
-    if (chains.length !== 1)
-      throw new Error('Cometh Connect does not support multi network in config')
-
     const options = {
       shimDisconnect: true,
       ...options_
     }
 
-    chains.forEach((chain) => {
-      if (!isSupportedNetwork(toHex(chain.id)))
-        console.warn(`${chain.name} not yet supported by cometh connect`)
-    })
-
     super({
-      chains: chains.filter((chain) => isSupportedNetwork(toHex(chain.id))),
+      chains,
       options
     })
 
+    this.ready = true
+  }
+
+  /* eslint-disable */
+  async connect({ chainId }: ConnectFunctionConfig = {}) {
     const {
       apiKey,
       walletAddress,
@@ -86,39 +88,30 @@ export class ComethConnectConnector extends Connector<
       rpcUrl
     } = this.options
 
-    const chainId = toHex(this.chains[0].id)
-
-    if (isSupportedNetwork(chainId)) {
-      this.wallet = new ComethWallet({
-        authAdapter: new ConnectAdaptor({
-          chainId,
-          apiKey,
-          disableEoaFallback,
-          encryptionSalt,
-          webAuthnOptions,
-          passKeyName,
-          rpcUrl,
-          baseUrl
-        }),
+    const selectedChainId = this._getSelectedChainId(chainId)
+
+    this.wallet = new ComethWallet({
+      authAdapter: new ConnectAdaptor({
+        chainId: selectedChainId,
         apiKey,
-        uiConfig,
+        disableEoaFallback,
+        encryptionSalt,
+        webAuthnOptions,
+        passKeyName,
         rpcUrl,
         baseUrl
-      })
+      }),
+      apiKey,
+      uiConfig,
+      rpcUrl,
+      baseUrl
+    })
 
-      this.client = getConnectViemClient({ wallet: this.wallet, apiKey })
-      this.walletAddress = walletAddress
-      this.ready = true
-    } else {
-      throw new Error('Network not supported')
-    }
-  }
+    this.client = getConnectViemClient({ wallet: this.wallet, apiKey })
 
-  /* eslint-disable */
-  async connect() {
-    if (this.walletAddress) {
-      await this.wallet.connect(this.walletAddress)
-      window.localStorage.setItem('walletAddress', this.walletAddress)
+    if (walletAddress) {
+      await this.wallet.connect(walletAddress)
+      window.localStorage.setItem('walletAddress', walletAddress)
     } else {
       const localStorageAddress = window.localStorage.getItem('walletAddress')
 
@@ -133,10 +126,7 @@ export class ComethConnectConnector extends Connector<
     if (this.options.shimDisconnect)
       this.storage?.setItem(this.shimDisconnectKey, true)
 
-    console.warn(`Connected to ${this.chains[0].name}`)
-
-    if (this.chains.length > 1)
-      console.warn(`Cometh connect does not support multichain`)
+    console.warn(`Connected to ${selectedChainId}`)
 
     return {
       account: this.wallet.getAddress() as `0x${string}`,
@@ -146,18 +136,55 @@ export class ComethConnectConnector extends Connector<
       }
     }
   }
+
+  private _getSelectedChainId(chainId?: number) {
+    if (chainId) {
+      const providedChainId = toHex(chainId)
+
+      if (!isSupportedNetwork(providedChainId))
+        throw new Error('Network not supported')
+
+      return providedChainId
+    } else {
+      const supportedChains = this.chains.reduce(
+        (chains: SupportedNetworks[], chain: Chain) => {
+          const chainId = toHex(chain.id)
+          if (!isSupportedNetwork(chainId)) {
+            console.warn(`${chain.name} not yet supported by cometh connect`)
+          } else {
+            chains.push(chainId)
+          }
+          return chains
+        },
+        []
+      )
+      if (supportedChains.length === 0)
+        throw new Error('Cometh Connect does not support the provided chains')
+
+      if (supportedChains.length > 1)
+        console.warn(`Cometh connect does not support multichain`)
+
+      return supportedChains[0]
+    }
+  }
   disconnect(): Promise<void> {
+    if (!this.wallet) throw new Error('no')
     // Remove shim signalling wallet is disconnected
     if (this.options.shimDisconnect)
       this.storage?.removeItem(this.shimDisconnectKey)
 
     return this.wallet.logout()
   }
   async getAccount(): Promise<`0x${string}`> {
+    if (!this.wallet) throw new Error('no')
     return this.wallet.getAddress() as `0x${string}`
   }
   async getChainId(): Promise<number> {
-    return await this.wallet.chainId
+    if (!this.wallet) {
+      return this.chains[0].id
+    } else {
+      return await this.wallet.chainId
+    }
   }
   /* eslint-disable */
   async getProvider(): Promise<any> {