@metamask/connect-evm 0.4.0 → 0.5.0

package/dist/src/connect.js

@@ -18,16 +18,18 @@ 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 _MetamaskConnectEVM_instances, _MetamaskConnectEVM_core, _MetamaskConnectEVM_provider, _MetamaskConnectEVM_sessionScopes, _MetamaskConnectEVM_eventHandlers, _MetamaskConnectEVM_sessionChangedHandler, _MetamaskConnectEVM_displayUriHandler, _MetamaskConnectEVM_removeNotificationHandler, _MetamaskConnectEVM_getCoreOptions, _MetamaskConnectEVM_createInvokeOptions, _MetamaskConnectEVM_trackWalletActionRequested, _MetamaskConnectEVM_trackWalletActionSucceeded, _MetamaskConnectEVM_trackWalletActionFailed, _MetamaskConnectEVM_getSelectedChainId, _MetamaskConnectEVM_requestInterceptor, _MetamaskConnectEVM_clearConnectionState, _MetamaskConnectEVM_addEthereumChain, _MetamaskConnectEVM_request, _MetamaskConnectEVM_cacheChainId, _MetamaskConnectEVM_onChainChanged, _MetamaskConnectEVM_onAccountsChanged, _MetamaskConnectEVM_onConnect, _MetamaskConnectEVM_onDisconnect, _MetamaskConnectEVM_onDisplayUri, _MetamaskConnectEVM_attemptSessionRecovery;
+var _MetamaskConnectEVM_instances, _MetamaskConnectEVM_core, _MetamaskConnectEVM_provider, _MetamaskConnectEVM_sessionScopes, _MetamaskConnectEVM_eventHandlers, _MetamaskConnectEVM_sessionChangedHandler, _MetamaskConnectEVM_displayUriHandler, _MetamaskConnectEVM_removeNotificationHandler, _MetamaskConnectEVM_status, _MetamaskConnectEVM_getCoreOptions, _MetamaskConnectEVM_createInvokeOptions, _MetamaskConnectEVM_trackWalletActionRequested, _MetamaskConnectEVM_trackWalletActionSucceeded, _MetamaskConnectEVM_trackWalletActionFailed, _MetamaskConnectEVM_getSelectedChainId, _MetamaskConnectEVM_requestInterceptor, _MetamaskConnectEVM_clearConnectionState, _MetamaskConnectEVM_addEthereumChain, _MetamaskConnectEVM_request, _MetamaskConnectEVM_cacheChainId, _MetamaskConnectEVM_onSessionChanged, _MetamaskConnectEVM_onChainChanged, _MetamaskConnectEVM_onAccountsChanged, _MetamaskConnectEVM_onConnect, _MetamaskConnectEVM_onDisconnect, _MetamaskConnectEVM_onDisplayUri;
+/* eslint-disable no-restricted-syntax -- Private class properties use established patterns */
 import { analytics } from '@metamask/analytics';
+import { parseScopeString } from '@metamask/chain-agnostic-permission';
 import { createMultichainClient, getWalletActionAnalyticsProperties, isRejectionError, TransportType, } from '@metamask/connect-multichain';
-import { numberToHex, hexToNumber, isHexString as isHex, } from '@metamask/utils';
+import { hexToNumber } from '@metamask/utils';
 import { IGNORED_METHODS } from './constants';
 import { enableDebug, logger } from './logger';
 import { EIP1193Provider } from './provider';
-import { getPermittedEthChainIds } from './utils/caip';
+import { getEthAccounts, getPermittedEthChainIds } from './utils/caip';
 import { isAccountsRequest, isAddChainRequest, isChainIdRequest, isConnectRequest, isSwitchChainRequest, validSupportedChainsUrls, } from './utils/type-guards';
-const DEFAULT_CHAIN_ID = 1;
+const DEFAULT_CHAIN_ID = '0x1';
 const CHAIN_STORE_KEY = 'cache_eth_chainId';
 /**
  * The MetamaskConnectEVM class provides an EIP-1193 compatible interface for connecting
@@ -47,18 +49,20 @@ const CHAIN_STORE_KEY = 'cache_eth_chainId';
  *
  * @example
  * ```typescript
- * const sdk = await createEVMClient({
+ * const client = await createEVMClient({
  *   dapp: { name: 'My DApp', url: 'https://mydapp.com' }
  * });
  *
- * await sdk.connect({ chainId: 1 });
- * const provider = await sdk.getProvider();
- * const accounts = await provider.request({ method: 'eth_accounts' });
+ * const { accounts, chainId } = await client.connect({ chainIds: [1, 137] }); // Connect to Ethereum Mainnet, and Polygon
+ *
+ * const provider = client.getProvider();
+ * const signedMessage = await provider.request({ method: 'personal_sign', params: ['0x0', accounts[0]] });
  * ```
  */
 export class MetamaskConnectEVM {
     /**
      * Creates a new MetamaskConnectEVM instance.
+     * Use the static `create()` method instead to ensure proper async initialization.
      *
      * @param options - The options for the MetamaskConnectEVM instance
      * @param options.core - The core instance of the Multichain SDK
@@ -80,6 +84,8 @@ export class MetamaskConnectEVM {
         _MetamaskConnectEVM_displayUriHandler.set(this, void 0);
         /** The clean-up function for the notification handler */
         _MetamaskConnectEVM_removeNotificationHandler.set(this, void 0);
+        /** The current connection status */
+        _MetamaskConnectEVM_status.set(this, 'disconnected');
         __classPrivateFieldSet(this, _MetamaskConnectEVM_core, core, "f");
         __classPrivateFieldSet(this, _MetamaskConnectEVM_provider, new EIP1193Provider(core, __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_requestInterceptor).bind(this)), "f");
         __classPrivateFieldSet(this, _MetamaskConnectEVM_eventHandlers, eventHandlers, "f");
@@ -89,87 +95,78 @@ export class MetamaskConnectEVM {
          *
          * @param session - The session data
          */
-        __classPrivateFieldSet(this, _MetamaskConnectEVM_sessionChangedHandler, (session) => {
-            var _a;
-            logger('event: wallet_sessionChanged', session);
-            __classPrivateFieldSet(this, _MetamaskConnectEVM_sessionScopes, (_a = session === null || session === void 0 ? void 0 : session.sessionScopes) !== null && _a !== void 0 ? _a : {}, "f");
-        }, "f");
-        __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").on('wallet_sessionChanged', __classPrivateFieldGet(this, _MetamaskConnectEVM_sessionChangedHandler, "f").bind(this));
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        __classPrivateFieldSet(this, _MetamaskConnectEVM_sessionChangedHandler, __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onSessionChanged).bind(this), "f");
+        __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").on('wallet_sessionChanged', __classPrivateFieldGet(this, _MetamaskConnectEVM_sessionChangedHandler, "f"));
         /**
          * Handles the display_uri event.
          * Forwards the QR code URI to the provider for custom UI implementations.
          */
         __classPrivateFieldSet(this, _MetamaskConnectEVM_displayUriHandler, __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onDisplayUri).bind(this), "f");
         __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").on('display_uri', __classPrivateFieldGet(this, _MetamaskConnectEVM_displayUriHandler, "f"));
-        // Attempt to set the permitted accounts if there's a valid previous session.
-        // TODO (wenfix): does it make sense to catch here?
-        __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_attemptSessionRecovery).call(this).catch((error) => {
-            console.error('Error attempting session recovery', error);
-        });
         logger('Connect/EVM constructor completed');
     }
+    /**
+     * Creates a fully initialized MetamaskConnectEVM instance.
+     * This is the recommended way to instantiate the class, as it ensures
+     * all async initialization (like session recovery) completes before
+     * the instance is returned.
+     *
+     * @param options - The options for the MetamaskConnectEVM instance
+     * @param options.core - The core instance of the Multichain SDK
+     * @param options.eventHandlers - Optional event handlers for EIP-1193 provider events
+     * @returns A promise that resolves with a fully initialized MetamaskConnectEVM instance
+     */
+    static create(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const instance = new MetamaskConnectEVM(options);
+            yield __classPrivateFieldGet(instance, _MetamaskConnectEVM_core, "f").emitSessionChanged();
+            return instance;
+        });
+    }
     /**
      * Connects to the wallet with the specified chain ID and optional account.
      *
      * @param options - The connection options
-     * @param options.account - Optional specific account to connect to
-     * @param options.forceRequest - Wwhether to force a request regardless of an existing session
-     * @param options.chainIds - Array of chain IDs to connect to
+     * @param [options.account] - Optional param to specify an account to connect to
+     * @param [options.forceRequest] - Optional param to force a connection request regardless of whether there is a pre-existing session
+     * @param [options.chainIds] - Array of chain IDs to connect to (defaults to ethereum mainnet if not provided)
      * @returns A promise that resolves with the connected accounts and chain ID
      */
     connect() {
-        return __awaiter(this, arguments, void 0, function* ({ account, forceRequest, chainIds } = {
-            chainIds: [DEFAULT_CHAIN_ID],
-        }) {
-            var _a, _b;
+        return __awaiter(this, arguments, void 0, function* ({ account, forceRequest, chainIds = [DEFAULT_CHAIN_ID], } = {}) {
+            var _a;
             logger('request: connect', { account });
             if (!chainIds || chainIds.length === 0) {
                 throw new Error('chainIds must be an array of at least one chain ID');
             }
-            const caipChainIds = Array.from(new Set((_a = chainIds.concat(DEFAULT_CHAIN_ID)) !== null && _a !== void 0 ? _a : [DEFAULT_CHAIN_ID])).map((id) => `eip155:${id}`);
+            const caipChainIds = Array.from(new Set((_a = chainIds.concat(DEFAULT_CHAIN_ID)) !== null && _a !== void 0 ? _a : [DEFAULT_CHAIN_ID])).map((id) => `eip155:${hexToNumber(id)}`);
             const caipAccountIds = account
                 ? caipChainIds.map((caipChainId) => `${caipChainId}:${account}`)
                 : [];
-            yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").connect(caipChainIds, caipAccountIds, undefined, forceRequest);
-            const hexPermittedChainIds = getPermittedEthChainIds(__classPrivateFieldGet(this, _MetamaskConnectEVM_sessionScopes, "f"));
-            const initialAccounts = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.sendEip1193Message({ method: 'eth_accounts', params: [] });
-            const chainId = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_getSelectedChainId).call(this, hexPermittedChainIds);
-            __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onConnect).call(this, {
-                chainId,
-                accounts: initialAccounts.result,
-            });
-            // Remove previous notification handler if it exists
-            (_b = __classPrivateFieldGet(this, _MetamaskConnectEVM_removeNotificationHandler, "f")) === null || _b === void 0 ? void 0 : _b.call(this);
-            __classPrivateFieldSet(this, _MetamaskConnectEVM_removeNotificationHandler, __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.onNotification((notification) => {
-                var _a;
-                // @ts-expect-error TODO: address this
-                if ((notification === null || notification === void 0 ? void 0 : notification.method) === 'metamask_accountsChanged') {
-                    // @ts-expect-error TODO: address this
-                    const accounts = notification === null || notification === void 0 ? void 0 : notification.params;
-                    logger('transport-event: accountsChanged', accounts);
-                    __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onAccountsChanged).call(this, accounts);
-                }
-                // @ts-expect-error TODO: address this
-                if ((notification === null || notification === void 0 ? void 0 : notification.method) === 'metamask_chainChanged') {
-                    // @ts-expect-error TODO: address this
-                    const notificationChainId = Number((_a = notification === null || notification === void 0 ? void 0 : notification.params) === null || _a === void 0 ? void 0 : _a.chainId);
-                    logger('transport-event: chainChanged', notificationChainId);
-                    // Cache the chainId for persistence across page refreshes
-                    __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, notificationChainId).catch((error) => {
-                        logger('Error caching chainId in notification handler', error);
+            __classPrivateFieldSet(this, _MetamaskConnectEVM_status, 'connecting', "f");
+            try {
+                // Wait for the wallet_sessionChanged event to fire and set the provider properties
+                const result = new Promise((resolve) => {
+                    __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").once('connect', ({ chainId, accounts }) => {
+                        logger('fulfilled-request: connect', {
+                            chainId,
+                            accounts,
+                        });
+                        resolve({
+                            accounts,
+                            chainId: chainId,
+                        });
                     });
-                    __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, notificationChainId);
-                }
-            }), "f");
-            logger('fulfilled-request: connect', {
-                chainId: chainIds[0],
-                accounts: __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").accounts,
-            });
-            // TODO: update required here since accounts and chainId are now promises
-            return {
-                accounts: __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").accounts,
-                chainId: hexToNumber(chainId),
-            };
+                });
+                yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").connect(caipChainIds, caipAccountIds, undefined, forceRequest);
+                return result;
+            }
+            catch (error) {
+                __classPrivateFieldSet(this, _MetamaskConnectEVM_status, 'disconnected', "f");
+                logger('Error connecting to wallet', error);
+                throw error;
+            }
         });
     }
     /**
@@ -177,7 +174,7 @@ export class MetamaskConnectEVM {
      *
      * @param options - The connection options
      * @param options.message - The message to sign after connecting
-     * @param options.chainIds - Optional chain IDs to connect to (defaults to ethereum mainnet if not provided)
+     * @param [options.chainIds] - Optional hex chain IDs to connect to (defaults to ethereum mainnet if not provided)
      * @returns A promise that resolves with the signature
      * @throws Error if the selected account is not available after timeout
      */
@@ -205,9 +202,9 @@ export class MetamaskConnectEVM {
      * @param options - The options for connecting and invoking the method
      * @param options.method - The method name to invoke
      * @param options.params - The parameters to pass to the method, or a function that receives the account and returns params
-     * @param options.chainIds - Optional chain IDs to connect to (defaults to ethereum mainnet if not provided)
-     * @param options.account - Optional specific account to connect to
-     * @param options.forceRequest - Whether to force a request regardless of an existing session
+     * @param [options.chainIds] - Optional hex chain IDs to connect to (defaults to ethereum mainnet if not provided)
+     * @param [options.account] - Optional specific account to connect to
+     * @param [options.forceRequest] - Whether to force a request regardless of an existing session
      * @returns A promise that resolves with the result of the method invocation
      * @throws Error if the selected account is not available after timeout (for methods that require an account)
      */
@@ -239,16 +236,22 @@ export class MetamaskConnectEVM {
      */
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             logger('request: disconnect');
-            yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").disconnect();
+            const sessionScopes = __classPrivateFieldGet(this, _MetamaskConnectEVM_sessionScopes, "f");
+            const eip155Scopes = Object.keys(sessionScopes).filter((scope) => {
+                const { namespace } = parseScopeString(scope);
+                return namespace === 'eip155';
+            });
+            yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").disconnect(eip155Scopes);
             __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onDisconnect).call(this);
             __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_clearConnectionState).call(this);
-            __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").off('wallet_sessionChanged', __classPrivateFieldGet(this, _MetamaskConnectEVM_sessionChangedHandler, "f"));
-            __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").off('display_uri', __classPrivateFieldGet(this, _MetamaskConnectEVM_displayUriHandler, "f"));
-            if (__classPrivateFieldGet(this, _MetamaskConnectEVM_removeNotificationHandler, "f")) {
-                __classPrivateFieldGet(this, _MetamaskConnectEVM_removeNotificationHandler, "f").call(this);
-                __classPrivateFieldSet(this, _MetamaskConnectEVM_removeNotificationHandler, undefined, "f");
-            }
+            // Note: We intentionally do NOT remove the display_uri and wallet_sessionChanged
+            // listeners here. These are instance-scoped listeners that should remain active
+            // for the lifetime of the SDK instance, allowing reconnection to work properly.
+            // Session-scoped listeners (like the notification handler below) are removed.
+            (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_removeNotificationHandler, "f")) === null || _a === void 0 ? void 0 : _a.call(this);
+            __classPrivateFieldSet(this, _MetamaskConnectEVM_removeNotificationHandler, undefined, "f");
             logger('fulfilled-request: disconnect');
         });
     }
@@ -257,25 +260,24 @@ export class MetamaskConnectEVM {
      *
      * @param options - The options for the switch chain request
      * @param options.chainId - The chain ID to switch to
-     * @param options.chainConfiguration - The chain configuration to use in case the chain is not present by the wallet
-     * @returns The result of the switch chain request
+     * @param [options.chainConfiguration] - The chain configuration to use in case the chain is not present by the wallet
+     * @returns A promise that resolves when the chain has been switched
      */
     switchChain(_a) {
         return __awaiter(this, arguments, void 0, function* ({ chainId, chainConfiguration, }) {
             const method = 'wallet_switchEthereumChain';
-            const hexChainId = isHex(chainId) ? chainId : numberToHex(chainId);
-            const scope = `eip155:${isHex(chainId) ? hexToNumber(chainId) : chainId}`;
-            const params = [{ chainId: hexChainId }];
+            const scope = `eip155:${hexToNumber(chainId)}`;
+            const params = [{ chainId }];
             yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionRequested).call(this, method, scope, params);
             // TODO (wenfix): better way to return here other than resolving.
-            if (this.selectedChainId === hexChainId) {
+            if (this.selectedChainId === chainId) {
                 return Promise.resolve();
             }
             const permittedChainIds = getPermittedEthChainIds(__classPrivateFieldGet(this, _MetamaskConnectEVM_sessionScopes, "f"));
-            if (permittedChainIds.includes(hexChainId) &&
+            if (permittedChainIds.includes(chainId) &&
                 __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transportType === TransportType.MWP) {
-                yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, hexChainId);
-                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, hexChainId);
+                yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, chainId);
+                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, chainId);
                 yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionSucceeded).call(this, method, scope, params);
                 return Promise.resolve();
             }
@@ -293,10 +295,10 @@ export class MetamaskConnectEVM {
                 yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionSucceeded).call(this, method, scope, params);
                 if (result.result === null) {
                     // result is successful we eagerly call onChainChanged to update the provider's selected chain ID.
-                    yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, hexChainId);
-                    __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, hexChainId);
+                    yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, chainId);
+                    __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, chainId);
                 }
-                return result;
+                return Promise.resolve();
             }
             catch (error) {
                 yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionFailed).call(this, method, scope, params, error);
@@ -366,7 +368,7 @@ export class MetamaskConnectEVM {
         return __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").status;
     }
 }
-_MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new WeakMap(), _MetamaskConnectEVM_sessionScopes = new WeakMap(), _MetamaskConnectEVM_eventHandlers = new WeakMap(), _MetamaskConnectEVM_sessionChangedHandler = new WeakMap(), _MetamaskConnectEVM_displayUriHandler = new WeakMap(), _MetamaskConnectEVM_removeNotificationHandler = new WeakMap(), _MetamaskConnectEVM_instances = new WeakSet(), _MetamaskConnectEVM_getCoreOptions = function _MetamaskConnectEVM_getCoreOptions() {
+_MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new WeakMap(), _MetamaskConnectEVM_sessionScopes = new WeakMap(), _MetamaskConnectEVM_eventHandlers = new WeakMap(), _MetamaskConnectEVM_sessionChangedHandler = new WeakMap(), _MetamaskConnectEVM_displayUriHandler = new WeakMap(), _MetamaskConnectEVM_removeNotificationHandler = new WeakMap(), _MetamaskConnectEVM_status = new WeakMap(), _MetamaskConnectEVM_instances = new WeakSet(), _MetamaskConnectEVM_getCoreOptions = function _MetamaskConnectEVM_getCoreOptions() {
     return __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").options;
 }, _MetamaskConnectEVM_createInvokeOptions = function _MetamaskConnectEVM_createInvokeOptions(method, scope, params) {
     return {
@@ -435,6 +437,7 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
     });
 }, _MetamaskConnectEVM_requestInterceptor = function _MetamaskConnectEVM_requestInterceptor(request) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         logger(`Intercepting request for method: ${request.method}`);
         if (IGNORED_METHODS.includes(request.method)) {
             // TODO: replace with correct method unsupported provider error
@@ -469,7 +472,7 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
         }
         if (isSwitchChainRequest(request)) {
             return this.switchChain({
-                chainId: parseInt(request.params[0].chainId, 16),
+                chainId: request.params[0].chainId,
             });
         }
         if (isAddChainRequest(request)) {
@@ -477,10 +480,8 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
         }
         if (isAccountsRequest(request)) {
             const { method } = request;
-            const chainId = __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId
-                ? hexToNumber(__classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId)
-                : 1;
-            const scope = `eip155:${chainId}`;
+            const decimalChainId = hexToNumber((_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId) !== null && _a !== void 0 ? _a : '0x1');
+            const scope = `eip155:${decimalChainId}`;
             const params = [];
             yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionRequested).call(this, method, scope, params);
             yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionSucceeded).call(this, method, scope, params);
@@ -497,17 +498,17 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId = undefined;
 }, _MetamaskConnectEVM_addEthereumChain = function _MetamaskConnectEVM_addEthereumChain(chainConfiguration) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         logger('addEthereumChain called', { chainConfiguration });
         const method = 'wallet_addEthereumChain';
         if (!chainConfiguration) {
             throw new Error('No chain configuration found.');
         }
         // Get chain ID from config or use current chain
-        const chainId = chainConfiguration.chainId
-            ? parseInt(chainConfiguration.chainId, 16)
-            : hexToNumber((_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId) !== null && _a !== void 0 ? _a : '0x1');
-        const scope = `eip155:${chainId}`;
+        const chainId = chainConfiguration.chainId ||
+            __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId ||
+            '0x1';
+        const decimalChainId = hexToNumber(chainId);
+        const scope = `eip155:${decimalChainId}`;
         const params = [chainConfiguration];
         yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_trackWalletActionRequested).call(this, method, scope, params);
         try {
@@ -533,89 +534,124 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
         const result = __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.sendEip1193Message(request);
         if (request.method === 'wallet_addEthereumChain' ||
             request.method === 'wallet_switchEthereumChain') {
-            __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").openDeeplinkIfNeeded();
+            __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").openSimpleDeeplinkIfNeeded();
         }
         return result;
     });
 }, _MetamaskConnectEVM_cacheChainId = function _MetamaskConnectEVM_cacheChainId(chainId) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const hexChainId = isHex(chainId) ? chainId : numberToHex(chainId);
-            yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").storage.adapter.set(CHAIN_STORE_KEY, JSON.stringify(hexChainId));
+            yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").storage.adapter.set(CHAIN_STORE_KEY, JSON.stringify(chainId));
         }
         catch (error) {
             logger('Error caching chainId', error);
         }
     });
+}, _MetamaskConnectEVM_onSessionChanged = function _MetamaskConnectEVM_onSessionChanged(session) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        logger('event: wallet_sessionChanged', session);
+        __classPrivateFieldSet(this, _MetamaskConnectEVM_sessionScopes, (_a = session === null || session === void 0 ? void 0 : session.sessionScopes) !== null && _a !== void 0 ? _a : {}, "f");
+        const hexPermittedChainIds = getPermittedEthChainIds(__classPrivateFieldGet(this, _MetamaskConnectEVM_sessionScopes, "f"));
+        if (hexPermittedChainIds.length === 0) {
+            __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onDisconnect).call(this);
+        }
+        else {
+            let initialAccounts = [];
+            if (__classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").status === 'connected') {
+                const ethAccountsResponse = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.sendEip1193Message({
+                    method: 'eth_accounts',
+                    params: [],
+                });
+                initialAccounts = ethAccountsResponse.result;
+            }
+            else {
+                initialAccounts = getEthAccounts(__classPrivateFieldGet(this, _MetamaskConnectEVM_sessionScopes, "f"));
+            }
+            const chainId = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_getSelectedChainId).call(this, hexPermittedChainIds);
+            __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onConnect).call(this, {
+                chainId,
+                accounts: initialAccounts,
+            });
+        }
+    });
 }, _MetamaskConnectEVM_onChainChanged = function _MetamaskConnectEVM_onChainChanged(chainId) {
     var _a, _b;
-    const hexChainId = isHex(chainId) ? chainId : numberToHex(chainId);
-    if (hexChainId === __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId) {
+    if (chainId === __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId) {
         return;
     }
     logger('handler: chainChanged', { chainId });
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").selectedChainId = chainId;
-    (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.chainChanged) === null || _b === void 0 ? void 0 : _b.call(_a, hexChainId);
-    __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('chainChanged', hexChainId);
+    (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.chainChanged) === null || _b === void 0 ? void 0 : _b.call(_a, chainId);
+    __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('chainChanged', chainId);
 }, _MetamaskConnectEVM_onAccountsChanged = function _MetamaskConnectEVM_onAccountsChanged(accounts) {
     var _a, _b;
+    const accountsUnchanged = accounts.length === __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").accounts.length &&
+        accounts.every((acct, idx) => acct === __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").accounts[idx]);
+    if (accountsUnchanged) {
+        return;
+    }
     logger('handler: accountsChanged', accounts);
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").accounts = accounts;
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('accountsChanged', accounts);
     (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.accountsChanged) === null || _b === void 0 ? void 0 : _b.call(_a, accounts);
 }, _MetamaskConnectEVM_onConnect = function _MetamaskConnectEVM_onConnect({ chainId, accounts, }) {
-    var _a, _b;
+    var _a, _b, _c;
     logger('handler: connect', { chainId, accounts });
     const data = {
-        chainId: isHex(chainId) ? chainId : numberToHex(chainId),
+        chainId,
         accounts,
     };
-    __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('connect', data);
-    (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.connect) === null || _b === void 0 ? void 0 : _b.call(_a, data);
+    if (__classPrivateFieldGet(this, _MetamaskConnectEVM_status, "f") !== 'connected') {
+        __classPrivateFieldSet(this, _MetamaskConnectEVM_status, 'connected', "f");
+        __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('connect', data);
+        (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.connect) === null || _b === void 0 ? void 0 : _b.call(_a, data);
+        (_c = __classPrivateFieldGet(this, _MetamaskConnectEVM_removeNotificationHandler, "f")) === null || _c === void 0 ? void 0 : _c.call(this);
+        // TODO: Verify if #core.on('metamask_accountsChanged') and #core.on('metamask_chainChanged')
+        // would work here instead
+        __classPrivateFieldSet(this, _MetamaskConnectEVM_removeNotificationHandler, __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.onNotification((notification) => {
+            var _a;
+            // @ts-expect-error TODO: address this
+            if ((notification === null || notification === void 0 ? void 0 : notification.method) === 'metamask_accountsChanged') {
+                // @ts-expect-error TODO: address this
+                const notificationAccounts = notification === null || notification === void 0 ? void 0 : notification.params;
+                logger('transport-event: accountsChanged', notificationAccounts);
+                // why are we not caching the accounts here?
+                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onAccountsChanged).call(this, notificationAccounts);
+            }
+            // @ts-expect-error TODO: address this
+            if ((notification === null || notification === void 0 ? void 0 : notification.method) === 'metamask_chainChanged') {
+                // @ts-expect-error TODO: address this
+                const notificationChainId = (_a = notification === null || notification === void 0 ? void 0 : notification.params) === null || _a === void 0 ? void 0 : _a.chainId;
+                logger('transport-event: chainChanged', notificationChainId);
+                // Cache the chainId for persistence across page refreshes
+                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_cacheChainId).call(this, notificationChainId).catch((error) => {
+                    logger('Error caching chainId in notification handler', error);
+                });
+                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, notificationChainId);
+            }
+        }), "f");
+    }
     __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onChainChanged).call(this, chainId);
     __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onAccountsChanged).call(this, accounts);
 }, _MetamaskConnectEVM_onDisconnect = function _MetamaskConnectEVM_onDisconnect() {
     var _a, _b;
+    if (__classPrivateFieldGet(this, _MetamaskConnectEVM_status, "f") === 'disconnected') {
+        return;
+    }
+    __classPrivateFieldSet(this, _MetamaskConnectEVM_status, 'disconnected', "f");
     logger('handler: disconnect');
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('disconnect');
     (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.disconnect) === null || _b === void 0 ? void 0 : _b.call(_a);
     __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onAccountsChanged).call(this, []);
 }, _MetamaskConnectEVM_onDisplayUri = function _MetamaskConnectEVM_onDisplayUri(uri) {
     var _a, _b;
+    if (__classPrivateFieldGet(this, _MetamaskConnectEVM_status, "f") !== 'connecting') {
+        return;
+    }
     logger('handler: display_uri', uri);
     __classPrivateFieldGet(this, _MetamaskConnectEVM_provider, "f").emit('display_uri', uri);
     (_b = (_a = __classPrivateFieldGet(this, _MetamaskConnectEVM_eventHandlers, "f")) === null || _a === void 0 ? void 0 : _a.displayUri) === null || _b === void 0 ? void 0 : _b.call(_a, uri);
-}, _MetamaskConnectEVM_attemptSessionRecovery = function _MetamaskConnectEVM_attemptSessionRecovery() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Skip session recovery if transport is not initialized yet.
-        // Transport is only initialized when there's a stored session or after connect() is called.
-        // Only attempt recovery if we're in a state where transport should be available.
-        if (__classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").status !== 'connected' && __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").status !== 'connecting') {
-            return;
-        }
-        try {
-            const response = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.request({
-                method: 'wallet_getSession',
-            });
-            const { sessionScopes } = response.result;
-            __classPrivateFieldSet(this, _MetamaskConnectEVM_sessionScopes, sessionScopes, "f");
-            const permittedChainIds = getPermittedEthChainIds(sessionScopes);
-            // Instead of using the accounts we get back from calling `wallet_getSession`
-            // we get permitted accounts from `eth_accounts` to make sure we have them ordered by last selected account
-            // and correctly set the currently selected account for the dapp
-            const permittedAccounts = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_core, "f").transport.sendEip1193Message({ method: 'eth_accounts', params: [] });
-            const chainId = yield __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_getSelectedChainId).call(this, permittedChainIds);
-            if (permittedChainIds.length && permittedAccounts.result) {
-                __classPrivateFieldGet(this, _MetamaskConnectEVM_instances, "m", _MetamaskConnectEVM_onConnect).call(this, {
-                    chainId,
-                    accounts: permittedAccounts.result,
-                });
-            }
-        }
-        catch (error) {
-            console.error('Error attempting session recovery', error);
-        }
-    });
 };
 /**
  * Creates a new Metamask Connect/EVM instance
@@ -623,19 +659,27 @@ _MetamaskConnectEVM_core = new WeakMap(), _MetamaskConnectEVM_provider = new Wea
  * @param options - The options for the Metamask Connect/EVM layer
  * @param options.dapp - Dapp identification and branding settings
  * @param options.api - API configuration including read-only RPC map
- * @param options.api.supportedNetworks - A map of CAIP chain IDs to RPC URLs for read-only requests
- * @param options.ui - UI configuration options
- * @param options.ui.headless - Whether to run without UI
- * @param options.ui.preferExtension - Whether to prefer browser extension
- * @param options.ui.showInstallModal - Whether to render installation modal for desktop extension
- * @param options.eventEmitter - The event emitter to use for the Metamask Connect/EVM layer
- * @param options.eventHandlers - The event handlers to use for the Metamask Connect/EVM layer
- * @returns The Metamask Connect/EVM layer instance
+ * @param options.api.supportedNetworks - A map of hex chain IDs to RPC URLs for read-only requests
+ * @param [options.ui] - UI configuration options
+ * @param [options.ui.headless] - Whether to run without UI
+ * @param [options.ui.preferExtension] - Whether to prefer browser extension
+ * @param [options.ui.showInstallModal] - Whether to render installation modal for desktop extension
+ * @param [options.mobile] - Mobile configuration options
+ * @param [options.mobile.preferredOpenLink] - Custom handler for opening deeplinks (useful for React Native, etc.)
+ * @param [options.mobile.useDeeplink] - Whether to use native deeplinks instead of universal links
+ * @param [options.transport] - Transport configuration (e.g., extensionId, notification handler)
+ * @param [options.transport.extensionId] - Extension ID for browser extension transport
+ * @param [options.transport.onNotification] - Callback for receiving transport notifications
+ * @param [options.eventHandlers] - Event handlers for the Metamask Connect/EVM layer
+ * @param [options.debug] - Enable debug logging
+ * @returns The Metamask-Connect EVM client instance
  */
 export function createEVMClient(options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        enableDebug(options.debug);
+        if (options.debug) {
+            enableDebug();
+        }
         logger('Creating Metamask Connect/EVM with options:', options);
         // Validate that supportedNetworks is provided and not empty
         if (!((_a = options.api) === null || _a === void 0 ? void 0 : _a.supportedNetworks) ||
@@ -643,11 +687,17 @@ export function createEVMClient(options) {
             throw new Error('supportedNetworks is required and must contain at least one chain configuration');
         }
         validSupportedChainsUrls(options.api.supportedNetworks, 'supportedNetworks');
+        const supportedNetworksCaipChainId = Object.entries(options.api.supportedNetworks).reduce((acc, [hexChainId, url]) => {
+            const decimalChainId = parseInt(hexChainId, 16);
+            const caip2ChainId = `eip155:${decimalChainId}`;
+            acc[caip2ChainId] = url;
+            return acc;
+        }, {});
         try {
             const core = yield createMultichainClient(Object.assign(Object.assign({}, options), { api: {
-                    supportedNetworks: options.api.supportedNetworks,
+                    supportedNetworks: supportedNetworksCaipChainId,
                 } }));
-            return new MetamaskConnectEVM({
+            return MetamaskConnectEVM.create({
                 core,
                 eventHandlers: options.eventHandlers,
                 supportedNetworks: options.api.supportedNetworks,