@metamask/connect-multichain 0.5.2 → 0.6.0

package/dist/node/cjs/connect-multichain.js

@@ -420,6 +420,34 @@ var init_multichain = __esm({
         super();
         this.options = options;
       }
+      /**
+       * Merges the given options into the current instance options.
+       * Only the mergeable keys are updated (api.supportedNetworks, ui.*, mobile.*, transport.extensionId, debug).
+       * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
+       * subsequent calls to `createMultichainClient` to have a different `dapp` value.
+       * Used when createMultichainClient is called with an existing singleton.
+       *
+       * @param partial - Options to merge/overwrite onto the current instance
+       */
+      mergeOptions(partial) {
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        const opts = this.options;
+        this.options = __spreadProps(__spreadValues({}, opts), {
+          api: __spreadProps(__spreadValues({}, opts.api), {
+            supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a2 = partial.api) == null ? void 0 : _a2.supportedNetworks) != null ? _b : {})
+          }),
+          ui: __spreadProps(__spreadValues({}, opts.ui), {
+            headless: (_d = (_c = partial.ui) == null ? void 0 : _c.headless) != null ? _d : opts.ui.headless,
+            preferExtension: (_f = (_e = partial.ui) == null ? void 0 : _e.preferExtension) != null ? _f : opts.ui.preferExtension,
+            showInstallModal: (_h = (_g = partial.ui) == null ? void 0 : _g.showInstallModal) != null ? _h : opts.ui.showInstallModal
+          }),
+          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_i = partial.mobile) != null ? _i : {}),
+          transport: __spreadProps(__spreadValues({}, (_j = opts.transport) != null ? _j : {}), {
+            extensionId: (_m = (_k = partial.transport) == null ? void 0 : _k.extensionId) != null ? _m : (_l = opts.transport) == null ? void 0 : _l.extensionId
+          }),
+          debug: (_n = partial.debug) != null ? _n : opts.debug
+        });
+      }
     };
   }
 });
@@ -605,6 +633,21 @@ var init_ui = __esm({
 });
 
 // src/multichain/utils/index.ts
+function getGlobalObject() {
+  if (typeof globalThis !== "undefined") {
+    return globalThis;
+  }
+  if (typeof global !== "undefined") {
+    return global;
+  }
+  if (typeof self !== "undefined") {
+    return self;
+  }
+  if (typeof window !== "undefined") {
+    return window;
+  }
+  throw new Error("Unable to locate global object");
+}
 function base64Encode(str) {
   if (typeof btoa !== "undefined") {
     return btoa(str);
@@ -623,8 +666,9 @@ function getDappId(dapp) {
   return (_a2 = dapp.url) != null ? _a2 : dapp.name;
 }
 function openDeeplink(options, deeplink, universalLink) {
+  var _a2;
   const { mobile } = options;
-  const useDeeplink = mobile && mobile.useDeeplink !== void 0 ? mobile.useDeeplink : true;
+  const useDeeplink = (_a2 = mobile == null ? void 0 : mobile.useDeeplink) != null ? _a2 : true;
   if (useDeeplink) {
     if (typeof window !== "undefined") {
       window.location.href = deeplink;
@@ -637,6 +681,29 @@ function openDeeplink(options, deeplink, universalLink) {
     link.click();
   }
 }
+function mergeRequestedSessionWithExisting(sessionData, scopes, caipAccountIds, sessionProperties) {
+  const existingCaipChainIds = Object.keys(sessionData.sessionScopes);
+  const existingCaipAccountIds = [];
+  Object.values(sessionData.sessionScopes).forEach((scopeObject) => {
+    if ((scopeObject == null ? void 0 : scopeObject.accounts) && Array.isArray(scopeObject.accounts)) {
+      scopeObject.accounts.forEach((account) => {
+        existingCaipAccountIds.push(account);
+      });
+    }
+  });
+  const mergedScopes = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipChainIds, ...scopes])
+  );
+  const mergedCaipAccountIds = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipAccountIds, ...caipAccountIds])
+  );
+  const mergedSessionProperties = __spreadValues(__spreadValues({}, sessionData.sessionProperties), sessionProperties);
+  return {
+    mergedScopes,
+    mergedCaipAccountIds,
+    mergedSessionProperties
+  };
+}
 function getOptionalScopes(scopes) {
   return scopes.reduce(
     (prev, scope) => __spreadProps(__spreadValues({}, prev), {
@@ -665,7 +732,7 @@ function setupDappMetadata(options) {
     throw new Error("You must provide dapp url");
   }
   const BASE_64_ICON_MAX_LENGTH = 163400;
-  const urlPattern = /^(http|https):\/\/[^\s]*$/;
+  const urlPattern = /^(http|https):\/\/[^\s]*$/u;
   if (options.dapp) {
     if ("iconUrl" in options.dapp) {
       if (options.dapp.iconUrl && !urlPattern.test(options.dapp.iconUrl)) {
@@ -714,9 +781,12 @@ function getValidAccounts(caipAccountIds) {
     (caipAccounts, caipAccountId) => {
       try {
         return [...caipAccounts, (0, import_utils.parseCaipAccountId)(caipAccountId)];
-      } catch (err) {
+      } catch (error) {
         const stringifiedAccountId = JSON.stringify(caipAccountId);
-        console.error(`Invalid CAIP account ID: ${stringifiedAccountId}`, err);
+        console.error(
+          `Invalid CAIP account ID: ${stringifiedAccountId}`,
+          error
+        );
         return caipAccounts;
       }
     },
@@ -772,12 +842,12 @@ function addValidAccounts(optionalScopes, validAccounts) {
   }
   return result;
 }
-var import_pako, import_utils, extractFavicon;
+var import_utils, import_pako, extractFavicon, MAX, idCounter, getUniqueRequestId;
 var init_utils = __esm({
   "src/multichain/utils/index.ts"() {
     "use strict";
-    import_pako = require("pako");
     import_utils = require("@metamask/utils");
+    import_pako = require("pako");
     init_domain();
     extractFavicon = () => {
       var _a2;
@@ -793,6 +863,12 @@ var init_utils = __esm({
       }
       return favicon;
     };
+    MAX = 4294967295;
+    idCounter = Math.floor(Math.random() * MAX);
+    getUniqueRequestId = () => {
+      idCounter = (idCounter + 1) % MAX;
+      return idCounter;
+    };
   }
 });
 
@@ -879,7 +955,9 @@ var init_domain = __esm({
 
 // src/ui/modals/base/utils.ts
 function formatRemainingTime(milliseconds) {
-  if (milliseconds <= 0) return "EXPIRED";
+  if (milliseconds <= 0) {
+    return "EXPIRED";
+  }
   const seconds = Math.floor(milliseconds / 1e3);
   return `${seconds}s`;
 }
@@ -892,9 +970,8 @@ function shouldLogCountdown(remainingSeconds) {
     return remainingSeconds % 10 === 0;
   } else if (remainingSeconds <= 300) {
     return remainingSeconds % 30 === 0;
-  } else {
-    return remainingSeconds % 60 === 0;
   }
+  return remainingSeconds % 60 === 0;
 }
 var init_utils3 = __esm({
   "src/ui/modals/base/utils.ts"() {
@@ -903,18 +980,18 @@ var init_utils3 = __esm({
 });
 
 // src/ui/modals/base/AbstractInstallModal.ts
-var logger3, AbstractInstallModal;
+var logger3, _expirationInterval, _lastLoggedCountdown, AbstractInstallModal;
 var init_AbstractInstallModal = __esm({
   "src/ui/modals/base/AbstractInstallModal.ts"() {
     "use strict";
-    init_domain();
     init_utils3();
+    init_domain();
     logger3 = createLogger("metamask-sdk:ui");
     AbstractInstallModal = class extends Modal {
       constructor() {
         super(...arguments);
-        this.expirationInterval = null;
-        this.lastLoggedCountdown = -1;
+        __privateAdd(this, _expirationInterval, null);
+        __privateAdd(this, _lastLoggedCountdown, -1);
       }
       get link() {
         return this.data;
@@ -942,17 +1019,17 @@ var init_AbstractInstallModal = __esm({
       startExpirationCheck(connectionRequest) {
         this.stopExpirationCheck();
         let currentConnectionRequest = connectionRequest;
-        this.expirationInterval = setInterval(() => __async(this, null, function* () {
+        __privateSet(this, _expirationInterval, setInterval(() => __async(this, null, function* () {
           const { sessionRequest } = currentConnectionRequest;
           const now = Date.now();
           const remainingMs = sessionRequest.expiresAt - now;
           const remainingSeconds = Math.floor(remainingMs / 1e3);
-          if (remainingMs > 0 && shouldLogCountdown(remainingSeconds) && this.lastLoggedCountdown !== remainingSeconds) {
+          if (remainingMs > 0 && shouldLogCountdown(remainingSeconds) && __privateGet(this, _lastLoggedCountdown) !== remainingSeconds) {
             const formattedTime = formatRemainingTime(remainingMs);
             logger3(
               `[UI: InstallModal-nodejs()] QR code expires in: ${formattedTime} (${remainingSeconds}s)`
             );
-            this.lastLoggedCountdown = remainingSeconds;
+            __privateSet(this, _lastLoggedCountdown, remainingSeconds);
           }
           if (now >= sessionRequest.expiresAt) {
             this.stopExpirationCheck();
@@ -964,7 +1041,7 @@ var init_AbstractInstallModal = __esm({
               const generateQRCode = yield this.options.generateQRCode(
                 currentConnectionRequest
               );
-              this.lastLoggedCountdown = -1;
+              __privateSet(this, _lastLoggedCountdown, -1);
               this.updateLink(generateQRCode);
               this.updateExpiresIn(remainingSeconds);
               this.renderQRCode(generateQRCode, currentConnectionRequest);
@@ -974,18 +1051,20 @@ var init_AbstractInstallModal = __esm({
               );
             }
           }
-        }), 1e3);
+        }), 1e3));
       }
       stopExpirationCheck() {
-        if (this.expirationInterval) {
-          clearInterval(this.expirationInterval);
-          this.expirationInterval = null;
+        if (__privateGet(this, _expirationInterval)) {
+          clearInterval(__privateGet(this, _expirationInterval));
+          __privateSet(this, _expirationInterval, null);
           logger3(
             "[UI: InstallModal-nodejs()] \u{1F6D1} Stopped QR code expiration checking"
           );
         }
       }
     };
+    _expirationInterval = new WeakMap();
+    _lastLoggedCountdown = new WeakMap();
   }
 });
 
@@ -994,8 +1073,8 @@ var import_qr, logger4, InstallModal;
 var init_install = __esm({
   "src/ui/modals/node/install.ts"() {
     "use strict";
-    init_domain();
     import_qr = __toESM(require("@paulmillr/qr"));
+    init_domain();
     init_AbstractInstallModal();
     init_utils3();
     logger4 = createLogger("metamask-sdk:ui");
@@ -1098,7 +1177,7 @@ var node_exports2 = {};
 __export(node_exports2, {
   StoreAdapterNode: () => StoreAdapterNode
 });
-var StoreAdapterNode;
+var _storage, StoreAdapterNode;
 var init_node2 = __esm({
   "src/store/adapters/node.ts"() {
     "use strict";
@@ -1107,25 +1186,26 @@ var init_node2 = __esm({
       constructor() {
         super(...arguments);
         this.platform = "node";
-        this.storage = /* @__PURE__ */ new Map();
+        __privateAdd(this, _storage, /* @__PURE__ */ new Map());
       }
       get(key) {
         return __async(this, null, function* () {
           var _a2;
-          return (_a2 = this.storage.get(key)) != null ? _a2 : null;
+          return (_a2 = __privateGet(this, _storage).get(key)) != null ? _a2 : null;
         });
       }
       set(key, value) {
         return __async(this, null, function* () {
-          this.storage.set(key, value);
+          __privateGet(this, _storage).set(key, value);
         });
       }
       delete(key) {
         return __async(this, null, function* () {
-          this.storage.delete(key);
+          __privateGet(this, _storage).delete(key);
         });
       }
     };
+    _storage = new WeakMap();
   }
 });
 
@@ -1161,6 +1241,7 @@ __export(index_node_exports, {
   isSecure: () => isSecure
 });
 module.exports = __toCommonJS(index_node_exports);
+init_domain();
 
 // src/multichain/index.ts
 var import_analytics4 = require("@metamask/analytics");
@@ -1197,7 +1278,9 @@ var RpcClient = class {
   }
   /**
    * Routes the request to a configured RPC node.
-   * @param options - The invoke method options
+   *
+   * @param options - The invoke method options.
+   * @returns The JSON response from the RPC node.
    */
   request(options) {
     return __async(this, null, function* () {
@@ -1209,7 +1292,13 @@ var RpcClient = class {
         id: getNextRpcId()
       });
       const rpcEndpoint = this.getRpcEndpoint(options.scope);
-      const rpcRequest = yield this.fetchWithTimeout(rpcEndpoint, body, "POST", this.getHeaders(rpcEndpoint), 3e4);
+      const rpcRequest = yield this.fetchWithTimeout(
+        rpcEndpoint,
+        body,
+        "POST",
+        this.getHeaders(rpcEndpoint),
+        3e4
+      );
       const response = yield this.parseResponse(rpcRequest);
       return response;
     });
@@ -1219,7 +1308,9 @@ var RpcClient = class {
     const supportedNetworks = (_c = (_b = (_a2 = this.config) == null ? void 0 : _a2.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
     const rpcEndpoint = supportedNetworks[scope];
     if (!rpcEndpoint) {
-      throw new MissingRpcEndpointErr(`No RPC endpoint found for scope ${scope}`);
+      throw new MissingRpcEndpointErr(
+        `No RPC endpoint found for scope ${scope}`
+      );
     }
     return rpcEndpoint;
   }
@@ -1247,7 +1338,7 @@ var RpcClient = class {
         if (error instanceof Error && error.name === "AbortError") {
           throw new RPCReadonlyRequestErr(`Request timeout after ${timeout}ms`);
         }
-        throw new RPCReadonlyRequestErr(error instanceof Error ? error.message : "Unknown error");
+        throw new RPCReadonlyRequestErr(error.message);
       }
     });
   }
@@ -1292,10 +1383,12 @@ var RequestRouter = class {
    * The main entry point for invoking an RPC method.
    * This method acts as a router, determining the correct handling strategy
    * for the request and delegating to the appropriate private handler.
+   *
+   * @param options
    */
   invokeMethod(options) {
     return __async(this, null, function* () {
-      const method = options.request.method;
+      const { method } = options.request;
       if (RPC_HANDLED_METHODS.has(method)) {
         return this.handleWithRpcNode(options);
       }
@@ -1307,6 +1400,8 @@ var RequestRouter = class {
   }
   /**
    * Forwards the request directly to the wallet via the transport.
+   *
+   * @param options
    */
   handleWithWallet(options) {
     return __async(this, null, function* () {
@@ -1335,7 +1430,10 @@ var RequestRouter = class {
         }
         const response = yield request;
         if (response.error) {
-          throw new RPCInvokeMethodErr(`RPC Request failed with code ${response.error.code}: ${response.error.message}`);
+          const { error } = response;
+          throw new RPCInvokeMethodErr(
+            `RPC Request failed with code ${error.code}: ${error.message}`
+          );
         }
         return response.result;
       }));
@@ -1343,6 +1441,8 @@ var RequestRouter = class {
   }
   /**
    * Routes the request to a configured RPC node.
+   *
+   * @param options
    */
   handleWithRpcNode(options) {
     return __async(this, null, function* () {
@@ -1360,10 +1460,14 @@ var RequestRouter = class {
   }
   /**
    * Responds directly from the SDK's session state.
+   *
+   * @param options
    */
   handleWithSdkState(options) {
     return __async(this, null, function* () {
-      console.warn(`Method "${options.request.method}" is configured for SDK state handling, but this is not yet implemented. Falling back to wallet passthrough.`);
+      console.warn(
+        `Method "${options.request.method}" is configured for SDK state handling, but this is not yet implemented. Falling back to wallet passthrough.`
+      );
       return this.handleWithWallet(options);
     });
   }
@@ -1383,31 +1487,50 @@ withAnalyticsTracking_fn = function(options, execute) {
       } else {
         yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options);
       }
+      if (error instanceof RPCInvokeMethodErr) {
+        throw error;
+      }
       throw new RPCInvokeMethodErr(error.message);
     }
   });
 };
 trackWalletActionRequested_fn = function(options) {
   return __async(this, null, function* () {
-    const props = yield getWalletActionAnalyticsProperties(this.config, this.config.storage, options);
+    const props = yield getWalletActionAnalyticsProperties(
+      this.config,
+      this.config.storage,
+      options
+    );
     import_analytics2.analytics.track("mmconnect_wallet_action_requested", props);
   });
 };
 trackWalletActionSucceeded_fn = function(options) {
   return __async(this, null, function* () {
-    const props = yield getWalletActionAnalyticsProperties(this.config, this.config.storage, options);
+    const props = yield getWalletActionAnalyticsProperties(
+      this.config,
+      this.config.storage,
+      options
+    );
     import_analytics2.analytics.track("mmconnect_wallet_action_succeeded", props);
   });
 };
 trackWalletActionFailed_fn = function(options) {
   return __async(this, null, function* () {
-    const props = yield getWalletActionAnalyticsProperties(this.config, this.config.storage, options);
+    const props = yield getWalletActionAnalyticsProperties(
+      this.config,
+      this.config.storage,
+      options
+    );
     import_analytics2.analytics.track("mmconnect_wallet_action_failed", props);
   });
 };
 trackWalletActionRejected_fn = function(options) {
   return __async(this, null, function* () {
-    const props = yield getWalletActionAnalyticsProperties(this.config, this.config.storage, options);
+    const props = yield getWalletActionAnalyticsProperties(
+      this.config,
+      this.config.storage,
+      options
+    );
     import_analytics2.analytics.track("mmconnect_wallet_action_rejected", props);
   });
 };
@@ -1416,7 +1539,7 @@ trackWalletActionRejected_fn = function(options) {
 var import_multichain_api_client = require("@metamask/multichain-api-client");
 init_utils();
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _reqId, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1425,8 +1548,6 @@ var DefaultTransport = class {
     __privateAdd(this, _defaultRequestOptions, {
       timeout: DEFAULT_REQUEST_TIMEOUT
     });
-    // Use timestamp-based ID to avoid conflicts across disconnect/reconnect cycles
-    __privateAdd(this, _reqId, Date.now());
     __privateAdd(this, _pendingRequests, /* @__PURE__ */ new Map());
     __privateAdd(this, _handleResponseListener);
     __privateAdd(this, _handleNotificationListener);
@@ -1434,8 +1555,7 @@ var DefaultTransport = class {
   sendEip1193Message(payload, options) {
     return __async(this, null, function* () {
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
-      __privateSet(this, _reqId, __privateGet(this, _reqId) + 1);
-      const requestId = `${__privateGet(this, _reqId)}`;
+      const requestId = String(getUniqueRequestId());
       const request = __spreadValues({
         jsonrpc: "2.0",
         id: requestId
@@ -1469,7 +1589,7 @@ var DefaultTransport = class {
   }
   connect(options) {
     return __async(this, null, function* () {
-      var _a2, _b, _c, _d, _e, _f, _g;
+      var _a2, _b, _c, _d, _e;
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
       yield __privateGet(this, _transport).connect();
       const sessionRequest = yield this.request(
@@ -1480,12 +1600,19 @@ var DefaultTransport = class {
         throw new Error(sessionRequest.error.message);
       }
       let walletSession = sessionRequest.result;
+      const createSessionParams = {
+        optionalScopes: addValidAccounts(
+          getOptionalScopes((_a2 = options == null ? void 0 : options.scopes) != null ? _a2 : []),
+          getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
+        ),
+        sessionProperties: options == null ? void 0 : options.sessionProperties
+      };
       if (walletSession && options && !options.forceRequest) {
         const currentScopes = Object.keys(
-          (_a2 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a2 : {}
+          (_c = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _c : {}
         );
-        const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
-        const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
+        const proposedScopes = (_d = options == null ? void 0 : options.scopes) != null ? _d : [];
+        const proposedCaipAccountIds = (_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [];
         const hasSameScopesAndAccounts = isSameScopesAndAccounts(
           currentScopes,
           proposedScopes,
@@ -1493,17 +1620,6 @@ var DefaultTransport = class {
           proposedCaipAccountIds
         );
         if (!hasSameScopesAndAccounts) {
-          yield this.request(
-            { method: "wallet_revokeSession", params: walletSession },
-            __privateGet(this, _defaultRequestOptions)
-          );
-          const optionalScopes = addValidAccounts(
-            getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
-            getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
-          );
-          const createSessionParams = {
-            optionalScopes
-          };
           const response = yield this.request(
             { method: "wallet_createSession", params: createSessionParams },
             __privateGet(this, _defaultRequestOptions)
@@ -1514,14 +1630,6 @@ var DefaultTransport = class {
           walletSession = response.result;
         }
       } else if (!walletSession || (options == null ? void 0 : options.forceRequest)) {
-        const optionalScopes = addValidAccounts(
-          getOptionalScopes((_f = options == null ? void 0 : options.scopes) != null ? _f : []),
-          getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
-        );
-        const createSessionParams = {
-          optionalScopes,
-          sessionProperties: options == null ? void 0 : options.sessionProperties
-        };
         const response = yield this.request(
           { method: "wallet_createSession", params: createSessionParams },
           __privateGet(this, _defaultRequestOptions)
@@ -1538,9 +1646,14 @@ var DefaultTransport = class {
     });
   }
   disconnect() {
-    return __async(this, null, function* () {
+    return __async(this, arguments, function* (scopes = []) {
+      yield this.request({ method: "wallet_revokeSession", params: { scopes } });
+      const response = yield this.request({ method: "wallet_getSession" });
+      const { sessionScopes } = response.result;
+      if (Object.keys(sessionScopes).length > 0) {
+        return;
+      }
       __privateGet(this, _notificationCallbacks).clear();
-      yield this.request({ method: "wallet_revokeSession", params: {} });
       if (__privateGet(this, _handleResponseListener)) {
         window.removeEventListener("message", __privateGet(this, _handleResponseListener));
         __privateSet(this, _handleResponseListener, void 0);
@@ -1554,7 +1667,7 @@ var DefaultTransport = class {
         request.reject(new Error("Transport disconnected"));
       }
       __privateGet(this, _pendingRequests).clear();
-      return __privateGet(this, _transport).disconnect();
+      yield __privateGet(this, _transport).disconnect();
     });
   }
   isConnected() {
@@ -1573,13 +1686,23 @@ var DefaultTransport = class {
     };
   }
   getActiveSession() {
-    throw new Error("getActiveSession is purposely not implemented for the DefaultTransport");
+    return __async(this, null, function* () {
+      throw new Error(
+        "getActiveSession is purposely not implemented for the DefaultTransport"
+      );
+    });
+  }
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      throw new Error(
+        "getStoredPendingSessionRequest is purposely not implemented for the DefaultTransport"
+      );
+    });
   }
 };
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
 _defaultRequestOptions = new WeakMap();
-_reqId = new WeakMap();
 _pendingRequests = new WeakMap();
 _handleResponseListener = new WeakMap();
 _handleNotificationListener = new WeakMap();
@@ -1647,9 +1770,170 @@ setupMessageListener_fn = function() {
   window.addEventListener("message", __privateGet(this, _handleNotificationListener));
 };
 
+// src/multichain/transports/multichainApiClientWrapper/index.ts
+var import_rpc_errors = require("@metamask/rpc-errors");
+init_utils();
+var _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+var MultichainApiClientWrapperTransport = class {
+  constructor(metamaskConnectMultichain) {
+    this.metamaskConnectMultichain = metamaskConnectMultichain;
+    __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
+    __privateAdd(this, _notificationCallbacks2, /* @__PURE__ */ new Set());
+  }
+  isTransportDefined() {
+    try {
+      return Boolean(this.metamaskConnectMultichain.transport);
+    } catch (_error) {
+      return false;
+    }
+  }
+  clearNotificationCallbacks() {
+    __privateGet(this, _notificationCallbacks2).clear();
+  }
+  notifyCallbacks(data) {
+    __privateGet(this, _notificationCallbacks2).forEach((callback) => {
+      callback(data);
+    });
+  }
+  clearTransportNotificationListener() {
+    var _a2;
+    (_a2 = this.notificationListener) == null ? void 0 : _a2.call(this);
+    this.notificationListener = void 0;
+  }
+  setupTransportNotificationListener() {
+    if (!this.isTransportDefined() || this.notificationListener) {
+      return;
+    }
+    this.notificationListener = this.metamaskConnectMultichain.transport.onNotification(
+      this.notifyCallbacks.bind(this)
+    );
+  }
+  connect() {
+    return __async(this, null, function* () {
+      console.log("\u{1F4DA} connect");
+      yield this.metamaskConnectMultichain.emitSessionChanged();
+    });
+  }
+  disconnect() {
+    return __async(this, null, function* () {
+      return Promise.resolve();
+    });
+  }
+  isConnected() {
+    return true;
+  }
+  request(_0) {
+    return __async(this, arguments, function* (params, _options = {}) {
+      const id = getUniqueRequestId();
+      const requestPayload = __spreadValues({
+        id,
+        jsonrpc: "2.0"
+      }, params);
+      switch (requestPayload.method) {
+        case "wallet_createSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn).call(this, requestPayload);
+        case "wallet_getSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletGetSession_fn).call(this, requestPayload);
+        case "wallet_revokeSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletRevokeSession_fn).call(this, requestPayload);
+        case "wallet_invokeMethod":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletInvokeMethod_fn).call(this, requestPayload);
+        default:
+          throw new Error(`Unsupported method: ${requestPayload.method}`);
+      }
+      throw new Error(`Unknown method: ${requestPayload.method}`);
+    });
+  }
+  onNotification(callback) {
+    this.setupTransportNotificationListener();
+    __privateGet(this, _notificationCallbacks2).add(callback);
+    return () => {
+      __privateGet(this, _notificationCallbacks2).delete(callback);
+    };
+  }
+};
+_notificationCallbacks2 = new WeakMap();
+_MultichainApiClientWrapperTransport_instances = new WeakSet();
+walletCreateSession_fn = function(request) {
+  return __async(this, null, function* () {
+    console.log("\u{1F4DA} #walletCreateSession", request);
+    const createSessionParams = request.params;
+    const scopes = Object.keys(__spreadValues(__spreadValues({}, createSessionParams.optionalScopes), createSessionParams.requiredScopes));
+    const scopeAccounts = [];
+    scopes.forEach((scope) => {
+      var _a2, _b, _c, _d;
+      const requiredScope = (_a2 = createSessionParams.requiredScopes) == null ? void 0 : _a2[scope];
+      const optionalScope = (_b = createSessionParams.optionalScopes) == null ? void 0 : _b[scope];
+      if (requiredScope) {
+        scopeAccounts.push(...(_c = requiredScope.accounts) != null ? _c : []);
+      }
+      if (optionalScope) {
+        scopeAccounts.push(...(_d = optionalScope.accounts) != null ? _d : []);
+      }
+    });
+    const accounts = [...new Set(scopeAccounts)];
+    console.log("\u{1F4DA} SDK connect");
+    yield this.metamaskConnectMultichain.connect(
+      scopes,
+      accounts,
+      createSessionParams.sessionProperties
+    );
+    console.log("\u{1F4DA} SDK connected");
+    return this.metamaskConnectMultichain.transport.request({
+      method: "wallet_getSession"
+    });
+  });
+};
+walletGetSession_fn = function(request) {
+  return __async(this, null, function* () {
+    if (!this.isTransportDefined()) {
+      return {
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          sessionScopes: {}
+        }
+      };
+    }
+    return this.metamaskConnectMultichain.transport.request({
+      method: "wallet_getSession"
+    });
+  });
+};
+walletRevokeSession_fn = function(request) {
+  return __async(this, null, function* () {
+    var _a2;
+    if (!this.isTransportDefined()) {
+      return { jsonrpc: "2.0", id: request.id, result: true };
+    }
+    const revokeSessionParams = request.params;
+    const scopes = (_a2 = revokeSessionParams == null ? void 0 : revokeSessionParams.scopes) != null ? _a2 : [];
+    try {
+      yield this.metamaskConnectMultichain.disconnect(scopes);
+      return { jsonrpc: "2.0", id: request.id, result: true };
+    } catch (_error) {
+      return { jsonrpc: "2.0", id: request.id, result: false };
+    }
+  });
+};
+walletInvokeMethod_fn = function(request) {
+  return __async(this, null, function* () {
+    if (!this.isTransportDefined()) {
+      return { error: import_rpc_errors.providerErrors.unauthorized() };
+    }
+    const result = this.metamaskConnectMultichain.invokeMethod(
+      request.params
+    );
+    return {
+      result
+    };
+  });
+};
+
 // src/multichain/transports/mwp/index.ts
 var import_mobile_wallet_protocol_core = require("@metamask/mobile-wallet-protocol-core");
 var import_multichain_api_client2 = require("@metamask/multichain-api-client");
+var import_rpc_errors2 = require("@metamask/rpc-errors");
 init_domain();
 init_utils();
 
@@ -1664,6 +1948,7 @@ var DEFAULT_RESUME_TIMEOUT = 10 * 1e3;
 var SESSION_STORE_KEY = "cache_wallet_getSession";
 var ACCOUNTS_STORE_KEY = "cache_eth_accounts";
 var CHAIN_STORE_KEY = "cache_eth_chainId";
+var PENDING_SESSION_REQUEST_KEY = "pending_session_request";
 var CACHED_METHOD_LIST = [
   "wallet_getSession",
   "wallet_createSession",
@@ -1683,10 +1968,15 @@ var MWPTransport = class {
     this.dappClient = dappClient;
     this.kvstore = kvstore;
     this.options = options;
-    this.__reqId = 0;
     this.__pendingRequests = /* @__PURE__ */ new Map();
     this.notificationCallbacks = /* @__PURE__ */ new Set();
     this.dappClient.on("message", this.handleMessage.bind(this));
+    this.dappClient.on("session_request", (sessionRequest) => {
+      this.currentSessionRequest = sessionRequest;
+      this.kvstore.set(PENDING_SESSION_REQUEST_KEY, JSON.stringify(sessionRequest)).catch((err) => {
+        logger("Failed to store pending session request", err);
+      });
+    });
     if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
       this.windowFocusHandler = this.onWindowFocus.bind(this);
       window.addEventListener("focus", this.windowFocusHandler);
@@ -1701,6 +1991,34 @@ var MWPTransport = class {
   get sessionRequest() {
     return this.currentSessionRequest;
   }
+  /**
+   * Returns the stored pending session request from the dappClient session_request event, if any.
+   *
+   * @returns The stored SessionRequest, or null if none or invalid.
+   */
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      try {
+        const raw = yield this.kvstore.get(PENDING_SESSION_REQUEST_KEY);
+        if (!raw) {
+          return null;
+        }
+        return JSON.parse(raw);
+      } catch (e) {
+        return null;
+      }
+    });
+  }
+  /**
+   * Removes the stored pending session request from the KVStore.
+   * This is necessary to ensure that ConnectMultichain is able to correctly
+   * infer the MWP Transport connection attempt status.
+   */
+  removeStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      yield this.kvstore.delete(PENDING_SESSION_REQUEST_KEY);
+    });
+  }
   onWindowFocus() {
     if (!this.isConnected()) {
       this.dappClient.reconnect();
@@ -1717,6 +2035,17 @@ var MWPTransport = class {
       request.reject(error);
     }
   }
+  parseWalletError(errorPayload) {
+    const errorData = errorPayload;
+    if (typeof errorData.code === "number" && typeof errorData.message === "string") {
+      return import_rpc_errors2.providerErrors.custom({
+        code: errorData.code,
+        message: errorData.message
+      });
+    }
+    const message = errorPayload instanceof Error ? errorPayload.message : JSON.stringify(errorPayload);
+    return import_rpc_errors2.rpcErrors.internal({ message });
+  }
   handleMessage(message) {
     if (typeof message === "object" && message !== null) {
       if ("data" in message) {
@@ -1724,6 +2053,12 @@ var MWPTransport = class {
         if ("id" in messagePayload && typeof messagePayload.id === "string") {
           const request = this.pendingRequests.get(messagePayload.id);
           if (request) {
+            clearTimeout(request.timeout);
+            if ("error" in messagePayload && messagePayload.error) {
+              this.pendingRequests.delete(messagePayload.id);
+              request.reject(this.parseWalletError(messagePayload.error));
+              return;
+            }
             const requestWithName = __spreadProps(__spreadValues({}, messagePayload), {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method
             });
@@ -1731,7 +2066,6 @@ var MWPTransport = class {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method,
               params: requestWithName.result
             });
-            clearTimeout(request.timeout);
             this.notifyCallbacks(notification);
             request.resolve(requestWithName);
             this.pendingRequests.delete(messagePayload.id);
@@ -1821,6 +2155,7 @@ var MWPTransport = class {
           }
           walletSession = response.result;
         }
+        yield this.removeStoredPendingSessionRequest();
         this.notifyCallbacks({
           method: "wallet_sessionChanged",
           params: walletSession
@@ -1836,7 +2171,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -1872,6 +2207,7 @@ var MWPTransport = class {
       if (session) {
         logger("active session found", session);
       }
+      const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
       let timeout;
       let initialConnectionMessageHandler;
       const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
@@ -1902,33 +2238,35 @@ var MWPTransport = class {
               };
               const request = {
                 jsonrpc: "2.0",
-                id: `${this.__reqId++}`,
+                id: String(getUniqueRequestId()),
                 method: "wallet_createSession",
                 params: sessionRequest
               };
               initialConnectionMessageHandler = (message) => __async(this, null, function* () {
-                if (typeof message === "object" && message !== null) {
-                  if ("data" in message) {
-                    const messagePayload = message.data;
-                    if (messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged") {
-                      if (messagePayload.error) {
-                        if (initialConnectionMessageHandler) {
-                          this.dappClient.off(
-                            "message",
-                            initialConnectionMessageHandler
-                          );
-                        }
-                        return rejectConnection(messagePayload.error);
-                      }
-                      yield this.storeWalletSession(
-                        request,
-                        messagePayload
-                      );
-                      this.notifyCallbacks(messagePayload);
-                      return resolveConnection();
-                    }
-                  }
+                if (typeof message !== "object" || message === null) {
+                  return;
+                }
+                if (!("data" in message)) {
+                  return;
+                }
+                const messagePayload = message.data;
+                const isMatchingId = messagePayload.id === request.id;
+                const isMatchingMethod = messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged";
+                if (!isMatchingId && !isMatchingMethod) {
+                  return;
                 }
+                if (messagePayload.error) {
+                  return rejectConnection(
+                    this.parseWalletError(messagePayload.error)
+                  );
+                }
+                yield this.storeWalletSession(
+                  request,
+                  messagePayload
+                );
+                yield this.removeStoredPendingSessionRequest();
+                this.notifyCallbacks(messagePayload);
+                return resolveConnection();
               });
               this.dappClient.on("message", initialConnectionMessageHandler);
               dappClient.connect({
@@ -1949,14 +2287,18 @@ var MWPTransport = class {
             }
           );
         }
-        timeout = setTimeout(() => {
-          reject(new import_multichain_api_client2.TransportTimeoutError());
-        }, this.options.connectionTimeout);
+        timeout = setTimeout(
+          () => {
+            reject(new import_multichain_api_client2.TransportTimeoutError());
+          },
+          storedSessionRequestBeforeConnectionAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+        );
         connection.then(resolve).catch(reject);
       }));
-      return connectionPromise.catch((error) => {
+      return connectionPromise.catch((error) => __async(this, null, function* () {
+        yield this.dappClient.disconnect();
         throw error;
-      }).finally(() => {
+      })).finally(() => {
         if (timeout) {
           clearTimeout(timeout);
         }
@@ -1964,24 +2306,68 @@ var MWPTransport = class {
           this.dappClient.off("message", initialConnectionMessageHandler);
           initialConnectionMessageHandler = void 0;
         }
+        this.removeStoredPendingSessionRequest();
       });
     });
   }
   /**
    * Disconnects from the Mobile Wallet Protocol
    *
+   * @param [scopes] - The scopes to revoke. If not provided or empty, all scopes will be revoked.
    * @returns Nothing
    */
   disconnect() {
-    return __async(this, null, function* () {
-      if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
-        window.removeEventListener("focus", this.windowFocusHandler);
-        this.windowFocusHandler = void 0;
-      }
-      this.kvstore.delete(SESSION_STORE_KEY);
-      this.kvstore.delete(ACCOUNTS_STORE_KEY);
-      this.kvstore.delete(CHAIN_STORE_KEY);
-      return this.dappClient.disconnect();
+    return __async(this, arguments, function* (scopes = []) {
+      var _a2, _b;
+      const cachedSession = yield this.getCachedResponse({
+        jsonrpc: "2.0",
+        id: "0",
+        method: "wallet_getSession"
+      });
+      const cachedSessionScopes = (_b = (_a2 = cachedSession == null ? void 0 : cachedSession.result) == null ? void 0 : _a2.sessionScopes) != null ? _b : {};
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(cachedSessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      const newSessionScopes = Object.fromEntries(
+        Object.entries(cachedSessionScopes).filter(
+          ([key]) => remainingScopes.includes(key)
+        )
+      );
+      this.request({ method: "wallet_revokeSession", params: { scopes } }).catch(
+        (err) => {
+          console.error("error revoking session", err);
+        }
+      );
+      const remainingScopesIncludeEip155 = remainingScopes.some(
+        (scope) => scope.includes("eip155")
+      );
+      if (!remainingScopesIncludeEip155) {
+        this.kvstore.delete(ACCOUNTS_STORE_KEY);
+        this.kvstore.delete(CHAIN_STORE_KEY);
+      }
+      if (remainingScopes.length > 0) {
+        this.kvstore.set(
+          SESSION_STORE_KEY,
+          JSON.stringify({
+            result: {
+              sessionScopes: newSessionScopes
+            }
+          })
+        );
+      } else {
+        this.kvstore.delete(SESSION_STORE_KEY);
+        if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
+          window.removeEventListener("focus", this.windowFocusHandler);
+          this.windowFocusHandler = void 0;
+        }
+        yield this.dappClient.disconnect();
+      }
+      this.notifyCallbacks({
+        method: "wallet_sessionChanged",
+        params: {
+          sessionScopes: newSessionScopes
+        }
+      });
     });
   }
   /**
@@ -2087,7 +2473,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -2169,6 +2555,7 @@ var MWPTransport = class {
       const timeoutPromise = new Promise((_resolve, reject) => {
         setTimeout(() => {
           unsubscribe();
+          this.removeStoredPendingSessionRequest();
           reject(new import_multichain_api_client2.TransportTimeoutError());
         }, this.options.resumeTimeout);
       });
@@ -2206,166 +2593,9 @@ var keymanager = new KeyManager();
 
 // src/multichain/index.ts
 init_utils();
-
-// src/multichain/transports/multichainApiClientWrapper/index.ts
-var import_rpc_errors = require("@metamask/rpc-errors");
-var MAX = 4294967295;
-var idCounter = Math.floor(Math.random() * MAX);
-var getUniqueId = () => {
-  idCounter = (idCounter + 1) % MAX;
-  return idCounter;
-};
-var _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
-var MultichainApiClientWrapperTransport = class {
-  constructor(metamaskConnectMultichain) {
-    this.metamaskConnectMultichain = metamaskConnectMultichain;
-    __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
-    this.requestId = getUniqueId();
-    this.notificationCallbacks = /* @__PURE__ */ new Set();
-  }
-  isTransportDefined() {
-    try {
-      return Boolean(this.metamaskConnectMultichain.transport);
-    } catch (error) {
-      return false;
-    }
-  }
-  clearNotificationCallbacks() {
-    this.notificationCallbacks.clear();
-  }
-  notifyCallbacks(data) {
-    this.notificationCallbacks.forEach((callback) => {
-      callback(data);
-    });
-  }
-  setupNotifcationListener() {
-    this.metamaskConnectMultichain.transport.onNotification(
-      this.notifyCallbacks.bind(this)
-    );
-  }
-  connect() {
-    return __async(this, null, function* () {
-      console.log("\u{1F4DA} connect");
-      return Promise.resolve();
-    });
-  }
-  disconnect() {
-    return __async(this, null, function* () {
-      return Promise.resolve();
-    });
-  }
-  isConnected() {
-    return true;
-  }
-  request(_0) {
-    return __async(this, arguments, function* (params, _options = {}) {
-      const id = this.requestId++;
-      const requestPayload = __spreadValues({
-        id,
-        jsonrpc: "2.0"
-      }, params);
-      switch (requestPayload.method) {
-        case "wallet_createSession":
-          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn).call(this, requestPayload);
-        case "wallet_getSession":
-          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletGetSession_fn).call(this, requestPayload);
-        case "wallet_revokeSession":
-          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletRevokeSession_fn).call(this, requestPayload);
-        case "wallet_invokeMethod":
-          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletInvokeMethod_fn).call(this, requestPayload);
-        default:
-          throw new Error(`Unsupported method: ${requestPayload.method}`);
-      }
-      throw new Error(`Unknown method: ${requestPayload.method}`);
-    });
-  }
-  onNotification(callback) {
-    if (!this.isTransportDefined()) {
-      this.notificationCallbacks.add(callback);
-      return () => {
-        this.notificationCallbacks.delete(callback);
-      };
-    }
-    return this.metamaskConnectMultichain.transport.onNotification(callback);
-  }
-};
-_MultichainApiClientWrapperTransport_instances = new WeakSet();
-walletCreateSession_fn = function(request) {
-  return __async(this, null, function* () {
-    console.log("\u{1F4DA} #walletCreateSession", request);
-    const createSessionParams = request.params;
-    const scopes = Object.keys(__spreadValues(__spreadValues({}, createSessionParams.optionalScopes), createSessionParams.requiredScopes));
-    const scopeAccounts = [];
-    scopes.forEach((scope) => {
-      var _a2, _b, _c, _d;
-      const requiredScope = (_a2 = createSessionParams.requiredScopes) == null ? void 0 : _a2[scope];
-      const optionalScope = (_b = createSessionParams.optionalScopes) == null ? void 0 : _b[scope];
-      if (requiredScope) {
-        scopeAccounts.push(...(_c = requiredScope.accounts) != null ? _c : []);
-      }
-      if (optionalScope) {
-        scopeAccounts.push(...(_d = optionalScope.accounts) != null ? _d : []);
-      }
-    });
-    const accounts = [...new Set(scopeAccounts)];
-    console.log("\u{1F4DA} SDK connect");
-    yield this.metamaskConnectMultichain.connect(
-      scopes,
-      accounts,
-      createSessionParams.sessionProperties
-    );
-    console.log("\u{1F4DA} SDK connected");
-    return this.metamaskConnectMultichain.transport.request({
-      method: "wallet_getSession"
-    });
-  });
-};
-walletGetSession_fn = function(request) {
-  return __async(this, null, function* () {
-    if (!this.isTransportDefined()) {
-      return {
-        jsonrpc: "2.0",
-        id: request.id,
-        result: {
-          sessionScopes: {}
-        }
-      };
-    }
-    return this.metamaskConnectMultichain.transport.request({
-      method: "wallet_getSession"
-    });
-  });
-};
-walletRevokeSession_fn = function(request) {
-  return __async(this, null, function* () {
-    if (!this.isTransportDefined()) {
-      return { jsonrpc: "2.0", id: request.id, result: true };
-    }
-    try {
-      this.metamaskConnectMultichain.disconnect();
-      return { jsonrpc: "2.0", id: request.id, result: true };
-    } catch (error) {
-      return { jsonrpc: "2.0", id: request.id, result: false };
-    }
-  });
-};
-walletInvokeMethod_fn = function(request) {
-  return __async(this, null, function* () {
-    if (!this.isTransportDefined()) {
-      return { error: import_rpc_errors.providerErrors.unauthorized() };
-    }
-    const result = this.metamaskConnectMultichain.invokeMethod(
-      request.params
-    );
-    return {
-      result
-    };
-  });
-};
-
-// src/multichain/index.ts
 var logger2 = createLogger("metamask-sdk:core");
-var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn;
+var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
+var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
 var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
   constructor(options) {
     var _a2, _b, _c, _d, _e, _f;
@@ -2391,8 +2621,12 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     this._status = "pending";
     __privateAdd(this, _listener);
     __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a = this.options.dapp.url) != null ? _a : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
-    __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(this));
-    __privateSet(this, _provider, (0, import_multichain_api_client3.getMultichainClient)({ transport: __privateGet(this, _providerTransportWrapper) }));
+    __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(
+      this
+    ));
+    __privateSet(this, _provider, (0, import_multichain_api_client3.getMultichainClient)({
+      transport: __privateGet(this, _providerTransportWrapper)
+    }));
   }
   get status() {
     return this._status;
@@ -2426,27 +2660,54 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   get transportType() {
     return __privateGet(this, _transport2) instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
   }
+  // Creates a singleton instance of MetaMaskConnectMultichain.
+  // If the singleton already exists, it merges the incoming options with the
+  // existing singleton options for the following keys: `api.supportedNetworks`,
+  // `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note that the
+  // value for `dapp` is not merged as it does not make sense for subsequent calls to
+  // `createMultichainClient` to have a different `dapp` value.
   static create(options) {
     return __async(this, null, function* () {
-      var _a2;
-      const instance = new _MetaMaskConnectMultichain(options);
-      const isEnabled2 = yield isEnabled(
-        "metamask-sdk:core",
-        instance.options.storage
-      );
-      if (isEnabled2) {
-        enableDebug("metamask-sdk:core");
+      const globalObject = getGlobalObject();
+      const existing = globalObject[SINGLETON_KEY];
+      if (existing) {
+        const instance = yield existing;
+        instance.mergeOptions(options);
+        if (options.debug) {
+          enableDebug("metamask-sdk:*");
+        }
+        return instance;
       }
-      yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
-      return instance;
+      const instancePromise = (() => __async(null, null, function* () {
+        var _a2;
+        const instance = new _MetaMaskConnectMultichain(options);
+        const isEnabled2 = yield isEnabled(
+          "metamask-sdk:core",
+          instance.options.storage
+        );
+        if (isEnabled2) {
+          enableDebug("metamask-sdk:core");
+        }
+        yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
+        return instance;
+      }))();
+      globalObject[SINGLETON_KEY] = instancePromise;
+      instancePromise.catch((error) => {
+        globalObject[SINGLETON_KEY] = void 0;
+        console.error("Error initializing MetaMaskConnectMultichain", error);
+      });
+      return instancePromise;
     });
   }
   // TODO: make this into param object
   connect(scopes, caipAccountIds, sessionProperties, forceRequest) {
     return __async(this, null, function* () {
       var _a2;
-      if (this.status !== "connected") {
-        yield this.disconnect();
+      if (this.status === "connecting" && this.transportType === "mwp" /* MWP */) {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, openConnectDeeplinkIfNeeded_fn).call(this);
+        throw new Error(
+          "Existing connection is pending. Please check your MetaMask Mobile app to continue."
+        );
       }
       const { ui } = this.options;
       const platformType = getPlatformType();
@@ -2476,9 +2737,21 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       } catch (error) {
         logger2("Error tracking connection_initiated event", error);
       }
-      const nonEmptySessionProperites = Object.keys(sessionProperties != null ? sessionProperties : {}).length > 0 ? sessionProperties : void 0;
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const { mergedScopes, mergedCaipAccountIds, mergedSessionProperties } = mergeRequestedSessionWithExisting(
+        sessionData,
+        scopes,
+        caipAccountIds,
+        sessionProperties
+      );
+      const nonEmptySessionProperties = Object.keys(mergedSessionProperties != null ? mergedSessionProperties : {}).length > 0 ? mergedSessionProperties : void 0;
       if (((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected()) && !secure) {
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({ scopes, caipAccountIds, sessionProperties: nonEmptySessionProperites, forceRequest }).then(() => __async(this, null, function* () {
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
+          forceRequest
+        }).then(() => __async(this, null, function* () {
           if (__privateGet(this, _transport2) instanceof MWPTransport) {
             return this.storage.setTransport("mwp" /* MWP */);
           }
@@ -2487,18 +2760,28 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({ scopes, caipAccountIds, sessionProperties: nonEmptySessionProperites, forceRequest }), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
+          forceRequest
+        }), scopes, transportType);
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({ scopes, caipAccountIds, sessionProperties: nonEmptySessionProperites, forceRequest }), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
+          forceRequest
+        }), scopes, transportType);
       }
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupMWP_fn).call(this);
       const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
       if (secure && !shouldShowInstallModal) {
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
       }
-      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
     });
   }
   emit(event, args) {
@@ -2507,18 +2790,24 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     super.emit(event, args);
   }
   disconnect() {
-    return __async(this, null, function* () {
+    return __async(this, arguments, function* (scopes = []) {
       var _a2, _b, _c;
-      yield (_a2 = __privateGet(this, _listener)) == null ? void 0 : _a2.call(this);
-      (_b = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _b.call(this);
-      yield (_c = __privateGet(this, _transport2)) == null ? void 0 : _c.disconnect();
-      yield this.storage.removeTransport();
-      this.emit("stateChanged", "disconnected");
-      __privateSet(this, _listener, void 0);
-      __privateSet(this, _beforeUnloadListener, void 0);
-      __privateSet(this, _transport2, void 0);
-      __privateGet(this, _providerTransportWrapper).clearNotificationCallbacks();
-      __privateSet(this, _dappClient, void 0);
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(sessionData.sessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      yield (_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.disconnect(scopes);
+      if (remainingScopes.length === 0) {
+        yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
+        (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
+        yield this.storage.removeTransport();
+        __privateSet(this, _listener, void 0);
+        __privateSet(this, _beforeUnloadListener, void 0);
+        __privateSet(this, _transport2, void 0);
+        __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
+        __privateSet(this, _dappClient, void 0);
+        this.status = "disconnected";
+      }
     });
   }
   invokeMethod(request) {
@@ -2530,7 +2819,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     });
   }
   // DRY THIS WITH REQUEST ROUTER
-  openDeeplinkIfNeeded() {
+  openSimpleDeeplinkIfNeeded() {
     const { ui, mobile } = this.options;
     const { showInstallModal = false } = ui != null ? ui : {};
     const secure = isSecure();
@@ -2550,6 +2839,23 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }), 10);
     }
   }
+  // Provides a way for ecosystem clients (EVM, Solana, etc.) to get the current CAIP session data
+  // when instantiating themselves (as they would have already missed any initial sessionChanged events emitted by ConnectMultichain)
+  // without having to concern themselves with the current transport connection status.
+  emitSessionChanged() {
+    return __async(this, null, function* () {
+      var _a2;
+      const emptySession = { sessionScopes: {} };
+      if (this.status !== "connected" && this.status !== "connecting") {
+        this.emit("wallet_sessionChanged", emptySession);
+        return;
+      }
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      this.emit("wallet_sessionChanged", (_a2 = response.result) != null ? _a2 : emptySession);
+    });
+  }
 };
 _provider = new WeakMap();
 _providerTransportWrapper = new WeakMap();
@@ -2599,7 +2905,7 @@ getStoredTransport_fn = function() {
         if (hasExtensionInstalled) {
           const apiTransport = new DefaultTransport();
           __privateSet(this, _transport2, apiTransport);
-          __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+          __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
           __privateSet(this, _listener, apiTransport.onNotification(
             __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
           ));
@@ -2611,7 +2917,7 @@ getStoredTransport_fn = function() {
         const apiTransport = new MWPTransport(dappClient, kvstore);
         __privateSet(this, _dappClient, dappClient);
         __privateSet(this, _transport2, apiTransport);
-        __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+        __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
         __privateSet(this, _listener, apiTransport.onNotification(
           __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
         ));
@@ -2643,25 +2949,17 @@ setupTransport_fn = function() {
 };
 init_fn = function() {
   return __async(this, null, function* () {
-    var _a2;
     try {
-      if (typeof window !== "undefined" && ((_a2 = window.mmsdk) == null ? void 0 : _a2.isInitialized)) {
-        logger2("MetaMaskSDK: init already initialized");
-      } else {
-        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
-        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
-        try {
-          const baseProps = yield getBaseAnalyticsProperties(
-            this.options,
-            this.storage
-          );
-          import_analytics4.analytics.track("mmconnect_initialized", baseProps);
-        } catch (error) {
-          logger2("Error tracking initialized event", error);
-        }
-        if (typeof window !== "undefined") {
-          window.mmsdk = this;
-        }
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
+      try {
+        const baseProps = yield getBaseAnalyticsProperties(
+          this.options,
+          this.storage
+        );
+        import_analytics4.analytics.track("mmconnect_initialized", baseProps);
+      } catch (error) {
+        logger2("Error tracking initialized event", error);
       }
     } catch (error) {
       yield this.storage.removeTransport();
@@ -2697,7 +2995,7 @@ setupMWP_fn = function() {
     __privateSet(this, _dappClient, dappClient);
     const apiTransport = new MWPTransport(dappClient, kvstore);
     __privateSet(this, _transport2, apiTransport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     __privateSet(this, _listener, this.transport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
@@ -2713,15 +3011,13 @@ onBeforeUnload_fn = function() {
   });
 };
 createBeforeUnloadListener_fn = function() {
+  const handler = __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this);
   if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
-    window.addEventListener("beforeunload", __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this));
+    window.addEventListener("beforeunload", handler);
   }
   return () => {
     if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined") {
-      window.removeEventListener(
-        "beforeunload",
-        __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this)
-      );
+      window.removeEventListener("beforeunload", handler);
     }
   };
 };
@@ -2753,7 +3049,11 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
             (() => __async(this, null, function* () {
               var _a2;
               try {
-                yield this.transport.connect({ scopes, caipAccountIds, sessionProperties });
+                yield this.transport.connect({
+                  scopes,
+                  caipAccountIds,
+                  sessionProperties
+                });
                 yield this.options.ui.factory.unload();
                 (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
                 this.status = "connected";
@@ -2762,13 +3062,14 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
                 if (error instanceof import_mobile_wallet_protocol_core2.ProtocolError) {
                   if (error.code !== import_mobile_wallet_protocol_core2.ErrorCode.REQUEST_EXPIRED) {
                     this.status = "disconnected";
+                    yield this.options.ui.factory.unload(error);
                     reject(error);
                   }
                 } else {
                   this.status = "disconnected";
-                  reject(
-                    error instanceof Error ? error : new Error(String(error))
-                  );
+                  const normalizedError = error instanceof Error ? error : new Error(String(error));
+                  yield this.options.ui.factory.unload(normalizedError);
+                  reject(normalizedError);
                 }
               }
             }))().catch(() => {
@@ -2855,13 +3156,13 @@ setupDefaultTransport_fn = function() {
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
     __privateSet(this, _transport2, transport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     return transport;
   });
 };
 deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => __async(this, null, function* () {
       const dappClientMessageHandler = (payload) => {
         var _a2;
         if (typeof payload !== "object" || payload === null || !("data" in payload)) {
@@ -2882,7 +3183,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
       let timeout;
       if (this.transport.isConnected()) {
         timeout = setTimeout(() => {
-          this.openDeeplinkIfNeeded();
+          this.openSimpleDeeplinkIfNeeded();
         }, 250);
       } else {
         this.dappClient.once(
@@ -2920,7 +3221,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
           clearTimeout(timeout);
         }
       });
-    });
+    }));
   });
 };
 handleConnection_fn = function(promise, scopes, transportType) {
@@ -2965,6 +3266,53 @@ handleConnection_fn = function(promise, scopes, transportType) {
     }));
   });
 };
+getCaipSession_fn = function() {
+  return __async(this, null, function* () {
+    let sessionData = {
+      sessionScopes: {},
+      sessionProperties: {}
+    };
+    if (this.status === "connected") {
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      if (response.result) {
+        sessionData = response.result;
+      }
+    }
+    return sessionData;
+  });
+};
+openConnectDeeplinkIfNeeded_fn = function() {
+  return __async(this, null, function* () {
+    var _a2, _b;
+    const { ui } = this.options;
+    const { showInstallModal = false } = ui != null ? ui : {};
+    const secure = isSecure();
+    const shouldOpenDeeplink = secure && !showInstallModal;
+    if (!shouldOpenDeeplink) {
+      return;
+    }
+    const storedSessionRequest = yield (_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.getStoredPendingSessionRequest();
+    if (!storedSessionRequest) {
+      return;
+    }
+    const connectionRequest = {
+      sessionRequest: storedSessionRequest,
+      metadata: {
+        dapp: this.options.dapp,
+        sdk: { version: getVersion(), platform: getPlatformType() }
+      }
+    };
+    const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+    const universalLink = this.options.ui.factory.createConnectionUniversalLink(connectionRequest);
+    if ((_b = this.options.mobile) == null ? void 0 : _b.preferredOpenLink) {
+      this.options.mobile.preferredOpenLink(deeplink, "_self");
+    } else {
+      openDeeplink(this.options, deeplink, universalLink);
+    }
+  });
+};
 var MetaMaskConnectMultichain = _MetaMaskConnectMultichain;
 
 // src/store/index.ts
@@ -3213,7 +3561,9 @@ var BaseModalFactory = class {
   }
   createConnectionDeeplink(connectionRequest) {
     if (!connectionRequest) {
-      throw new Error("createConnectionDeeplink can only be called with a connection request");
+      throw new Error(
+        "createConnectionDeeplink can only be called with a connection request"
+      );
     }
     const json = JSON.stringify(connectionRequest);
     const compressed = compressString(json);
@@ -3319,14 +3669,17 @@ var ModalFactory = class extends BaseModalFactory {
 // src/index.node.ts
 init_domain();
 var createMultichainClient = (options) => __async(null, null, function* () {
+  if (options.debug) {
+    enableDebug("metamask-sdk:*");
+  }
   const uiModules = yield Promise.resolve().then(() => (init_node(), node_exports));
   let storage;
-  if (!options.storage) {
+  if (options.storage) {
+    storage = options.storage;
+  } else {
     const { StoreAdapterNode: StoreAdapterNode2 } = yield Promise.resolve().then(() => (init_node2(), node_exports2));
     const adapter = new StoreAdapterNode2();
     storage = new Store(adapter);
-  } else {
-    storage = options.storage;
   }
   const factory = new ModalFactory(uiModules);
   return MetaMaskConnectMultichain.create(__spreadProps(__spreadValues({}, options), {