@meshconnect/uwc-wallet-connect-connector 0.4.13 → 0.4.14

package/dist/services/network-switch-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-switch-service.d.ts","sourceRoot":"","sources":["../../src/services/network-switch-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIxD;;GAEG;AACH,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,iBAAiB;gBADjB,mBAAmB,EAAE,mBAAmB,EACxC,iBAAiB,EAAE,iBAAiB;IAG9C;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAgEpE"}
+{"version":3,"file":"network-switch-service.d.ts","sourceRoot":"","sources":["../../src/services/network-switch-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIxD;;GAEG;AACH,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,iBAAiB;gBADjB,mBAAmB,EAAE,mBAAmB,EACxC,iBAAiB,EAAE,iBAAiB;IAG9C;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAmFpE"}

package/dist/services/network-switch-service.js

@@ -25,7 +25,25 @@ export class NetworkSwitchService {
             // Check if the requested network is available in the session
             const networkChain = network.id;
             const namespace = network.namespace;
-            if (!session.namespaces[namespace]?.chains?.includes(networkChain)) {
+            const approvedChains = session.namespaces[namespace]?.chains ?? [];
+            const approvedAccounts = session.namespaces[namespace]?.accounts ?? [];
+            // CAIP-25: accounts encode `chainId:address`, so they implicitly
+            // declare chain approval. Some wallets (e.g. ZenGo) ship an empty
+            // `chains` array even when accounts cover every requested chain.
+            const chainsFromAccounts = new Set();
+            for (const account of approvedAccounts) {
+                try {
+                    chainsFromAccounts.add(parseAccount(account).networkId);
+                }
+                catch {
+                    // Skip malformed account strings
+                }
+            }
+            const effectiveChains = new Set([
+                ...approvedChains,
+                ...chainsFromAccounts
+            ]);
+            if (!effectiveChains.has(networkChain)) {
                 throw new Error(`Network ${networkChain} is not available in the current session`);
             }
             // For WalletConnect, we can't directly switch networks

package/dist/services/network-switch-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"network-switch-service.js","sourceRoot":"","sources":["../../src/services/network-switch-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAErB;IACA;IAFV,YACU,mBAAwC,EACxC,iBAAoC;QADpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAC3C,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,OAAgB;QAClC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAA;YACnD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;YAC7D,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAA;YAEzD,6DAA6D;YAC7D,MAAM,YAAY,GAAG,OAAO,CAAC,EAAE,CAAA;YAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;YAEnC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACnE,MAAM,IAAI,KAAK,CACb,WAAW,YAAY,0CAA0C,CAClE,CAAA;YACH,CAAC;YAED,uDAAuD;YACvD,yCAAyC;YACzC,iDAAiD;YACjD,uDAAuD;YAEvD,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAA;YAC9D,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAC9C,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CACjC,CAAA;YAED,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAA;YACjE,CAAC;YAED,sCAAsC;YACtC,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,eAAe,CAAC,CAAA;YAEjD,kEAAkE;YAClE,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;YAChD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;YAEhD,mEAAmE;YACnE,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,KAAK,EAAE;4BACL,IAAI,EAAE,cAAc;4BACpB,IAAI,EAAE,YAAY;yBACnB;wBACD,OAAO,EAAE,YAAY;qBACtB,CAAC,CAAA;gBACJ,CAAC;gBAAC,MAAM,CAAC;oBACP,0CAA0C;gBAC5C,CAAC;YACH,CAAC;YAED,OAAO;gBACL,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,OAAO;aACR,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"network-switch-service.js","sourceRoot":"","sources":["../../src/services/network-switch-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-wallet-connect-connector",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "WalletConnect connector for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",

package/src/services/network-switch-service.test.ts

@@ -0,0 +1,190 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import type { SessionTypes } from '@walletconnect/types'
+import { NetworkSwitchService } from './network-switch-service'
+import type { ConnectionService } from './connection-service'
+import type { WalletConnectClient } from './walletconnect-client'
+import { polygonNetwork } from '@meshconnect/uwc-constants'
+
+interface NamespaceShape {
+  chains: string[]
+  accounts: string[]
+  methods: string[]
+  events: string[]
+}
+
+function buildSession(
+  namespaces: Record<string, NamespaceShape>
+): SessionTypes.Struct {
+  return {
+    topic: 'test-topic',
+    pairingTopic: 'pairing-topic',
+    relay: { protocol: 'irn' },
+    expiry: Math.floor(Date.now() / 1000) + 86400,
+    acknowledged: true,
+    controller: 'test-controller',
+    requiredNamespaces: {},
+    optionalNamespaces: {},
+    sessionProperties: undefined,
+    self: {
+      publicKey: 'self-key',
+      metadata: { name: 'dApp', description: '', url: '', icons: [] }
+    },
+    peer: {
+      publicKey: 'peer-key',
+      metadata: { name: 'Wallet', description: '', url: '', icons: [] }
+    },
+    namespaces
+  } as unknown as SessionTypes.Struct
+}
+
+describe('NetworkSwitchService', () => {
+  let service: NetworkSwitchService
+  let mockEmit: ReturnType<typeof vi.fn>
+  let mockGetSession: ReturnType<typeof vi.fn>
+  let mockSetActiveNetwork: ReturnType<typeof vi.fn>
+  let mockSetActiveAddress: ReturnType<typeof vi.fn>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockEmit = vi.fn().mockResolvedValue(undefined)
+    mockGetSession = vi.fn()
+    mockSetActiveNetwork = vi.fn()
+    mockSetActiveAddress = vi.fn()
+
+    const mockWcClient = {
+      getClient: vi.fn().mockResolvedValue({ emit: mockEmit })
+    } as unknown as WalletConnectClient
+    const mockConnectionService = {
+      getSession: mockGetSession,
+      setActiveNetwork: mockSetActiveNetwork,
+      setActiveAddress: mockSetActiveAddress
+    } as unknown as ConnectionService
+
+    service = new NetworkSwitchService(mockWcClient, mockConnectionService)
+  })
+
+  describe('switchNetwork', () => {
+    it('succeeds when chain is in chains AND there is a matching account (spec-compliant wallets)', async () => {
+      mockGetSession.mockReturnValue(
+        buildSession({
+          eip155: {
+            chains: ['eip155:1', 'eip155:137'],
+            accounts: [
+              'eip155:1:0xabc0000000000000000000000000000000000001',
+              'eip155:137:0xabc0000000000000000000000000000000000001'
+            ],
+            methods: ['eth_sendTransaction'],
+            events: ['chainChanged']
+          }
+        })
+      )
+
+      const result = await service.switchNetwork(polygonNetwork)
+
+      expect(result).toEqual({
+        networkId: 'eip155:137',
+        address: '0xabc0000000000000000000000000000000000001'
+      })
+      expect(mockSetActiveNetwork).toHaveBeenCalledWith(polygonNetwork)
+      expect(mockSetActiveAddress).toHaveBeenCalledWith(
+        '0xabc0000000000000000000000000000000000001'
+      )
+      expect(mockEmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          chainId: 'eip155:137',
+          event: { name: 'chainChanged', data: 'eip155:137' }
+        })
+      )
+    })
+
+    // ZenGo's WC v2 quirk:
+    // approval namespace ships with `chains: []` even though `accounts` covers
+    // every requested chain. Per WC v2 sign-namespaces spec the wallet SHOULD
+    // populate `chains`, but `accounts` already encodes (chainId:address) so
+    // it's the source of truth. UWC must accept this shape — ZenGo users were
+    // otherwise unable to switch to any chain in their session.
+    // Source: live console capture, 2026-04-17, react-example + ZenGo iOS
+    // peer.metadata.name: "Zengo Wallet"
+    it('succeeds when chains is empty but accounts cover the requested chain (ZenGo WC v2 quirk)', async () => {
+      mockGetSession.mockReturnValue(
+        buildSession({
+          eip155: {
+            chains: [],
+            accounts: [
+              'eip155:1:0xabc0000000000000000000000000000000000002',
+              'eip155:137:0xabc0000000000000000000000000000000000002',
+              'eip155:8453:0xabc0000000000000000000000000000000000002'
+            ],
+            methods: ['eth_sendTransaction'],
+            events: ['chainChanged']
+          }
+        })
+      )
+
+      const result = await service.switchNetwork(polygonNetwork)
+
+      expect(result).toEqual({
+        networkId: 'eip155:137',
+        address: '0xabc0000000000000000000000000000000000002'
+      })
+      expect(mockSetActiveNetwork).toHaveBeenCalledWith(polygonNetwork)
+    })
+
+    it('throws when chain is in neither chains nor accounts', async () => {
+      mockGetSession.mockReturnValue(
+        buildSession({
+          eip155: {
+            chains: ['eip155:1'],
+            accounts: ['eip155:1:0xabc0000000000000000000000000000000000003'],
+            methods: ['eth_sendTransaction'],
+            events: ['chainChanged']
+          }
+        })
+      )
+
+      await expect(service.switchNetwork(polygonNetwork)).rejects.toThrow(
+        /not available in the current session/
+      )
+      expect(mockSetActiveNetwork).not.toHaveBeenCalled()
+    })
+
+    it('throws when there is no active session', async () => {
+      mockGetSession.mockReturnValue(null)
+
+      await expect(service.switchNetwork(polygonNetwork)).rejects.toThrow(
+        /No active session/
+      )
+    })
+
+    it('throws when the eip155 namespace is missing entirely', async () => {
+      mockGetSession.mockReturnValue(buildSession({}))
+
+      await expect(service.switchNetwork(polygonNetwork)).rejects.toThrow(
+        /not available in the current session/
+      )
+    })
+
+    // Inverse of the ZenGo quirk: if a wallet declares the chain in `chains`
+    // but ships zero accounts for it, the session is unusable for that chain.
+    // The first guard sees the chain in `chains` and lets it through, but the
+    // second guard (find matching account) catches the inconsistency with a
+    // clear message naming the chain.
+    it('throws when chain is declared in chains but no account exists for it', async () => {
+      mockGetSession.mockReturnValue(
+        buildSession({
+          eip155: {
+            chains: ['eip155:1', 'eip155:137'],
+            accounts: ['eip155:1:0xabc0000000000000000000000000000000000004'],
+            methods: ['eth_sendTransaction'],
+            events: ['chainChanged']
+          }
+        })
+      )
+
+      await expect(service.switchNetwork(polygonNetwork)).rejects.toThrow(
+        /No account found for network eip155:137/
+      )
+      expect(mockSetActiveNetwork).not.toHaveBeenCalled()
+    })
+  })
+})

package/src/services/network-switch-service.ts

@@ -29,7 +29,26 @@ export class NetworkSwitchService {
       const networkChain = network.id
       const namespace = network.namespace
 
-      if (!session.namespaces[namespace]?.chains?.includes(networkChain)) {
+      const approvedChains = session.namespaces[namespace]?.chains ?? []
+      const approvedAccounts = session.namespaces[namespace]?.accounts ?? []
+
+      // CAIP-25: accounts encode `chainId:address`, so they implicitly
+      // declare chain approval. Some wallets (e.g. ZenGo) ship an empty
+      // `chains` array even when accounts cover every requested chain.
+      const chainsFromAccounts = new Set<string>()
+      for (const account of approvedAccounts) {
+        try {
+          chainsFromAccounts.add(parseAccount(account).networkId)
+        } catch {
+          // Skip malformed account strings
+        }
+      }
+      const effectiveChains = new Set<string>([
+        ...approvedChains,
+        ...chainsFromAccounts
+      ])
+
+      if (!effectiveChains.has(networkChain)) {
         throw new Error(
           `Network ${networkChain} is not available in the current session`
         )