@metamask-previews/assets-controller 9.1.0-preview-50e82f088 → 9.1.0-preview-773e4e83d

package/dist/data-sources/BackendWebsocketDataSource.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"BackendWebsocketDataSource.d.cts","sourceRoot":"","sources":["../../src/data-sources/BackendWebsocketDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,6BAA6B,EAM9B,+BAA+B;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAQhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,gCAA4B;AAErE,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EAId,qBAAiB;AAClB,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,iCAA6B;AAM9B,QAAA,MAAM,eAAe,+BAA+B,CAAC;AAUrD,MAAM,MAAM,wCAAwC,GAClD,8BAA8B,CAAC;AAGjC,MAAM,MAAM,uCAAuC,GACjD,6BAA6B,CAAC;AAMhC,MAAM,MAAM,+BAA+B,GAAG,eAAe,CAAC;AAU9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,mEAAmE;IACnE,SAAS,EAAE,yBAAyB,CAAC;IACrC,iGAAiG;IACjG,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV,wFAAwF;IACxF,YAAY,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,KAAK,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAClD,CAAC;AAqIF,qBAAa,0BAA2B,SAAQ,kBAAkB,CAChE,OAAO,eAAe,EACtB,+BAA+B,CAChC;;gBAiCa,OAAO,EAAE,iCAAiC;IAsGtD;;;;;;OAMG;IACH,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IA0EvD;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IAWxC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+OxE,OAAO,IAAI,IAAI;CAwBhB;AAMD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CAE5B"}
+{"version":3,"file":"BackendWebsocketDataSource.d.cts","sourceRoot":"","sources":["../../src/data-sources/BackendWebsocketDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,6BAA6B,EAM9B,+BAA+B;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAQhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,gCAA4B;AAErE,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EAId,qBAAiB;AAClB,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,iCAA6B;AAM9B,QAAA,MAAM,eAAe,+BAA+B,CAAC;AAUrD,MAAM,MAAM,wCAAwC,GAClD,8BAA8B,CAAC;AAGjC,MAAM,MAAM,uCAAuC,GACjD,6BAA6B,CAAC;AAMhC,MAAM,MAAM,+BAA+B,GAAG,eAAe,CAAC;AAU9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,mEAAmE;IACnE,SAAS,EAAE,yBAAyB,CAAC;IACrC,iGAAiG;IACjG,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV,wFAAwF;IACxF,YAAY,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,KAAK,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAClD,CAAC;AA4KF,qBAAa,0BAA2B,SAAQ,kBAAkB,CAChE,OAAO,eAAe,EACtB,+BAA+B,CAChC;;gBAuCa,OAAO,EAAE,iCAAiC;IAsGtD;;;;;;OAMG;IACH,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IA0EvD;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IAWxC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuQxE;;;;;OAKG;IACG,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ExD,OAAO,IAAI,IAAI;CAmBhB;AAMD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CAE5B"}

package/dist/data-sources/BackendWebsocketDataSource.d.mts

@@ -37,6 +37,13 @@ export declare class BackendWebsocketDataSource extends AbstractDataSource<typeo
      */
     updateSupportedChains(chains: ChainId[]): void;
     subscribe(subscriptionRequest: SubscriptionRequest): Promise<void>;
+    /**
+     * Unsubscribe and await server-side teardown so a re-subscribe does not race
+     * with stale subscription IDs on incoming notifications.
+     *
+     * @param subscriptionId - The ID of the subscription to cancel.
+     */
+    unsubscribe(subscriptionId: string): Promise<void>;
     destroy(): void;
 }
 /**

package/dist/data-sources/BackendWebsocketDataSource.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"BackendWebsocketDataSource.d.mts","sourceRoot":"","sources":["../../src/data-sources/BackendWebsocketDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,6BAA6B,EAM9B,+BAA+B;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAQhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,gCAA4B;AAErE,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EAId,qBAAiB;AAClB,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,iCAA6B;AAM9B,QAAA,MAAM,eAAe,+BAA+B,CAAC;AAUrD,MAAM,MAAM,wCAAwC,GAClD,8BAA8B,CAAC;AAGjC,MAAM,MAAM,uCAAuC,GACjD,6BAA6B,CAAC;AAMhC,MAAM,MAAM,+BAA+B,GAAG,eAAe,CAAC;AAU9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,mEAAmE;IACnE,SAAS,EAAE,yBAAyB,CAAC;IACrC,iGAAiG;IACjG,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV,wFAAwF;IACxF,YAAY,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,KAAK,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAClD,CAAC;AAqIF,qBAAa,0BAA2B,SAAQ,kBAAkB,CAChE,OAAO,eAAe,EACtB,+BAA+B,CAChC;;gBAiCa,OAAO,EAAE,iCAAiC;IAsGtD;;;;;;OAMG;IACH,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IA0EvD;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IAWxC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+OxE,OAAO,IAAI,IAAI;CAwBhB;AAMD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CAE5B"}
+{"version":3,"file":"BackendWebsocketDataSource.d.mts","sourceRoot":"","sources":["../../src/data-sources/BackendWebsocketDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,6BAA6B,EAM9B,+BAA+B;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAQhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,gCAA4B;AAErE,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EAId,qBAAiB;AAClB,OAAO,EAAE,kBAAkB,EAAE,iCAA6B;AAC1D,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,iCAA6B;AAM9B,QAAA,MAAM,eAAe,+BAA+B,CAAC;AAUrD,MAAM,MAAM,wCAAwC,GAClD,8BAA8B,CAAC;AAGjC,MAAM,MAAM,uCAAuC,GACjD,6BAA6B,CAAC;AAMhC,MAAM,MAAM,+BAA+B,GAAG,eAAe,CAAC;AAU9D,MAAM,MAAM,iCAAiC,GAAG;IAC9C,mEAAmE;IACnE,SAAS,EAAE,yBAAyB,CAAC;IACrC,iGAAiG;IACjG,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV,wFAAwF;IACxF,YAAY,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,KAAK,CAAC,EAAE,OAAO,CAAC,+BAA+B,CAAC,CAAC;CAClD,CAAC;AA4KF,qBAAa,0BAA2B,SAAQ,kBAAkB,CAChE,OAAO,eAAe,EACtB,+BAA+B,CAChC;;gBAuCa,OAAO,EAAE,iCAAiC;IAsGtD;;;;;;OAMG;IACH,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IA0EvD;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI;IAWxC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuQxE;;;;;OAKG;IACG,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ExD,OAAO,IAAI,IAAI;CAmBhB;AAMD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CAE5B"}

package/dist/data-sources/BackendWebsocketDataSource.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BackendWebsocketDataSource_instances, _BackendWebsocketDataSource_messenger, _BackendWebsocketDataSource_apiClient, _BackendWebsocketDataSource_onActiveChainsUpdated, _BackendWebsocketDataSource_getAssetType, _BackendWebsocketDataSource_chainsRefreshTimer, _BackendWebsocketDataSource_supportedChains, _BackendWebsocketDataSource_isConnected, _BackendWebsocketDataSource_wsSubscriptions, _BackendWebsocketDataSource_pendingSubscriptions, _BackendWebsocketDataSource_subscriptionRequests, _BackendWebsocketDataSource_initializeActiveChains, _BackendWebsocketDataSource_refreshActiveChains, _BackendWebsocketDataSource_fetchActiveChains, _BackendWebsocketDataSource_subscribeToEvents, _BackendWebsocketDataSource_handleDisconnect, _BackendWebsocketDataSource_handleReconnect, _BackendWebsocketDataSource_handleNotification, _BackendWebsocketDataSource_processBalanceUpdates;
+var _BackendWebsocketDataSource_instances, _BackendWebsocketDataSource_messenger, _BackendWebsocketDataSource_apiClient, _BackendWebsocketDataSource_onActiveChainsUpdated, _BackendWebsocketDataSource_getAssetType, _BackendWebsocketDataSource_chainsRefreshTimer, _BackendWebsocketDataSource_supportedChains, _BackendWebsocketDataSource_isConnected, _BackendWebsocketDataSource_wsSubscriptions, _BackendWebsocketDataSource_pendingSubscriptions, _BackendWebsocketDataSource_subscriptionRequests, _BackendWebsocketDataSource_registeredChannelCallbacks, _BackendWebsocketDataSource_subscribeLock, _BackendWebsocketDataSource_initializeActiveChains, _BackendWebsocketDataSource_refreshActiveChains, _BackendWebsocketDataSource_fetchActiveChains, _BackendWebsocketDataSource_subscribeToEvents, _BackendWebsocketDataSource_handleDisconnect, _BackendWebsocketDataSource_handleReconnect, _BackendWebsocketDataSource_subscribeInternal, _BackendWebsocketDataSource_handleNotification, _BackendWebsocketDataSource_processBalanceUpdates, _BackendWebsocketDataSource_teardownSubscription, _BackendWebsocketDataSource_registerChannelCallbacks, _BackendWebsocketDataSource_unregisterChannelCallback, _BackendWebsocketDataSource_removeChannelCallbacks;
 import { isCaipChainId, KnownCaipNamespace, toCaipChainId } from "@metamask/utils";
 import BigNumberJS from "bignumber.js";
 import { projectLogger, createModuleLogger } from "../logger.mjs";
@@ -89,6 +89,34 @@ function buildAccountActivityChannel(namespace, address) {
     const formatted = namespace === 'eip155' ? address.toLowerCase() : address;
     return `${CHANNEL_TYPE}.${namespace}:0:${formatted}`;
 }
+/**
+ * Normalize addresses for stable comparison when detecting account changes.
+ *
+ * @param address - Account address (hex or base58).
+ * @returns Normalized address for comparison.
+ */
+function normalizeAddressForComparison(address) {
+    return address.startsWith('0x') ? address.toLowerCase() : address;
+}
+/**
+ * Check whether subscribed account addresses changed (case-insensitive for EVM).
+ *
+ * @param nextAddresses - Addresses from the incoming subscribe request.
+ * @param existingAddresses - Addresses from the active subscription.
+ * @returns True when the address sets differ.
+ */
+function haveAddressesChanged(nextAddresses, existingAddresses) {
+    if (nextAddresses.length !== existingAddresses.length) {
+        return true;
+    }
+    const normalizedNext = nextAddresses
+        .map(normalizeAddressForComparison)
+        .sort();
+    const normalizedExisting = existingAddresses
+        .map(normalizeAddressForComparison)
+        .sort();
+    return normalizedNext.some((address, index) => address !== normalizedExisting[index]);
+}
 /**
  * Normalize API chain identifier to CAIP-2 ChainId.
  * Passes through strings already in CAIP-2 form (e.g. eip155:1, solana:5eykt...).
@@ -136,6 +164,8 @@ function toChainId(chainIdOrDecimal) {
  * - BackendWebSocketService:subscribe
  * - BackendWebSocketService:getConnectionInfo
  * - BackendWebSocketService:findSubscriptionsByChannelPrefix
+ * - BackendWebSocketService:addChannelCallback
+ * - BackendWebSocketService:removeChannelCallback
  */
 const DEFAULT_CHAINS_REFRESH_INTERVAL_MS = 20 * 60 * 1000; // 20 minutes
 export class BackendWebsocketDataSource extends AbstractDataSource {
@@ -161,6 +191,10 @@ export class BackendWebsocketDataSource extends AbstractDataSource {
         _BackendWebsocketDataSource_pendingSubscriptions.set(this, new Map());
         /** Store original subscription requests for reconnection */
         _BackendWebsocketDataSource_subscriptionRequests.set(this, new Map());
+        /** Channels with registered BackendWebSocketService channel callbacks */
+        _BackendWebsocketDataSource_registeredChannelCallbacks.set(this, new Set());
+        /** Serializes subscribe/unsubscribe so account switches cannot interleave. */
+        _BackendWebsocketDataSource_subscribeLock.set(this, Promise.resolve());
         __classPrivateFieldSet(this, _BackendWebsocketDataSource_messenger, options.messenger, "f");
         __classPrivateFieldSet(this, _BackendWebsocketDataSource_apiClient, options.queryApiClient, "f");
         __classPrivateFieldSet(this, _BackendWebsocketDataSource_onActiveChainsUpdated, options.onActiveChainsUpdated, "f");
@@ -194,96 +228,40 @@ export class BackendWebsocketDataSource extends AbstractDataSource {
     // SUBSCRIBE
     // ============================================================================
     async subscribe(subscriptionRequest) {
-        const { request, subscriptionId, isUpdate } = subscriptionRequest;
-        // Filter to active chains only
-        const chainsToSubscribe = request.chainIds.filter((chainId) => this.state.activeChains.includes(chainId));
-        const addresses = request.accountsWithSupportedChains.map((a) => a.account.address);
-        if (addresses.length === 0) {
-            return;
-        }
-        // Check WebSocket connection status
+        const previousLock = __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscribeLock, "f");
+        let releaseLock = () => undefined;
+        __classPrivateFieldSet(this, _BackendWebsocketDataSource_subscribeLock, new Promise((resolve) => {
+            releaseLock = resolve;
+        }), "f");
+        await previousLock;
         try {
-            const connectionInfo = __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:getConnectionInfo');
-            if (connectionInfo.state !== 'connected') {
-                // Store the subscription request to process when WebSocket connects
-                __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").set(subscriptionId, subscriptionRequest);
-                return;
-            }
-        }
-        catch {
-            // Store anyway - will be processed when we can connect
-            __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").set(subscriptionId, subscriptionRequest);
-            return;
+            await __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_subscribeInternal).call(this, subscriptionRequest);
         }
-        // Remove from pending if it was there (we're processing it now)
-        __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").delete(subscriptionId);
-        // Handle subscription update
-        if (isUpdate) {
-            const existing = this.activeSubscriptions.get(subscriptionId);
-            if (existing) {
-                // Check if accounts changed - if so, we need to re-subscribe to different channels
-                const existingAddresses = existing.addresses ?? [];
-                const addressesChanged = addresses.length !== existingAddresses.length ||
-                    addresses.some((addr) => !existingAddresses.includes(addr));
-                if (!addressesChanged) {
-                    // Only chains changed - just update chains and return
-                    existing.chains = chainsToSubscribe;
-                    return;
-                }
-                // Accounts changed - fall through to re-subscribe with new channels
-            }
-        }
-        // Clean up existing subscription if any
-        await this.unsubscribe(subscriptionId);
-        // Always subscribe to eip155 and solana account activity, plus any namespaces from requested chains
-        const namespaces = getNamespacesForAccountActivity(chainsToSubscribe);
-        // Build channel names: use namespace-appropriate address per account (eip155 = hex, solana = base58)
-        const channels = [];
-        for (const namespace of namespaces) {
-            for (const { account } of request.accountsWithSupportedChains) {
-                const address = getAddressForAccountActivity(account, namespace);
-                if (address) {
-                    channels.push(buildAccountActivityChannel(namespace, address));
-                }
-            }
+        finally {
+            releaseLock();
         }
+    }
+    // ============================================================================
+    // UNSUBSCRIBE
+    // ============================================================================
+    /**
+     * Unsubscribe and await server-side teardown so a re-subscribe does not race
+     * with stale subscription IDs on incoming notifications.
+     *
+     * @param subscriptionId - The ID of the subscription to cancel.
+     */
+    async unsubscribe(subscriptionId) {
+        const previousLock = __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscribeLock, "f");
+        let releaseLock = () => undefined;
+        __classPrivateFieldSet(this, _BackendWebsocketDataSource_subscribeLock, new Promise((resolve) => {
+            releaseLock = resolve;
+        }), "f");
+        await previousLock;
         try {
-            // Create WebSocket subscription
-            const wsSubscription = await __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:subscribe', {
-                channels,
-                channelType: CHANNEL_TYPE,
-                callback: (notification) => {
-                    __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_handleNotification).call(this, notification, subscriptionId);
-                },
-            });
-            // Store WebSocket subscription
-            __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").set(subscriptionId, wsSubscription);
-            // Store in abstract class tracking
-            this.activeSubscriptions.set(subscriptionId, {
-                cleanup: () => {
-                    const wsSub = __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").get(subscriptionId);
-                    if (wsSub) {
-                        wsSub.unsubscribe().catch((unsubErr) => {
-                            log('Error unsubscribing', { subscriptionId, error: unsubErr });
-                        });
-                        __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").delete(subscriptionId);
-                    }
-                    // Also clean up the stored request
-                    __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscriptionRequests, "f").delete(subscriptionId);
-                },
-                chains: chainsToSubscribe,
-                addresses,
-                onAssetsUpdate: subscriptionRequest.onAssetsUpdate,
-            });
-            // Store original request for reconnection
-            __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscriptionRequests, "f").set(subscriptionId, subscriptionRequest);
+            await __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_teardownSubscription).call(this, subscriptionId);
         }
-        catch (error) {
-            log('WebSocket subscription FAILED', {
-                subscriptionId,
-                error,
-                chains: chainsToSubscribe,
-            });
+        finally {
+            releaseLock();
         }
     }
     // ============================================================================
@@ -294,26 +272,20 @@ export class BackendWebsocketDataSource extends AbstractDataSource {
             clearInterval(__classPrivateFieldGet(this, _BackendWebsocketDataSource_chainsRefreshTimer, "f"));
             __classPrivateFieldSet(this, _BackendWebsocketDataSource_chainsRefreshTimer, null, "f");
         }
-        // Clean up WebSocket subscriptions
-        // Convert to array first to avoid modifying map during iteration
-        const subscriptions = [...__classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").values()];
-        for (const wsSub of subscriptions) {
-            try {
-                // Fire and forget - don't await in destroy
-                wsSub.unsubscribe().catch(() => {
-                    // Ignore errors during cleanup
-                });
-            }
-            catch {
-                // Ignore errors during cleanup
-            }
+        const subscriptionIds = [
+            ...new Set([
+                ...__classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").keys(),
+                ...this.activeSubscriptions.keys(),
+            ]),
+        ];
+        for (const subscriptionId of subscriptionIds) {
+            __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_teardownSubscription).call(this, subscriptionId).catch(() => undefined);
         }
-        __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").clear();
-        // Clean up base class subscriptions
+        // Clean up base class subscriptions (no-op if already torn down)
         super.destroy();
     }
 }
-_BackendWebsocketDataSource_messenger = new WeakMap(), _BackendWebsocketDataSource_apiClient = new WeakMap(), _BackendWebsocketDataSource_onActiveChainsUpdated = new WeakMap(), _BackendWebsocketDataSource_getAssetType = new WeakMap(), _BackendWebsocketDataSource_chainsRefreshTimer = new WeakMap(), _BackendWebsocketDataSource_supportedChains = new WeakMap(), _BackendWebsocketDataSource_isConnected = new WeakMap(), _BackendWebsocketDataSource_wsSubscriptions = new WeakMap(), _BackendWebsocketDataSource_pendingSubscriptions = new WeakMap(), _BackendWebsocketDataSource_subscriptionRequests = new WeakMap(), _BackendWebsocketDataSource_instances = new WeakSet(), _BackendWebsocketDataSource_initializeActiveChains = 
+_BackendWebsocketDataSource_messenger = new WeakMap(), _BackendWebsocketDataSource_apiClient = new WeakMap(), _BackendWebsocketDataSource_onActiveChainsUpdated = new WeakMap(), _BackendWebsocketDataSource_getAssetType = new WeakMap(), _BackendWebsocketDataSource_chainsRefreshTimer = new WeakMap(), _BackendWebsocketDataSource_supportedChains = new WeakMap(), _BackendWebsocketDataSource_isConnected = new WeakMap(), _BackendWebsocketDataSource_wsSubscriptions = new WeakMap(), _BackendWebsocketDataSource_pendingSubscriptions = new WeakMap(), _BackendWebsocketDataSource_subscriptionRequests = new WeakMap(), _BackendWebsocketDataSource_registeredChannelCallbacks = new WeakMap(), _BackendWebsocketDataSource_subscribeLock = new WeakMap(), _BackendWebsocketDataSource_instances = new WeakSet(), _BackendWebsocketDataSource_initializeActiveChains = 
 // ============================================================================
 // INITIALIZATION
 // ============================================================================
@@ -412,6 +384,99 @@ async function _BackendWebsocketDataSource_initializeActiveChains() {
         const previous = [...this.state.activeChains];
         this.updateActiveChains(__classPrivateFieldGet(this, _BackendWebsocketDataSource_supportedChains, "f"), (updatedChains) => __classPrivateFieldGet(this, _BackendWebsocketDataSource_onActiveChainsUpdated, "f").call(this, this.getName(), updatedChains, previous));
     }
+}, _BackendWebsocketDataSource_subscribeInternal = async function _BackendWebsocketDataSource_subscribeInternal(subscriptionRequest) {
+    const { request, subscriptionId, isUpdate } = subscriptionRequest;
+    // Filter to active chains only
+    const chainsToSubscribe = request.chainIds.filter((chainId) => this.state.activeChains.includes(chainId));
+    const addresses = request.accountsWithSupportedChains.map((a) => a.account.address);
+    if (addresses.length === 0) {
+        return;
+    }
+    // Check WebSocket connection status
+    try {
+        const connectionInfo = __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:getConnectionInfo');
+        if (connectionInfo.state !== 'connected') {
+            // Store the subscription request to process when WebSocket connects
+            __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").set(subscriptionId, subscriptionRequest);
+            return;
+        }
+    }
+    catch {
+        // Store anyway - will be processed when we can connect
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").set(subscriptionId, subscriptionRequest);
+        return;
+    }
+    // Remove from pending if it was there (we're processing it now)
+    __classPrivateFieldGet(this, _BackendWebsocketDataSource_pendingSubscriptions, "f").delete(subscriptionId);
+    // Handle subscription update
+    if (isUpdate) {
+        const existing = this.activeSubscriptions.get(subscriptionId);
+        if (existing) {
+            // Check if accounts changed - if so, we need to re-subscribe to different channels
+            const existingAddresses = existing.addresses ?? [];
+            const addressesChanged = haveAddressesChanged(addresses, existingAddresses);
+            if (!addressesChanged) {
+                // Only chains changed - update chains, request, and callback
+                existing.chains = chainsToSubscribe;
+                existing.onAssetsUpdate = subscriptionRequest.onAssetsUpdate;
+                __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscriptionRequests, "f").set(subscriptionId, subscriptionRequest);
+                return;
+            }
+            // Accounts changed - fall through to re-subscribe with new channels
+        }
+    }
+    // Clean up existing subscription if any (inline teardown — subscribe holds the lock)
+    await __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_teardownSubscription).call(this, subscriptionId);
+    // Always subscribe to eip155 and solana account activity, plus any namespaces from requested chains
+    const namespaces = getNamespacesForAccountActivity(chainsToSubscribe);
+    // Build channel names: use namespace-appropriate address per account (eip155 = hex, solana = base58)
+    const channels = [];
+    for (const namespace of namespaces) {
+        for (const { account } of request.accountsWithSupportedChains) {
+            const address = getAddressForAccountActivity(account, namespace);
+            if (address) {
+                channels.push(buildAccountActivityChannel(namespace, address));
+            }
+        }
+    }
+    if (channels.length === 0) {
+        return;
+    }
+    try {
+        // Create WebSocket subscription
+        const wsSubscription = await __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:subscribe', {
+            channels,
+            channelType: CHANNEL_TYPE,
+            callback: (notification) => {
+                __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_handleNotification).call(this, notification, subscriptionId);
+            },
+        });
+        // Store WebSocket subscription and subscription state before optional
+        // channel callbacks — wsCallback routing works without them.
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").set(subscriptionId, wsSubscription);
+        this.activeSubscriptions.set(subscriptionId, {
+            cleanup: () => {
+                __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_teardownSubscription).call(this, subscriptionId).catch(() => undefined);
+            },
+            chains: chainsToSubscribe,
+            addresses,
+            onAssetsUpdate: subscriptionRequest.onAssetsUpdate,
+        });
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscriptionRequests, "f").set(subscriptionId, subscriptionRequest);
+        try {
+            __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_registerChannelCallbacks).call(this, subscriptionId, channels);
+        }
+        catch (channelCallbackError) {
+            log('Channel callback registration failed; ws subscription still active', { subscriptionId, error: channelCallbackError });
+        }
+    }
+    catch (error) {
+        log('WebSocket subscription FAILED', {
+            subscriptionId,
+            error,
+            chains: chainsToSubscribe,
+        });
+    }
 }, _BackendWebsocketDataSource_handleNotification = function _BackendWebsocketDataSource_handleNotification(notification, subscriptionId) {
     try {
         const subscription = this.activeSubscriptions.get(subscriptionId);
@@ -439,7 +504,7 @@ async function _BackendWebsocketDataSource_initializeActiveChains() {
         // Process all balance updates from the activity message
         const response = __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_processBalanceUpdates).call(this, updates, chainId, accountId);
         if (Object.keys(response).length > 0 && subscription) {
-            Promise.resolve(subscription.onAssetsUpdate(response)).catch(console.error);
+            Promise.resolve(subscription.onAssetsUpdate(response, request)).catch(console.error);
         }
     }
     catch (error) {
@@ -486,6 +551,52 @@ async function _BackendWebsocketDataSource_initializeActiveChains() {
         response.assetsInfo = assetsMetadata;
     }
     return response;
+}, _BackendWebsocketDataSource_teardownSubscription = async function _BackendWebsocketDataSource_teardownSubscription(subscriptionId) {
+    const wsSub = __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").get(subscriptionId);
+    if (wsSub) {
+        const channels = [...wsSub.channels];
+        try {
+            await wsSub.unsubscribe();
+        }
+        catch (unsubErr) {
+            log('Error unsubscribing', { subscriptionId, error: unsubErr });
+        }
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_wsSubscriptions, "f").delete(subscriptionId);
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_removeChannelCallbacks).call(this, channels);
+    }
+    __classPrivateFieldGet(this, _BackendWebsocketDataSource_subscriptionRequests, "f").delete(subscriptionId);
+    this.activeSubscriptions.delete(subscriptionId);
+}, _BackendWebsocketDataSource_registerChannelCallbacks = function _BackendWebsocketDataSource_registerChannelCallbacks(subscriptionId, channels) {
+    for (const channel of channels) {
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_unregisterChannelCallback).call(this, channel);
+        try {
+            __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:addChannelCallback', {
+                channelName: channel,
+                callback: (notification) => {
+                    __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_handleNotification).call(this, notification, subscriptionId);
+                },
+            });
+            __classPrivateFieldGet(this, _BackendWebsocketDataSource_registeredChannelCallbacks, "f").add(channel);
+        }
+        catch {
+            // Channel callbacks are optional; ws subscription still works without them.
+        }
+    }
+}, _BackendWebsocketDataSource_unregisterChannelCallback = function _BackendWebsocketDataSource_unregisterChannelCallback(channel) {
+    if (!__classPrivateFieldGet(this, _BackendWebsocketDataSource_registeredChannelCallbacks, "f").has(channel)) {
+        return;
+    }
+    try {
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_messenger, "f").call('BackendWebSocketService:removeChannelCallback', channel);
+    }
+    catch {
+        // Best-effort cleanup when the channel callback was never registered.
+    }
+    __classPrivateFieldGet(this, _BackendWebsocketDataSource_registeredChannelCallbacks, "f").delete(channel);
+}, _BackendWebsocketDataSource_removeChannelCallbacks = function _BackendWebsocketDataSource_removeChannelCallbacks(channels) {
+    for (const channel of channels) {
+        __classPrivateFieldGet(this, _BackendWebsocketDataSource_instances, "m", _BackendWebsocketDataSource_unregisterChannelCallback).call(this, channel);
+    }
 };
 // ============================================================================
 // FACTORY FUNCTION