@wagmi/connectors 5.0.15 → 5.0.17

package/dist/esm/version.js

@@ -1,2 +1,2 @@
-export const version = '5.0.15';
+export const version = '5.0.17';
 //# sourceMappingURL=version.js.map

package/dist/types/metaMask.d.ts

@@ -4,6 +4,7 @@ import { type ProviderConnectInfo } from 'viem';
 export type MetaMaskParameters = Evaluate<ExactPartial<Omit<MetaMaskSDKOptions, '_source' | 'readonlyRPCMap'>>>;
 export declare function metaMask(parameters?: MetaMaskParameters): import("@wagmi/core").CreateConnectorFn<SDKProvider, {
     onConnect(connectInfo: ProviderConnectInfo): void;
+    onDisplayUri(uri: string): void;
 }, {
     'metaMaskSDK.disconnected': true;
 }>;

package/dist/types/metaMask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metaMask.d.ts","sourceRoot":"","sources":["../../src/metaMask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAClB,WAAW,EACZ,MAAM,eAAe,CAAA;AAEtB,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAGL,KAAK,mBAAmB,EAQzB,MAAM,MAAM,CAAA;AAEb,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACvC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,gBAAgB,CAAC,CAAC,CACrE,CAAA;AAGD,wBAAgB,QAAQ,CAAC,UAAU,GAAE,kBAAuB;2BAGjC,mBAAmB,GAAG,IAAI;;gCAEF,IAAI;GA2RtD;yBAhSe,QAAQ"}
+{"version":3,"file":"metaMask.d.ts","sourceRoot":"","sources":["../../src/metaMask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAClB,WAAW,EACZ,MAAM,eAAe,CAAA;AAMtB,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAGL,KAAK,mBAAmB,EAQzB,MAAM,MAAM,CAAA;AAEb,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACvC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,gBAAgB,CAAC,CAAC,CACrE,CAAA;AAGD,wBAAgB,QAAQ,CAAC,UAAU,GAAE,kBAAuB;2BAGjC,mBAAmB,GAAG,IAAI;sBAC/B,MAAM,GAAG,IAAI;;gCAEgB,IAAI;GAqVtD;yBA3Ve,QAAQ"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.0.15";
+export declare const version = "5.0.17";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/walletConnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletConnect.d.ts","sourceRoot":"","sources":["../../src/walletConnect.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,mBAAmB,EAOzB,MAAM,MAAM,CAAA;AAOb,KAAK,uBAAuB,GAAG,UAAU,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAC5C;IACE;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,GAAG,IAAI,CACN,uBAAuB,EACrB,QAAQ,GACR,QAAQ,GACR,gBAAgB,GAChB,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,GACT,QAAQ,GACR,aAAa,CAChB,GACC,YAAY,CAAC,IAAI,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAC7D,CAAA;AAGD,wBAAgB,aAAa,CAAC,UAAU,EAAE,uBAAuB;yBAKxC;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,QAAQ;QACzE,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;QAC5B,OAAO,EAAE,MAAM,CAAA;KAChB,CAAC;6BACuB,MAAM,EAAE;6BACR,QAAQ,MAAM,EAAE,CAAC;qBACzB,QAAQ,OAAO,CAAC;2BACV,mBAAmB,GAAG,IAAI;sBAC/B,MAAM,GAAG,IAAI;0BACT;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;kCAChB,MAAM,EAAE,GAAG,IAAI;+BAClB,GAAG,MAAM,kBAAkB;;;GAiXzD;yBAjYe,aAAa"}
+{"version":3,"file":"walletConnect.d.ts","sourceRoot":"","sources":["../../src/walletConnect.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,mBAAmB,EAOzB,MAAM,MAAM,CAAA;AAOb,KAAK,uBAAuB,GAAG,UAAU,CAAC,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAC5C;IACE;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,GAAG,IAAI,CACN,uBAAuB,EACrB,QAAQ,GACR,QAAQ,GACR,gBAAgB,GAChB,gBAAgB,GAChB,iBAAiB,GACjB,SAAS,GACT,QAAQ,GACR,aAAa,CAChB,GACC,YAAY,CAAC,IAAI,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAC7D,CAAA;AAGD,wBAAgB,aAAa,CAAC,UAAU,EAAE,uBAAuB;yBAKxC;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QACzE,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;QAC5B,OAAO,EAAE,MAAM,CAAA;KAChB,CAAC;6BACuB,MAAM,EAAE;6BACR,OAAO,CAAC,MAAM,EAAE,CAAC;qBACzB,OAAO,CAAC,OAAO,CAAC;2BACV,mBAAmB,GAAG,IAAI;sBAC/B,MAAM,GAAG,IAAI;0BACT;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;kCAChB,MAAM,EAAE,GAAG,IAAI;+BAClB,GAAG,MAAM,kBAAkB;;;GAiXzD;yBAjYe,aAAa"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wagmi/connectors",
   "description": "Collection of connectors for Wagmi",
-  "version": "5.0.15",
+  "version": "5.0.17",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
   "peerDependencies": {
     "typescript": ">=5.0.4",
     "viem": "2.x",
-    "@wagmi/core": "2.11.3"
+    "@wagmi/core": "2.11.5"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
-    "@metamask/sdk": "0.20.5",
+    "@metamask/sdk": "0.26.0",
     "@safe-global/safe-apps-provider": "0.18.1",
     "@safe-global/safe-apps-sdk": "8.1.0",
     "@walletconnect/ethereum-provider": "2.13.0",

package/src/metaMask.ts

@@ -3,7 +3,11 @@ import type {
   MetaMaskSDKOptions,
   SDKProvider,
 } from '@metamask/sdk'
-import { ChainNotConfiguredError, createConnector } from '@wagmi/core'
+import {
+  ChainNotConfiguredError,
+  type Connector,
+  createConnector,
+} from '@wagmi/core'
 import type { Evaluate, ExactPartial } from '@wagmi/core/internal'
 import {
   type AddEthereumChainParameter,
@@ -27,6 +31,7 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
   type Provider = SDKProvider
   type Properties = {
     onConnect(connectInfo: ProviderConnectInfo): void
+    onDisplayUri(uri: string): void
   }
   type StorageItem = { 'metaMaskSDK.disconnected': true }
   type Listener = Parameters<Provider['on']>[1]
@@ -35,17 +40,29 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
   let provider: Provider | undefined
   let providerPromise: Promise<typeof provider>
 
+  let accountsChanged: Connector['onAccountsChanged'] | undefined
+  let chainChanged: Connector['onChainChanged'] | undefined
+  let connect: Connector['onConnect'] | undefined
+  let displayUri: ((uri: string) => void) | undefined
+  let disconnect: Connector['onDisconnect'] | undefined
+
   return createConnector<Provider, Properties, StorageItem>((config) => ({
     id: 'metaMaskSDK',
     name: 'MetaMask',
     type: metaMask.type,
     async setup() {
       const provider = await this.getProvider()
-      if (provider)
-        provider.on('connect', this.onConnect.bind(this) as Listener)
+      if (provider && !connect) {
+        connect = this.onConnect.bind(this)
+        provider.on('connect', connect as Listener)
+      }
     },
     async connect({ chainId, isReconnecting } = {}) {
       const provider = await this.getProvider()
+      if (!displayUri) {
+        displayUri = this.onDisplayUri
+        provider.on('display_uri', displayUri as Listener)
+      }
 
       let accounts: readonly Address[] = []
       if (isReconnecting) accounts = await this.getAccounts().catch(() => [])
@@ -56,17 +73,6 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
           accounts = requestedAccounts.map((x) => getAddress(x))
         }
 
-        provider.removeListener(
-          'connect',
-          this.onConnect.bind(this) as Listener,
-        )
-        provider.on(
-          'accountsChanged',
-          this.onAccountsChanged.bind(this) as Listener,
-        )
-        provider.on('chainChanged', this.onChainChanged as Listener)
-        provider.on('disconnect', this.onDisconnect.bind(this) as Listener)
-
         // Switch to chain if provided
         let currentChainId = (await this.getChainId()) as number
         if (chainId && currentChainId !== chainId) {
@@ -79,6 +85,30 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
 
         await config.storage?.removeItem('metaMaskSDK.disconnected')
 
+        if (displayUri) {
+          provider.removeListener('display_uri', displayUri)
+          displayUri = undefined
+        }
+
+        // Manage EIP-1193 event listeners
+        // https://eips.ethereum.org/EIPS/eip-1193#events
+        if (connect) {
+          provider.removeListener('connect', connect)
+          connect = undefined
+        }
+        if (!accountsChanged) {
+          accountsChanged = this.onAccountsChanged.bind(this)
+          provider.on('accountsChanged', accountsChanged as Listener)
+        }
+        if (!chainChanged) {
+          chainChanged = this.onChainChanged.bind(this)
+          provider.on('chainChanged', chainChanged as Listener)
+        }
+        if (!disconnect) {
+          disconnect = this.onDisconnect.bind(this)
+          provider.on('disconnect', disconnect as Listener)
+        }
+
         return { accounts, chainId: currentChainId }
       } catch (err) {
         const error = err as RpcError
@@ -92,13 +122,23 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
     async disconnect() {
       const provider = await this.getProvider()
 
-      provider.removeListener(
-        'accountsChanged',
-        this.onAccountsChanged.bind(this),
-      )
-      provider.removeListener('chainChanged', this.onChainChanged)
-      provider.removeListener('disconnect', this.onDisconnect.bind(this))
-      provider.on('connect', this.onConnect.bind(this) as Listener)
+      // Manage EIP-1193 event listeners
+      if (accountsChanged) {
+        provider.removeListener('accountsChanged', accountsChanged)
+        accountsChanged = undefined
+      }
+      if (chainChanged) {
+        provider.removeListener('chainChanged', chainChanged)
+        chainChanged = undefined
+      }
+      if (disconnect) {
+        provider.removeListener('disconnect', disconnect)
+        disconnect = undefined
+      }
+      if (!connect) {
+        connect = this.onConnect.bind(this)
+        provider.on('connect', connect as Listener)
+      }
 
       sdk.terminate()
 
@@ -275,11 +315,21 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
       config.emitter.emit('connect', { accounts, chainId })
 
       const provider = await this.getProvider()
-      if (provider) {
-        provider.removeListener('connect', this.onConnect.bind(this))
-        provider.on('accountsChanged', this.onAccountsChanged.bind(this) as any)
-        provider.on('chainChanged', this.onChainChanged as any)
-        provider.on('disconnect', this.onDisconnect.bind(this) as any)
+      if (connect) {
+        provider.removeListener('connect', connect)
+        connect = undefined
+      }
+      if (!accountsChanged) {
+        accountsChanged = this.onAccountsChanged.bind(this)
+        provider.on('accountsChanged', accountsChanged as Listener)
+      }
+      if (!chainChanged) {
+        chainChanged = this.onChainChanged.bind(this)
+        provider.on('chainChanged', chainChanged as Listener)
+      }
+      if (!disconnect) {
+        disconnect = this.onDisconnect.bind(this)
+        provider.on('disconnect', disconnect as Listener)
       }
     },
     async onDisconnect(error) {
@@ -302,13 +352,26 @@ export function metaMask(parameters: MetaMaskParameters = {}) {
       // actually disconnected and we don't need to simulate it.
       config.emitter.emit('disconnect')
 
-      provider.removeListener(
-        'accountsChanged',
-        this.onAccountsChanged.bind(this),
-      )
-      provider.removeListener('chainChanged', this.onChainChanged)
-      provider.removeListener('disconnect', this.onDisconnect.bind(this))
-      provider.on('connect', this.onConnect.bind(this) as any)
+      // Manage EIP-1193 event listeners
+      if (!accountsChanged) {
+        accountsChanged = this.onAccountsChanged.bind(this)
+        provider.on('accountsChanged', accountsChanged as Listener)
+      }
+      if (chainChanged) {
+        provider.removeListener('chainChanged', chainChanged)
+        chainChanged = undefined
+      }
+      if (disconnect) {
+        provider.removeListener('disconnect', disconnect)
+        disconnect = undefined
+      }
+      if (!connect) {
+        connect = this.onConnect.bind(this)
+        provider.on('connect', connect as Listener)
+      }
+    },
+    onDisplayUri(uri) {
+      config.emitter.emit('message', { type: 'display_uri', data: uri })
     },
   }))
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = '5.0.15'
+export const version = '5.0.17'