@meshconnect/uwc-core 1.2.3-snapshot.f6952a6 → 1.2.3-snapshot.f7d72d8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-core",
-  "version": "1.2.3-snapshot.f6952a6",
+  "version": "1.2.3-snapshot.f7d72d8",
   "description": "Core functionality for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -16,10 +16,10 @@
     "src"
   ],
   "dependencies": {
-    "@meshconnect/uwc-injected-connector": "0.16.4-snapshot.f6952a6",
-    "@meshconnect/uwc-types": "0.19.0-snapshot.f6952a6",
-    "@meshconnect/uwc-wallet-connect-connector": "0.8.2-snapshot.f6952a6",
-    "@meshconnect/uwc-ton-connector": "0.7.2-snapshot.f6952a6"
+    "@meshconnect/uwc-injected-connector": "0.16.4-snapshot.f7d72d8",
+    "@meshconnect/uwc-ton-connector": "0.7.2-snapshot.f7d72d8",
+    "@meshconnect/uwc-types": "0.19.0-snapshot.f7d72d8",
+    "@meshconnect/uwc-wallet-connect-connector": "0.8.2-snapshot.f7d72d8"
   },
   "devDependencies": {
     "typescript": "^5.9.3"

package/src/services/connection-service.test.ts

@@ -1418,4 +1418,199 @@ describe('ConnectionService', () => {
       }
     })
   })
+
+  describe('Solana account-change event + sibling-poll coexistence (Task 3.3)', () => {
+    // 3.1/3.2 wire a REAL solana `onAccountsChanged` into core — active-
+    // namespace path via `attachLifecycle`, secondary-namespace path via
+    // `attachSecondaryAccountSync`. Separately, `refreshSiblingNamespaces`
+    // polls every OTHER connected namespace's live account after a sibling's
+    // switch. These tests confirm the two mechanisms coexist for a solana
+    // session: no double `sessionChanged` emit, no re-entrant loop, no stale
+    // clobber of a fresher value, and an empty solana event on a SECONDARY
+    // namespace never ends the session.
+    let accountSubs: Map<string, (accounts: string[]) => void>
+
+    beforeEach(() => {
+      networks.push({
+        id: 'solana:mainnet',
+        internalId: 101,
+        namespace: 'solana',
+        name: 'Solana',
+        logoUrl: '',
+        nativeCurrency: { name: 'SOL', symbol: 'SOL', decimals: 9 },
+        networkType: 'solana'
+      } as never)
+      wallets[0]!.extensionInjectedProvider = {
+        supportedNetworkIds: ['solana:mainnet', 'eip155:1']
+      } as never
+      accountSubs = new Map()
+      mockConnector.onAccountsChanged = ((
+        listener: (accounts: string[]) => void,
+        context: { namespace: string }
+      ) => {
+        accountSubs.set(context.namespace, listener)
+        return () => {}
+      }) as never
+    })
+
+    it('a solana accountsChanged on a SOLANA-active session updates the address + activeAddress with exactly ONE sessionChanged (no double-emit)', async () => {
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'solana:mainnet',
+        address: 'SoLAddr111',
+        availableAddresses: [
+          { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+          { address: '0x1234', networkId: 'eip155:1' }
+        ]
+      })
+      // No getLiveAccount on this connector: isolates the direct-event path
+      // from the sibling-poll path for this assertion.
+      expect((mockConnector as any).getLiveAccount).toBeUndefined()
+
+      await connectionService.connect('injected', 'metamask', 'solana:mainnet')
+
+      const sessions: unknown[] = []
+      eventManager.on('sessionChanged', d => sessions.push(d))
+
+      accountSubs.get('solana')!(['SoLAddr_NEW'])
+
+      const session = sessionManager.getSession()
+      expect(session.activeAddress).toBe('SoLAddr_NEW')
+      expect(session.availableAddresses).toEqual([
+        { address: 'SoLAddr_NEW', networkId: 'solana:mainnet' },
+        { address: '0x1234', networkId: 'eip155:1' }
+      ])
+      expect(sessions.length).toBe(1)
+    })
+
+    it('a solana accountsChanged on an EIP155-active session updates only the solana sibling entry, leaves activeAddress alone, and does not end the session', async () => {
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [
+          { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+          { address: '0x1234', networkId: 'eip155:1' }
+        ]
+      })
+
+      await connectionService.connect('injected', 'metamask', 'eip155:1')
+
+      accountSubs.get('solana')!(['SoLAddr_NEW'])
+
+      const session = sessionManager.getSession()
+      expect(session.connectionMode).toBe('injected')
+      expect(session.activeAddress).toBe('0x1234')
+      expect(session.availableAddresses).toEqual([
+        { address: 'SoLAddr_NEW', networkId: 'solana:mainnet' },
+        { address: '0x1234', networkId: 'eip155:1' }
+      ])
+    })
+
+    it('an empty solana accountsChanged on the SECONDARY (non-active) namespace is a no-op — it does not end the session', async () => {
+      const disconnectSpy = vi.fn().mockResolvedValue(undefined)
+      mockConnector.disconnect = disconnectSpy
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'eip155:1',
+        address: '0x1234',
+        availableAddresses: [
+          { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+          { address: '0x1234', networkId: 'eip155:1' }
+        ]
+      })
+
+      await connectionService.connect('injected', 'metamask', 'eip155:1')
+
+      accountSubs.get('solana')!([])
+
+      const session = sessionManager.getSession()
+      expect(session.connectionMode).toBe('injected')
+      expect(session.activeAddress).toBe('0x1234')
+      expect(session.availableAddresses).toEqual([
+        { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+        { address: '0x1234', networkId: 'eip155:1' }
+      ])
+      expect(disconnectSpy).not.toHaveBeenCalled()
+    })
+
+    it('a direct solana event and an eip155-triggered sibling poll converge on the same address without a stale clobber (generation guard)', async () => {
+      vi.useFakeTimers()
+      try {
+        mockConnector.connect = vi.fn().mockResolvedValue({
+          networkId: 'solana:mainnet',
+          address: 'SoLAddr111',
+          availableAddresses: [
+            { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+            { address: '0x1234', networkId: 'eip155:1' }
+          ]
+        })
+        let solanaLiveCalls = 0
+        const liveAccount = vi.fn(async (ns: string) => {
+          if (ns === 'solana') {
+            solanaLiveCalls++
+            // First read still reflects the OLD (stored) address — unchanged,
+            // so the poll keeps going. A SECOND read is reached only if the
+            // superseded refresh is wrongly allowed to continue; it returns a
+            // value that is neither the original nor the direct event's
+            // value, so any write from it is a visible clobber.
+            return solanaLiveCalls === 1
+              ? 'SoLAddr111'
+              : 'SoLAddr_STALE_FROM_POLL'
+          }
+          // eip155 sibling (queried by the solana-event-triggered refresh):
+          // never resolves — the direct event's own change already landed
+          // through the non-polling path.
+          return null
+        })
+        ;(mockConnector as any).getLiveAccount = liveAccount
+
+        const sessions: unknown[] = []
+        eventManager.on('sessionChanged', d => sessions.push(d))
+
+        await connectionService.connect(
+          'injected',
+          'metamask',
+          'solana:mainnet'
+        )
+        sessions.length = 0 // drop the connect's own sessionChanged
+
+        // eip155 fires first: updates its own entry and kicks off a sibling
+        // poll of solana (generation N).
+        accountSubs.get('eip155')!(['0xSWITCHED'])
+        await vi.advanceTimersByTimeAsync(0) // let attempt-0's read land (unchanged, keeps polling)
+
+        // A REAL solana accounts-change event lands next (the 3.1/3.2 direct
+        // path) carrying the same new address the poll is chasing. It writes
+        // directly and starts its OWN sibling refresh (generation N+1),
+        // superseding the still-polling eip155-triggered one.
+        accountSubs.get('solana')!(['SoLAddr_NEW'])
+
+        // Drain both: the superseded refresh must bail on the generation
+        // check instead of issuing a second solana read and clobbering.
+        await vi.advanceTimersByTimeAsync(
+          SIBLING_REFRESH_MAX_ATTEMPTS * SIBLING_REFRESH_DELAY_MS
+        )
+
+        const session = sessionManager.getSession()
+        expect(
+          session.availableAddresses.find(a => a.networkId === 'solana:mainnet')
+            ?.address
+        ).toBe('SoLAddr_NEW')
+        expect(session.activeAddress).toBe('SoLAddr_NEW')
+        expect(
+          session.availableAddresses.find(a => a.networkId === 'eip155:1')
+            ?.address
+        ).toBe('0xSWITCHED')
+        expect(session.availableAddresses.map(a => a.address)).not.toContain(
+          'SoLAddr_STALE_FROM_POLL'
+        )
+        // The superseded refresh never got a second read in.
+        expect(solanaLiveCalls).toBe(1)
+        // Exactly two emits: the eip155 event's own, and the solana event's
+        // own. Neither sibling-refresh resolves a sibling, so neither adds an
+        // extra emit — confirming no double-emit / no loop.
+        expect(sessions.length).toBe(2)
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+  })
 })