@meshconnect/uwc-core 1.2.3-snapshot.dca47c9 → 1.2.3-snapshot.efff07b

package/dist/services/connection-service.d.ts

@@ -4,6 +4,12 @@ import type { EventManager } from '../managers/event-manager';
 export interface ServiceOptions {
     signal?: AbortSignal;
 }
+/** Sibling-namespace live-account re-read poll: absorbs the lag while a wallet
+ *  re-derives a sibling namespace's address (e.g. MetaMask's Solana Snap) after
+ *  an account switch on another namespace. Bounded so a genuinely-unchanged
+ *  sibling gives up quickly. */
+export declare const SIBLING_REFRESH_MAX_ATTEMPTS = 5;
+export declare const SIBLING_REFRESH_DELAY_MS = 200;
 export declare class ConnectionService {
     private networks;
     private wallets;
@@ -29,6 +35,13 @@ export declare class ConnectionService {
      * each reading the shared activeConnector, and flood telemetry).
      */
     private inFlightAbort;
+    /**
+     * Monotonic token for the in-flight cross-namespace sibling refresh (see
+     * `refreshSiblingNamespaces`). A newer account switch, a teardown, or a
+     * disconnect bumps it so a still-polling older refresh aborts before it
+     * writes a now-stale sibling address into the session.
+     */
+    private siblingRefreshGeneration;
     constructor(networks: Network[], wallets: WalletMetadata[], sessionManager: SessionManager, connectors: Map<ConnectionMode, Connector>, usingIntegratedBrowser: boolean, eventManager: EventManager, walletResponseTimeoutMs: number);
     connect(connectionMode: ConnectionMode, walletId: string, networkId?: NetworkId, options?: ServiceOptions): Promise<void>;
     /** Wire the active connector's lifecycle stream onto the bus (or signal absence). */
@@ -73,6 +86,23 @@ export declare class ConnectionService {
      * disconnect signal.
      */
     private attachSecondaryAccountSync;
+    /**
+     * After a real account switch on `changedNamespace`, re-read the LIVE account
+     * of every OTHER connected namespace and fold any that changed into the
+     * session in ONE update. Sibling namespaces (e.g. a MetaMask Solana Snap
+     * address derived from the EVM account) change with the underlying account but
+     * emit no `accountsChanged`, and their live read can LAG the firing namespace's
+     * event while the wallet re-derives — so poll each sibling up to
+     * `SIBLING_REFRESH_MAX_ATTEMPTS` times, `SIBLING_REFRESH_DELAY_MS` apart,
+     * stopping a sibling the moment its live address differs from the stored one.
+     *
+     * Loop-safe: writes addresses DIRECTLY via the session manager (never
+     * re-dispatches a per-namespace accountsChanged), and only emits when at least
+     * one sibling actually changed — so refreshing B here cannot re-enter this for
+     * A and recurse. Generation-guarded so a newer switch / teardown / disconnect
+     * supersedes an older still-polling refresh before it writes.
+     */
+    private refreshSiblingNamespaces;
     private connectWithURIPoll;
     private getConnector;
     private findWallet;

package/dist/services/connection-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-service.d.ts","sourceRoot":"","sources":["../../src/services/connection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,cAAc,EACd,cAAc,EACd,SAAS,EAMV,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAK7D,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,iBAAiB;IAoB1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,uBAAuB;IA1BjC,OAAO,CAAC,eAAe,CAAyB;IAChD,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB,CAA0B;IACnD;;;;OAIG;IACH,OAAO,CAAC,6BAA6B,CAAwB;IAC7D;;;;;;OAMG;IACH,OAAO,CAAC,aAAa,CAA+B;gBAG1C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,cAAc,EAAE,EACzB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,EAC1C,sBAAsB,EAAE,OAAO,EAC/B,YAAY,EAAE,YAAY,EAE1B,uBAAuB,EAAE,MAAM;IAGnC,OAAO,CACX,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IA4JhB,qFAAqF;IACrF,OAAO,CAAC,eAAe;IAwDvB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAkD7B;;;;;;OAMG;IACH,iBAAiB,IAAI,IAAI;IAOzB;;;;;;;OAOG;IACH,iBAAiB,IAAI,IAAI;IAmCzB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,0BAA0B;YAsDpB,kBAAkB;IAgEhC,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,2BAA2B;IAiD7B,UAAU,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BzD;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,gBAAgB;IASxB,gBAAgB,IAAI,MAAM,GAAG,SAAS;IAiBtC,UAAU,IAAI,cAAc,EAAE;IAI9B,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI;IAI9C,WAAW,IAAI,OAAO,EAAE;IAIxB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,wBAAwB;CAiBjC"}
+{"version":3,"file":"connection-service.d.ts","sourceRoot":"","sources":["../../src/services/connection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,cAAc,EACd,cAAc,EACd,SAAS,EAMV,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAK7D,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;gCAGgC;AAChC,eAAO,MAAM,4BAA4B,IAAI,CAAA;AAC7C,eAAO,MAAM,wBAAwB,MAAM,CAAA;AAE3C,qBAAa,iBAAiB;IA2B1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,uBAAuB;IAjCjC,OAAO,CAAC,eAAe,CAAyB;IAChD,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB,CAA0B;IACnD;;;;OAIG;IACH,OAAO,CAAC,6BAA6B,CAAwB;IAC7D;;;;;;OAMG;IACH,OAAO,CAAC,aAAa,CAA+B;IACpD;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB,CAAI;gBAG1B,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,cAAc,EAAE,EACzB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,EAC1C,sBAAsB,EAAE,OAAO,EAC/B,YAAY,EAAE,YAAY,EAE1B,uBAAuB,EAAE,MAAM;IAGnC,OAAO,CACX,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IA4JhB,qFAAqF;IACrF,OAAO,CAAC,eAAe;IAwDvB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IA0D7B;;;;;;OAMG;IACH,iBAAiB,IAAI,IAAI;IAYzB;;;;;;;OAOG;IACH,iBAAiB,IAAI,IAAI;IAmCzB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,0BAA0B;IAsDlC;;;;;;;;;;;;;;;OAeG;YACW,wBAAwB;YAkGxB,kBAAkB;IAgEhC,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,2BAA2B;IAiD7B,UAAU,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BzD;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,gBAAgB;IASxB,gBAAgB,IAAI,MAAM,GAAG,SAAS;IAiBtC,UAAU,IAAI,cAAc,EAAE;IAI9B,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI;IAI9C,WAAW,IAAI,OAAO,EAAE;IAIxB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,wBAAwB;CAiBjC"}

package/dist/services/connection-service.js

@@ -2,6 +2,12 @@ import { NoCommonNetworkError } from '@meshconnect/uwc-types';
 import { raceAbort } from '../utils/abort';
 import { instrumentHandoff } from '../observability/instrument-handoff';
 import { attachLifecycle } from '../observability/lifecycle-bridge';
+/** Sibling-namespace live-account re-read poll: absorbs the lag while a wallet
+ *  re-derives a sibling namespace's address (e.g. MetaMask's Solana Snap) after
+ *  an account switch on another namespace. Bounded so a genuinely-unchanged
+ *  sibling gives up quickly. */
+export const SIBLING_REFRESH_MAX_ATTEMPTS = 5;
+export const SIBLING_REFRESH_DELAY_MS = 200;
 export class ConnectionService {
     networks;
     wallets;
@@ -27,6 +33,13 @@ export class ConnectionService {
      * each reading the shared activeConnector, and flood telemetry).
      */
     inFlightAbort = null;
+    /**
+     * Monotonic token for the in-flight cross-namespace sibling refresh (see
+     * `refreshSiblingNamespaces`). A newer account switch, a teardown, or a
+     * disconnect bumps it so a still-polling older refresh aborts before it
+     * writes a now-stale sibling address into the session.
+     */
+    siblingRefreshGeneration = 0;
     constructor(networks, wallets, sessionManager, connectors, usingIntegratedBrowser, eventManager, 
     // Observational wallet-response deadline for the handoff timeout marker.
     walletResponseTimeoutMs) {
@@ -253,6 +266,13 @@ export class ConnectionService {
         this.eventManager.emit('sessionChanged', {
             session: this.sessionManager.getSession()
         });
+        // A single wallet account drives ALL its namespaces (e.g. MetaMask's Solana
+        // Snap derives its key from the selected EVM account). The wallet only fired
+        // an accountsChanged for THIS namespace; refresh the live account of every
+        // other connected namespace so the session doesn't serve a stale sibling
+        // address. Fire-and-forget: we're inside the wallet's synchronous event
+        // dispatch and must not await.
+        void this.refreshSiblingNamespaces(namespace);
     }
     /**
      * Remove the active provider-lifecycle subscription (EIP-1193 `.on` / wallet-
@@ -267,6 +287,11 @@ export class ConnectionService {
         for (const teardown of this.secondaryAccountSyncTeardowns)
             teardown();
         this.secondaryAccountSyncTeardowns = [];
+        // Supersede any in-flight sibling-namespace refresh (see
+        // `refreshSiblingNamespaces`) — a still-polling refresh must not write a
+        // now-stale address after teardown/disconnect. `finishDisconnect()` calls
+        // this too, so one bump here covers both paths.
+        this.siblingRefreshGeneration++;
     }
     /**
      * Re-evaluate the lifecycle source for the CURRENT session. Used after a
@@ -356,6 +381,101 @@ export class ConnectionService {
             }));
         }
     }
+    /**
+     * After a real account switch on `changedNamespace`, re-read the LIVE account
+     * of every OTHER connected namespace and fold any that changed into the
+     * session in ONE update. Sibling namespaces (e.g. a MetaMask Solana Snap
+     * address derived from the EVM account) change with the underlying account but
+     * emit no `accountsChanged`, and their live read can LAG the firing namespace's
+     * event while the wallet re-derives — so poll each sibling up to
+     * `SIBLING_REFRESH_MAX_ATTEMPTS` times, `SIBLING_REFRESH_DELAY_MS` apart,
+     * stopping a sibling the moment its live address differs from the stored one.
+     *
+     * Loop-safe: writes addresses DIRECTLY via the session manager (never
+     * re-dispatches a per-namespace accountsChanged), and only emits when at least
+     * one sibling actually changed — so refreshing B here cannot re-enter this for
+     * A and recurse. Generation-guarded so a newer switch / teardown / disconnect
+     * supersedes an older still-polling refresh before it writes.
+     */
+    async refreshSiblingNamespaces(changedNamespace) {
+        const connector = this.activeConnector;
+        if (!connector?.getLiveAccount)
+            return;
+        const gen = ++this.siblingRefreshGeneration;
+        const namespaceForNetworkId = (networkId) => this.networks.find(n => n.id === networkId)?.namespace;
+        // Sibling = every connected namespace except the one that just fired.
+        const initial = this.sessionManager.getSession();
+        const siblings = new Set();
+        for (const addr of initial.availableAddresses) {
+            const ns = namespaceForNetworkId(addr.networkId);
+            if (ns && ns !== changedNamespace)
+                siblings.add(ns);
+        }
+        if (siblings.size === 0)
+            return;
+        const equal = (ns, a, b) => ns === 'eip155' ? a.toLowerCase() === b.toLowerCase() : a === b;
+        const storedFor = (ns) => {
+            const s = this.sessionManager.getSession();
+            for (const addr of s.availableAddresses) {
+                if (namespaceForNetworkId(addr.networkId) === ns)
+                    return addr.address;
+            }
+            return undefined;
+        };
+        const resolved = new Map();
+        const pending = new Set(siblings);
+        for (let attempt = 0; attempt < SIBLING_REFRESH_MAX_ATTEMPTS && pending.size > 0; attempt++) {
+            // Superseded (newer switch), disconnected, or connector swapped → abandon.
+            if (gen !== this.siblingRefreshGeneration ||
+                this.activeConnector !== connector)
+                return;
+            for (const ns of [...pending]) {
+                let live = null;
+                try {
+                    live = await connector.getLiveAccount(ns);
+                }
+                catch {
+                    live = null;
+                }
+                if (gen !== this.siblingRefreshGeneration ||
+                    this.activeConnector !== connector)
+                    return;
+                if (!live)
+                    continue;
+                const stored = storedFor(ns);
+                if (stored != null && !equal(ns, stored, live)) {
+                    resolved.set(ns, live);
+                    pending.delete(ns);
+                }
+                // stored == live (not yet re-derived) → keep polling until the cap.
+            }
+            if (pending.size === 0)
+                break;
+            await new Promise(r => setTimeout(r, SIBLING_REFRESH_DELAY_MS));
+        }
+        if (resolved.size === 0)
+            return;
+        if (gen !== this.siblingRefreshGeneration ||
+            this.activeConnector !== connector)
+            return;
+        const session = this.sessionManager.getSession();
+        const availableAddresses = session.availableAddresses.map(addr => {
+            const ns = namespaceForNetworkId(addr.networkId);
+            const next = ns ? resolved.get(ns) : undefined;
+            return next ? { ...addr, address: next } : addr;
+        });
+        // If the ACTIVE network's namespace was among the refreshed siblings, move
+        // activeAddress too (e.g. a Solana-active session whose Solana address just
+        // followed an EVM switch).
+        const activeNs = session.activeNetwork?.namespace;
+        const activeAddress = activeNs && resolved.has(activeNs)
+            ? resolved.get(activeNs)
+            : session.activeAddress;
+        this.sessionManager.updateSession({ activeAddress, availableAddresses });
+        this.eventManager.emit('sessionChanged', {
+            session: this.sessionManager.getSession()
+        });
+    }
     async connectWithURIPoll(connector, network, provider, connectionMode, signal) {
         const connectPromise = connector.connect(network, provider);
         let pollingStopped = false;

package/dist/services/connection-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-service.js","sourceRoot":"","sources":["../../src/services/connection-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-service.js","sourceRoot":"","sources":["../../src/services/connection-service.ts"],"names":[],"mappings":"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"}

package/package.json

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

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

@@ -1,5 +1,9 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
-import { ConnectionService } from './connection-service'
+import {
+  ConnectionService,
+  SIBLING_REFRESH_MAX_ATTEMPTS,
+  SIBLING_REFRESH_DELAY_MS
+} from './connection-service'
 import { SessionManager } from '../managers/session-manager'
 import { EventManager } from '../managers/event-manager'
 import type {
@@ -1136,4 +1140,477 @@ describe('ConnectionService', () => {
       ).toBe('0xAFTER')
     })
   })
+
+  describe('cross-namespace account refresh on switch', () => {
+    // Multi-namespace injected wallets (MetaMask/Trust/Phantom) derive every
+    // namespace's address from ONE underlying account. The wallet fires
+    // accountsChanged for a SINGLE namespace on a switch; the sibling
+    // namespaces' addresses change too but emit no event of their own, so
+    // `refreshSiblingNamespaces` re-reads each connected sibling's LIVE
+    // account and folds any real change into the session. Session is seeded
+    // SOLANA-active (the real-bug shape: an eip155 switch must still move the
+    // active solana address).
+    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
+      mockConnector.connect = vi.fn().mockResolvedValue({
+        networkId: 'solana:mainnet',
+        address: 'SoLAddr111',
+        availableAddresses: [
+          { address: 'SoLAddr111', networkId: 'solana:mainnet' },
+          { address: '0x1234', networkId: 'eip155:1' }
+        ]
+      })
+      accountSubs = new Map()
+      mockConnector.onAccountsChanged = ((
+        listener: (accounts: string[]) => void,
+        context: { namespace: string }
+      ) => {
+        accountSubs.set(context.namespace, listener)
+        return () => {}
+      }) as never
+    })
+
+    it('a Solana-active session follows an eip155 switch: the solana sibling is refreshed and activeAddress moves with it', async () => {
+      const liveAccount = vi.fn(async (ns: string) =>
+        ns === 'solana' ? 'SoLAddr_NEW' : 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
+
+      accountSubs.get('eip155')!(['0xSWITCHED'])
+
+      await vi.waitFor(() => {
+        expect(
+          sessionManager
+            .getSession()
+            .availableAddresses.find(a => a.networkId === 'solana:mainnet')
+            ?.address
+        ).toBe('SoLAddr_NEW')
+      })
+
+      const session = sessionManager.getSession()
+      expect(session.activeAddress).toBe('SoLAddr_NEW')
+      expect(session.availableAddresses).toEqual([
+        { address: 'SoLAddr_NEW', networkId: 'solana:mainnet' },
+        { address: '0xSWITCHED', networkId: 'eip155:1' }
+      ])
+      expect(sessions.length).toBeGreaterThan(0)
+    })
+
+    it('polls a lagging sibling until its live address differs from the stored one', async () => {
+      vi.useFakeTimers()
+      try {
+        let call = 0
+        const liveAccount = vi.fn(async (ns: string) => {
+          if (ns !== 'solana') return null
+          call++
+          // First read still reflects the OLD (stored) address — the wallet
+          // hasn't finished re-deriving the sibling yet.
+          return call === 1 ? 'SoLAddr111' : 'SoLAddr_NEW'
+        })
+        ;(mockConnector as any).getLiveAccount = liveAccount
+
+        await connectionService.connect(
+          'injected',
+          'metamask',
+          'solana:mainnet'
+        )
+
+        accountSubs.get('eip155')!(['0xSWITCHED'])
+
+        await vi.advanceTimersByTimeAsync(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')
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
+    it('gives up after the poll cap when the sibling never changes, without an extra update or emit', async () => {
+      vi.useFakeTimers()
+      try {
+        const liveAccount = vi.fn(async (ns: string) =>
+          ns === 'solana' ? 'SoLAddr111' : 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
+
+        accountSubs.get('eip155')!(['0xSWITCHED'])
+        // The eip155 switch's own sessionChanged fires synchronously above.
+        expect(sessions.length).toBe(1)
+
+        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('SoLAddr111')
+        expect(session.activeAddress).toBe('SoLAddr111')
+        // No additional sessionChanged beyond the firing namespace's own one.
+        expect(sessions.length).toBe(1)
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
+    it('an empty accounts list (disconnect) does not trigger a sibling refresh', async () => {
+      const liveAccount = vi.fn(async () => 'SoLAddr_NEW')
+      ;(mockConnector as any).getLiveAccount = liveAccount
+      mockConnector.disconnect = vi.fn().mockResolvedValue(undefined)
+
+      await connectionService.connect('injected', 'metamask', 'solana:mainnet')
+
+      accountSubs.get('solana')!([]) // active namespace's own disconnect signal
+
+      expect(liveAccount).not.toHaveBeenCalled()
+      const session = sessionManager.getSession()
+      expect(session.activeAddress).toBeNull()
+      expect(session.connectionMode).toBeNull()
+    })
+
+    it('cancels an in-flight poll when a newer switch supersedes it — the later switch wins', async () => {
+      vi.useFakeTimers()
+      try {
+        // Keyed by CALL ORDER, not by a single shared "current live value"
+        // variable — a shared variable would let the superseded refresh's
+        // later read silently converge with whatever the second refresh just
+        // wrote, passing even with the generation guard deleted. Instead:
+        //   call #1 = refresh #1 (superseded), attempt 0 → equals the stored
+        //     address, so refresh #1 does NOT resolve yet and keeps polling.
+        //   call #2 = refresh #2 (superseding), attempt 0 → differs from the
+        //     stored address, so refresh #2 resolves immediately and writes
+        //     the correct value.
+        //   call #3 = refresh #1, attempt 1 — reached ONLY if refresh #1 is
+        //     allowed to keep going after being superseded (i.e. the
+        //     generation guard is missing). Returns a THIRD address that is
+        //     neither the original stored value nor refresh #2's correct
+        //     value, so if refresh #1 is ever allowed to write here, it
+        //     visibly clobbers the correct value with this stale one.
+        let solanaCallCount = 0
+        const liveAccount = vi.fn(async (ns: string) => {
+          if (ns !== 'solana') return null
+          solanaCallCount++
+          if (solanaCallCount === 1) return 'SoLAddr111'
+          if (solanaCallCount === 2) return 'SoLAddr_FROM_SECOND'
+          return 'SoLAddr_STALE_FROM_FIRST'
+        })
+        ;(mockConnector as any).getLiveAccount = liveAccount
+
+        await connectionService.connect(
+          'injected',
+          'metamask',
+          'solana:mainnet'
+        )
+
+        accountSubs.get('eip155')!(['0xSWITCHED1'])
+        // Let the first refresh's attempt-0 read (call #1) resolve and enter
+        // its poll wait.
+        await vi.advanceTimersByTimeAsync(0)
+
+        // A newer switch fires before the first refresh's next attempt — it
+        // supersedes the generation token. Its own attempt-0 read (call #2)
+        // resolves synchronously below, since the stored address hasn't
+        // moved yet.
+        accountSubs.get('eip155')!(['0xSWITCHED2'])
+
+        // Drain everything: the first refresh's remaining attempts must bail
+        // out on the generation check rather than issuing call #3 and writing
+        // its stale value over the second refresh's correct one.
+        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_FROM_SECOND')
+        expect(session.activeAddress).toBe('SoLAddr_FROM_SECOND')
+        // Never the superseded refresh's later, stale read (call #3) — this
+        // is the write the generation guard exists to prevent.
+        expect(session.availableAddresses.map(a => a.address)).not.toContain(
+          'SoLAddr_STALE_FROM_FIRST'
+        )
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
+    it('is a no-op (no throw, no sibling change) when the connector has no getLiveAccount', async () => {
+      // Backward compat: connectors that predate `getLiveAccount` (Task A)
+      // must not break the switch path.
+      expect((mockConnector as any).getLiveAccount).toBeUndefined()
+
+      await connectionService.connect('injected', 'metamask', 'solana:mainnet')
+
+      expect(() => accountSubs.get('eip155')!(['0xSWITCHED'])).not.toThrow()
+
+      const session = sessionManager.getSession()
+      expect(
+        session.availableAddresses.find(a => a.networkId === 'solana:mainnet')
+          ?.address
+      ).toBe('SoLAddr111')
+    })
+
+    it('treats an eip155 sibling address as unchanged when it differs from stored only by case', async () => {
+      vi.useFakeTimers()
+      try {
+        // Changed namespace is SOLANA here; eip155 is the sibling under test.
+        const liveAccount = vi.fn(async (ns: string) =>
+          ns === 'eip155' ? '0X1234' : null
+        )
+        ;(mockConnector as any).getLiveAccount = liveAccount
+
+        await connectionService.connect(
+          'injected',
+          'metamask',
+          'solana:mainnet'
+        )
+
+        accountSubs.get('solana')!(['SoLAddr_NEW'])
+
+        await vi.advanceTimersByTimeAsync(
+          SIBLING_REFRESH_MAX_ATTEMPTS * SIBLING_REFRESH_DELAY_MS
+        )
+
+        const session = sessionManager.getSession()
+        expect(
+          session.availableAddresses.find(a => a.networkId === 'eip155:1')
+            ?.address
+        ).toBe('0x1234')
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+  })
+
+  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()
+      }
+    })
+  })
 })

package/src/services/connection-service.ts

@@ -22,6 +22,13 @@ export interface ServiceOptions {
   signal?: AbortSignal
 }
 
+/** Sibling-namespace live-account re-read poll: absorbs the lag while a wallet
+ *  re-derives a sibling namespace's address (e.g. MetaMask's Solana Snap) after
+ *  an account switch on another namespace. Bounded so a genuinely-unchanged
+ *  sibling gives up quickly. */
+export const SIBLING_REFRESH_MAX_ATTEMPTS = 5
+export const SIBLING_REFRESH_DELAY_MS = 200
+
 export class ConnectionService {
   private activeConnector: Connector | null = null
   /** Tears down the post-connect lifecycle subscription; set while connected. */
@@ -40,6 +47,13 @@ export class ConnectionService {
    * each reading the shared activeConnector, and flood telemetry).
    */
   private inFlightAbort: AbortController | null = null
+  /**
+   * Monotonic token for the in-flight cross-namespace sibling refresh (see
+   * `refreshSiblingNamespaces`). A newer account switch, a teardown, or a
+   * disconnect bumps it so a still-polling older refresh aborts before it
+   * writes a now-stale sibling address into the session.
+   */
+  private siblingRefreshGeneration = 0
 
   constructor(
     private networks: Network[],
@@ -325,6 +339,14 @@ export class ConnectionService {
     this.eventManager.emit('sessionChanged', {
       session: this.sessionManager.getSession()
     })
+
+    // A single wallet account drives ALL its namespaces (e.g. MetaMask's Solana
+    // Snap derives its key from the selected EVM account). The wallet only fired
+    // an accountsChanged for THIS namespace; refresh the live account of every
+    // other connected namespace so the session doesn't serve a stale sibling
+    // address. Fire-and-forget: we're inside the wallet's synchronous event
+    // dispatch and must not await.
+    void this.refreshSiblingNamespaces(namespace)
   }
 
   /**
@@ -339,6 +361,11 @@ export class ConnectionService {
     this.lifecycleTeardown = undefined
     for (const teardown of this.secondaryAccountSyncTeardowns) teardown()
     this.secondaryAccountSyncTeardowns = []
+    // Supersede any in-flight sibling-namespace refresh (see
+    // `refreshSiblingNamespaces`) — a still-polling refresh must not write a
+    // now-stale address after teardown/disconnect. `finishDisconnect()` calls
+    // this too, so one bump here covers both paths.
+    this.siblingRefreshGeneration++
   }
 
   /**
@@ -452,6 +479,120 @@ export class ConnectionService {
     }
   }
 
+  /**
+   * After a real account switch on `changedNamespace`, re-read the LIVE account
+   * of every OTHER connected namespace and fold any that changed into the
+   * session in ONE update. Sibling namespaces (e.g. a MetaMask Solana Snap
+   * address derived from the EVM account) change with the underlying account but
+   * emit no `accountsChanged`, and their live read can LAG the firing namespace's
+   * event while the wallet re-derives — so poll each sibling up to
+   * `SIBLING_REFRESH_MAX_ATTEMPTS` times, `SIBLING_REFRESH_DELAY_MS` apart,
+   * stopping a sibling the moment its live address differs from the stored one.
+   *
+   * Loop-safe: writes addresses DIRECTLY via the session manager (never
+   * re-dispatches a per-namespace accountsChanged), and only emits when at least
+   * one sibling actually changed — so refreshing B here cannot re-enter this for
+   * A and recurse. Generation-guarded so a newer switch / teardown / disconnect
+   * supersedes an older still-polling refresh before it writes.
+   */
+  private async refreshSiblingNamespaces(
+    changedNamespace: Namespace
+  ): Promise<void> {
+    const connector = this.activeConnector
+    if (!connector?.getLiveAccount) return
+    const gen = ++this.siblingRefreshGeneration
+
+    const namespaceForNetworkId = (
+      networkId: NetworkId
+    ): Namespace | undefined =>
+      this.networks.find(n => n.id === networkId)?.namespace
+
+    // Sibling = every connected namespace except the one that just fired.
+    const initial = this.sessionManager.getSession()
+    const siblings = new Set<Namespace>()
+    for (const addr of initial.availableAddresses) {
+      const ns = namespaceForNetworkId(addr.networkId)
+      if (ns && ns !== changedNamespace) siblings.add(ns)
+    }
+    if (siblings.size === 0) return
+
+    const equal = (ns: Namespace, a: string, b: string): boolean =>
+      ns === 'eip155' ? a.toLowerCase() === b.toLowerCase() : a === b
+
+    const storedFor = (ns: Namespace): string | undefined => {
+      const s = this.sessionManager.getSession()
+      for (const addr of s.availableAddresses) {
+        if (namespaceForNetworkId(addr.networkId) === ns) return addr.address
+      }
+      return undefined
+    }
+
+    const resolved = new Map<Namespace, string>()
+    const pending = new Set(siblings)
+
+    for (
+      let attempt = 0;
+      attempt < SIBLING_REFRESH_MAX_ATTEMPTS && pending.size > 0;
+      attempt++
+    ) {
+      // Superseded (newer switch), disconnected, or connector swapped → abandon.
+      if (
+        gen !== this.siblingRefreshGeneration ||
+        this.activeConnector !== connector
+      )
+        return
+      for (const ns of [...pending]) {
+        let live: string | null = null
+        try {
+          live = await connector.getLiveAccount!(ns)
+        } catch {
+          live = null
+        }
+        if (
+          gen !== this.siblingRefreshGeneration ||
+          this.activeConnector !== connector
+        )
+          return
+        if (!live) continue
+        const stored = storedFor(ns)
+        if (stored != null && !equal(ns, stored, live)) {
+          resolved.set(ns, live)
+          pending.delete(ns)
+        }
+        // stored == live (not yet re-derived) → keep polling until the cap.
+      }
+      if (pending.size === 0) break
+      await new Promise<void>(r => setTimeout(r, SIBLING_REFRESH_DELAY_MS))
+    }
+
+    if (resolved.size === 0) return
+    if (
+      gen !== this.siblingRefreshGeneration ||
+      this.activeConnector !== connector
+    )
+      return
+
+    const session = this.sessionManager.getSession()
+    const availableAddresses = session.availableAddresses.map(addr => {
+      const ns = namespaceForNetworkId(addr.networkId)
+      const next = ns ? resolved.get(ns) : undefined
+      return next ? { ...addr, address: next } : addr
+    })
+    // If the ACTIVE network's namespace was among the refreshed siblings, move
+    // activeAddress too (e.g. a Solana-active session whose Solana address just
+    // followed an EVM switch).
+    const activeNs = session.activeNetwork?.namespace
+    const activeAddress =
+      activeNs && resolved.has(activeNs)
+        ? resolved.get(activeNs)!
+        : session.activeAddress
+
+    this.sessionManager.updateSession({ activeAddress, availableAddresses })
+    this.eventManager.emit('sessionChanged', {
+      session: this.sessionManager.getSession()
+    })
+  }
+
   private async connectWithURIPoll(
     connector: Connector,
     network: Network,