@metamask/connect-multichain 0.15.0 → 1.1.0

package/dist/browser/es/connect-multichain.mjs

@@ -112,7 +112,15 @@ var init_rpc = __esm({
     _RPCReadonlyRequestErr.code = 52;
     RPCReadonlyRequestErr = _RPCReadonlyRequestErr;
     _RPCInvokeMethodErr = class _RPCInvokeMethodErr extends BaseErr {
-      constructor(reason, rpcCode, rpcMessage) {
+      /**
+       * @param reason - MetaMask Connect invokeMethod reason.
+       * @param rpcCode - Original wallet JSON-RPC / EIP-1193 error code.
+       * @param rpcMessage - Original provider-facing wallet message, sourced only
+       * from the wallet's coded error. Unset when the wallet provides no message,
+       * so it may differ from `reason`, which can fall back through the cause chain.
+       * @param rpcData - Original JSON-RPC error data, when provided by the wallet.
+       */
+      constructor(reason, rpcCode, rpcMessage, rpcData) {
         super(
           `RPCErr${_RPCInvokeMethodErr.code}: RPC Client invoke method reason (${reason})`,
           _RPCInvokeMethodErr.code
@@ -120,6 +128,7 @@ var init_rpc = __esm({
         this.reason = reason;
         this.rpcCode = rpcCode;
         this.rpcMessage = rpcMessage;
+        this.rpcData = rpcData;
       }
     };
     _RPCInvokeMethodErr.code = 53;
@@ -252,7 +261,7 @@ var init_logger = __esm({
 });
 
 // src/domain/multichain/api/constants.ts
-var infuraRpcUrls, RPC_HANDLED_METHODS, SDK_HANDLED_METHODS;
+var infuraRpcUrls, RPC_HANDLED_METHODS, SDK_HANDLED_METHODS, EIP1193_PASSTHROUGH_METHODS;
 var init_constants = __esm({
   "src/domain/multichain/api/constants.ts"() {
     "use strict";
@@ -417,6 +426,11 @@ var init_constants = __esm({
       "eth_uninstallFilter"
     ]);
     SDK_HANDLED_METHODS = /* @__PURE__ */ new Set(["eth_accounts", "eth_chainId"]);
+    EIP1193_PASSTHROUGH_METHODS = /* @__PURE__ */ new Set([
+      "wallet_addEthereumChain",
+      "wallet_switchEthereumChain",
+      "eth_accounts"
+    ]);
   }
 });
 
@@ -567,7 +581,7 @@ function hasExtension() {
     return detectionPromise;
   });
 }
-var PlatformType, detectionPromise;
+var PlatformType, NATIVE_METAMASK_EIP6963_RDNS, detectionPromise;
 var init_platform = __esm({
   "src/domain/platform/index.ts"() {
     "use strict";
@@ -579,6 +593,10 @@ var init_platform = __esm({
       PlatformType2["ReactNative"] = "react-native";
       return PlatformType2;
     })(PlatformType || {});
+    NATIVE_METAMASK_EIP6963_RDNS = /* @__PURE__ */ new Set([
+      "io.metamask",
+      "io.metamask.mobile"
+    ]);
     detectionPromise = (() => __async(null, null, function* () {
       const pt = getPlatformType();
       if (pt === "nodejs" /* NonBrowser */ || pt === "react-native" /* ReactNative */) {
@@ -586,23 +604,30 @@ var init_platform = __esm({
       }
       return new Promise((resolve) => {
         const providers = [];
+        const targetWindow = window;
         const handler = (event) => {
           var _a3, _b;
           if ((_b = (_a3 = event == null ? void 0 : event.detail) == null ? void 0 : _a3.info) == null ? void 0 : _b.rdns) {
             providers.push(event.detail);
           }
         };
-        window.addEventListener("eip6963:announceProvider", handler);
-        window.dispatchEvent(new Event("eip6963:requestProvider"));
+        targetWindow.addEventListener("eip6963:announceProvider", handler);
+        targetWindow.dispatchEvent(new Event("eip6963:requestProvider"));
         setTimeout(() => {
-          window.removeEventListener("eip6963:announceProvider", handler);
-          const hasMetaMask = providers.some(
-            (provider) => {
-              var _a3, _b;
-              return (_b = (_a3 = provider == null ? void 0 : provider.info) == null ? void 0 : _a3.rdns) == null ? void 0 : _b.startsWith("io.metamask");
+          try {
+            if (typeof (targetWindow == null ? void 0 : targetWindow.removeEventListener) === "function") {
+              targetWindow.removeEventListener("eip6963:announceProvider", handler);
             }
-          );
-          resolve(hasMetaMask);
+            const hasMetaMask = providers.some(
+              (provider) => {
+                var _a3;
+                return typeof ((_a3 = provider == null ? void 0 : provider.info) == null ? void 0 : _a3.rdns) === "string" && NATIVE_METAMASK_EIP6963_RDNS.has(provider.info.rdns);
+              }
+            );
+            resolve(hasMetaMask);
+          } catch (e) {
+            resolve(false);
+          }
         }, 300);
       });
     }))();
@@ -847,12 +872,14 @@ var init_analytics = __esm({
 
 // src/domain/utils/index.ts
 function getVersion() {
-  return "0.0.0";
+  return packageVersion;
 }
+var packageVersion;
 var init_utils = __esm({
   "src/domain/utils/index.ts"() {
     "use strict";
     init_analytics();
+    packageVersion = false ? "unknown" : "1.1.0";
   }
 });
 
@@ -1159,7 +1186,8 @@ import {
   TransportTimeoutError
 } from "@metamask/multichain-api-client";
 import { JsonRpcError, providerErrors as providerErrors2, rpcErrors } from "@metamask/rpc-errors";
-var DEFAULT_REQUEST_TIMEOUT2, CONNECTION_GRACE_PERIOD, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_RESUME_TIMEOUT, SESSION_STORE_KEY, ACCOUNTS_STORE_KEY, CHAIN_STORE_KEY, PENDING_SESSION_REQUEST_KEY, CACHED_METHOD_LIST, CACHED_RESET_METHOD_LIST, logger, MWPTransport;
+import { createDeferredPromise, isValidJson as isValidJson3 } from "@metamask/utils";
+var DEFAULT_REQUEST_TIMEOUT2, CONNECTION_GRACE_PERIOD, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_RESUME_TIMEOUT, SESSION_STORE_KEY, ACCOUNTS_STORE_KEY, CHAIN_STORE_KEY, PENDING_SESSION_REQUEST_KEY, CACHED_METHOD_LIST, CACHED_RESET_METHOD_LIST, logger, _MWPTransport_instances, onResumeHandler_fn, resumeSession_fn, startSession_fn, MWPTransport;
 var init_mwp = __esm({
   "src/multichain/transports/mwp/index.ts"() {
     "use strict";
@@ -1193,6 +1221,7 @@ var init_mwp = __esm({
         this.dappClient = dappClient;
         this.kvstore = kvstore;
         this.options = options;
+        __privateAdd(this, _MWPTransport_instances);
         this.__pendingRequests = /* @__PURE__ */ new Map();
         this.notificationCallbacks = /* @__PURE__ */ new Set();
         this.dappClient.on("message", this.handleMessage.bind(this));
@@ -1264,14 +1293,33 @@ var init_mwp = __esm({
         const errorData = errorPayload;
         if (typeof errorData.code === "number" && typeof errorData.message === "string") {
           const { code, message: message2 } = errorData;
+          const rawData = errorData.data;
+          const data = isValidJson3(rawData) ? rawData : void 0;
           if (code >= 1e3 && code <= 4999) {
-            return providerErrors2.custom({ code, message: message2 });
+            return providerErrors2.custom({ code, message: message2, data });
           }
-          return new JsonRpcError(code, message2);
+          return new JsonRpcError(code, message2, data);
         }
         const message = errorPayload instanceof Error ? errorPayload.message : JSON.stringify(errorPayload);
         return rpcErrors.internal({ message });
       }
+      getResponseError(messagePayload) {
+        if ("error" in messagePayload && messagePayload.error) {
+          return messagePayload.error;
+        }
+        const { result } = messagePayload;
+        if (typeof result === "object" && result !== null && "error" in result && result.error && this.isErrorPayload(result.error)) {
+          return result.error;
+        }
+        return void 0;
+      }
+      isErrorPayload(errorPayload) {
+        if (errorPayload instanceof Error) {
+          return true;
+        }
+        const errorData = errorPayload;
+        return typeof (errorData == null ? void 0 : errorData.code) === "number" && typeof (errorData == null ? void 0 : errorData.message) === "string";
+      }
       handleMessage(message) {
         if (typeof message === "object" && message !== null) {
           if ("data" in message) {
@@ -1280,9 +1328,10 @@ var init_mwp = __esm({
               const request = this.pendingRequests.get(messagePayload.id);
               if (request) {
                 clearTimeout(request.timeout);
-                if ("error" in messagePayload && messagePayload.error) {
+                const responseError = this.getResponseError(messagePayload);
+                if (responseError) {
                   this.pendingRequests.delete(messagePayload.id);
-                  request.reject(this.parseWalletError(messagePayload.error));
+                  request.reject(this.parseWalletError(responseError));
                   return;
                 }
                 const requestWithName = __spreadProps(__spreadValues({}, messagePayload), {
@@ -1325,73 +1374,6 @@ var init_mwp = __esm({
           }
         }
       }
-      onResumeSuccess(resumeResolve, resumeReject, options) {
-        return __async(this, null, function* () {
-          var _a3, _b, _c, _d, _e, _f, _g;
-          try {
-            yield this.waitForWalletSessionIfNotCached();
-            const sessionRequest = yield this.request({
-              method: "wallet_getSession"
-            });
-            if (sessionRequest.error) {
-              return resumeReject(new Error(sessionRequest.error.message));
-            }
-            let walletSession = sessionRequest.result;
-            if (walletSession && options) {
-              const currentScopes = Object.keys(
-                (_a3 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a3 : {}
-              );
-              const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
-              const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
-              const hasSameScopesAndAccounts = isSameScopesAndAccounts(
-                currentScopes,
-                proposedScopes,
-                walletSession,
-                proposedCaipAccountIds
-              );
-              if (options.forceRequest || !hasSameScopesAndAccounts) {
-                const optionalScopes = addValidAccounts(
-                  getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
-                  getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
-                );
-                const sessionRequest2 = {
-                  optionalScopes
-                };
-                const response = yield this.request({
-                  method: "wallet_createSession",
-                  params: sessionRequest2
-                });
-                if (response.error) {
-                  return resumeReject(new Error(response.error.message));
-                }
-                walletSession = response.result;
-              }
-            } else if (!walletSession) {
-              const optionalScopes = addValidAccounts(
-                getOptionalScopes((_f = options == null ? void 0 : options.scopes) != null ? _f : []),
-                getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
-              );
-              const sessionRequest2 = { optionalScopes };
-              const response = yield this.request({
-                method: "wallet_createSession",
-                params: sessionRequest2
-              });
-              if (response.error) {
-                return resumeReject(new Error(response.error.message));
-              }
-              walletSession = response.result;
-            }
-            yield this.removeStoredPendingSessionRequest();
-            this.notifyCallbacks({
-              method: "wallet_sessionChanged",
-              params: walletSession
-            });
-            return resumeResolve();
-          } catch (err) {
-            return resumeReject(err);
-          }
-        });
-      }
       init() {
         return __async(this, null, function* () {
         });
@@ -1432,7 +1414,6 @@ var init_mwp = __esm({
       }
       connect(options) {
         return __async(this, null, function* () {
-          const { dappClient } = this;
           const session = yield this.getActiveSession();
           if (session) {
             logger("active session found", {
@@ -1441,116 +1422,11 @@ var init_mwp = __esm({
               expiresAt: session.expiresAt
             });
           }
-          const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
-          let timeout;
-          let initialConnectionMessageHandler;
-          const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
-            let connection;
-            if (session) {
-              connection = new Promise((resumeResolve, resumeReject) => {
-                var _a3;
-                if (this.dappClient.state === "CONNECTED") {
-                  this.onResumeSuccess(resumeResolve, resumeReject, options);
-                } else {
-                  this.dappClient.once("connected", () => __async(this, null, function* () {
-                    this.onResumeSuccess(resumeResolve, resumeReject, options);
-                  }));
-                  dappClient.resume((_a3 = session == null ? void 0 : session.id) != null ? _a3 : "");
-                }
-              });
-            } else {
-              connection = new Promise(
-                (resolveConnection, rejectConnection) => {
-                  var _a3, _b;
-                  const optionalScopes = addValidAccounts(
-                    getOptionalScopes((_a3 = options == null ? void 0 : options.scopes) != null ? _a3 : []),
-                    getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
-                  );
-                  const sessionRequest = {
-                    optionalScopes,
-                    sessionProperties: options == null ? void 0 : options.sessionProperties
-                  };
-                  const request = {
-                    jsonrpc: "2.0",
-                    id: String(getUniqueRequestId()),
-                    method: "wallet_createSession",
-                    params: sessionRequest
-                  };
-                  initialConnectionMessageHandler = (message) => __async(this, null, function* () {
-                    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);
-                  const platformType = getPlatformType();
-                  const isQRCodeFlow = [
-                    "web-desktop" /* DesktopWeb */,
-                    "nodejs" /* NonBrowser */
-                  ].includes(platformType);
-                  const initialPayload = {
-                    name: MULTICHAIN_PROVIDER_STREAM_NAME,
-                    data: request
-                  };
-                  dappClient.connect({
-                    mode: "trusted",
-                    initialPayload: isQRCodeFlow ? void 0 : initialPayload
-                  }).then(() => __async(this, null, function* () {
-                    if (isQRCodeFlow) {
-                      return dappClient.sendRequest(initialPayload);
-                    }
-                    return void 0;
-                  })).catch((error) => {
-                    if (initialConnectionMessageHandler) {
-                      this.dappClient.off(
-                        "message",
-                        initialConnectionMessageHandler
-                      );
-                    }
-                    rejectConnection(error);
-                  });
-                }
-              );
-            }
-            timeout = setTimeout(
-              () => {
-                reject(new TransportTimeoutError());
-              },
-              storedSessionRequestBeforeConnectionAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
-            );
-            connection.then(resolve).catch(reject);
-          }));
-          return connectionPromise.catch((error) => __async(this, null, function* () {
+          const connection = session ? __privateMethod(this, _MWPTransport_instances, resumeSession_fn).call(this, session, options) : __privateMethod(this, _MWPTransport_instances, startSession_fn).call(this, options);
+          return connection.catch((error) => __async(this, null, function* () {
             yield this.dappClient.disconnect();
             throw error;
           })).finally(() => {
-            if (timeout) {
-              clearTimeout(timeout);
-            }
-            if (initialConnectionMessageHandler) {
-              this.dappClient.off("message", initialConnectionMessageHandler);
-              initialConnectionMessageHandler = void 0;
-            }
             this.removeStoredPendingSessionRequest();
           });
         });
@@ -1809,6 +1685,188 @@ var init_mwp = __esm({
         });
       }
     };
+    _MWPTransport_instances = new WeakSet();
+    onResumeHandler_fn = function(options) {
+      return __async(this, null, function* () {
+        var _a3, _b, _c, _d, _e, _f, _g;
+        yield this.waitForWalletSessionIfNotCached();
+        const sessionResponse = yield this.request({ method: "wallet_getSession" });
+        if (sessionResponse.error) {
+          throw new Error(sessionResponse.error.message);
+        }
+        let walletSession = sessionResponse.result;
+        if (walletSession && options) {
+          const currentScopes = Object.keys(
+            (_a3 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a3 : {}
+          );
+          const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
+          const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
+          const hasSameScopesAndAccounts = isSameScopesAndAccounts(
+            currentScopes,
+            proposedScopes,
+            walletSession,
+            proposedCaipAccountIds
+          );
+          if (options.forceRequest || !hasSameScopesAndAccounts) {
+            const optionalScopes = addValidAccounts(
+              getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
+              getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
+            );
+            const sessionRequest = {
+              optionalScopes
+            };
+            const response = yield this.request({
+              method: "wallet_createSession",
+              params: sessionRequest
+            });
+            if (response.error) {
+              throw new Error(response.error.message);
+            }
+            walletSession = response.result;
+          }
+        } else if (!walletSession) {
+          const optionalScopes = addValidAccounts(
+            getOptionalScopes((_f = options == null ? void 0 : options.scopes) != null ? _f : []),
+            getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
+          );
+          const sessionRequest = {
+            optionalScopes
+          };
+          const response = yield this.request({
+            method: "wallet_createSession",
+            params: sessionRequest
+          });
+          if (response.error) {
+            throw new Error(response.error.message);
+          }
+          walletSession = response.result;
+        }
+        yield this.removeStoredPendingSessionRequest();
+        this.notifyCallbacks({
+          method: "wallet_sessionChanged",
+          params: walletSession
+        });
+      });
+    };
+    resumeSession_fn = function(session, options) {
+      return __async(this, null, function* () {
+        var _a3;
+        const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+        const resumeDeferred = createDeferredPromise();
+        const runOnResumeHandler = () => __async(this, null, function* () {
+          try {
+            resumeDeferred.resolve(yield __privateMethod(this, _MWPTransport_instances, onResumeHandler_fn).call(this, options));
+          } catch (err) {
+            resumeDeferred.reject(err);
+          }
+        });
+        if (this.dappClient.state === "CONNECTED") {
+          runOnResumeHandler();
+        } else {
+          this.dappClient.once("connected", runOnResumeHandler);
+          this.dappClient.resume((_a3 = session.id) != null ? _a3 : "").catch((err) => resumeDeferred.reject(err));
+        }
+        const timeoutDeferred = createDeferredPromise();
+        const timeout = setTimeout(
+          () => timeoutDeferred.reject(new TransportTimeoutError()),
+          isContinuingPriorAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+        );
+        const cleanup = () => this.dappClient.off("connected", runOnResumeHandler);
+        return Promise.race([
+          resumeDeferred.promise,
+          timeoutDeferred.promise
+        ]).finally(() => {
+          clearTimeout(timeout);
+          cleanup();
+        });
+      });
+    };
+    startSession_fn = function(options) {
+      return __async(this, null, function* () {
+        var _a3, _b;
+        const { dappClient } = this;
+        const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+        const connDeferred = createDeferredPromise();
+        const optionalScopes = addValidAccounts(
+          getOptionalScopes((_a3 = options == null ? void 0 : options.scopes) != null ? _a3 : []),
+          getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
+        );
+        const sessionRequest = {
+          optionalScopes,
+          sessionProperties: options == null ? void 0 : options.sessionProperties
+        };
+        const request = {
+          jsonrpc: "2.0",
+          id: String(getUniqueRequestId()),
+          method: "wallet_createSession",
+          params: sessionRequest
+        };
+        let handler;
+        const removeHandler = () => {
+          if (handler) {
+            this.dappClient.off("message", handler);
+            handler = void 0;
+          }
+        };
+        handler = (message) => __async(this, null, function* () {
+          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;
+          }
+          const responseError = this.getResponseError(messagePayload);
+          if (responseError) {
+            connDeferred.reject(this.parseWalletError(responseError));
+            return;
+          }
+          yield this.storeWalletSession(
+            request,
+            messagePayload
+          );
+          yield this.removeStoredPendingSessionRequest();
+          this.notifyCallbacks(messagePayload);
+          connDeferred.resolve();
+        });
+        this.dappClient.on("message", handler);
+        const platformType = getPlatformType();
+        const isQRCodeFlow = [
+          "web-desktop" /* DesktopWeb */,
+          "nodejs" /* NonBrowser */
+        ].includes(platformType);
+        const initialPayload = {
+          name: MULTICHAIN_PROVIDER_STREAM_NAME,
+          data: request
+        };
+        dappClient.connect({
+          mode: "trusted",
+          initialPayload: isQRCodeFlow ? void 0 : initialPayload
+        }).then(() => __async(this, null, function* () {
+          if (isQRCodeFlow) {
+            return dappClient.sendRequest(initialPayload);
+          }
+          return void 0;
+        })).catch((error) => connDeferred.reject(error));
+        const timeoutDeferred = createDeferredPromise();
+        const timeout = setTimeout(
+          () => timeoutDeferred.reject(new TransportTimeoutError()),
+          isContinuingPriorAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+        );
+        return Promise.race([
+          connDeferred.promise,
+          timeoutDeferred.promise
+        ]).finally(() => {
+          clearTimeout(timeout);
+          removeHandler();
+        });
+      });
+    };
   }
 });
 
@@ -1981,9 +2039,7 @@ var init_install = __esm({
       mount() {
         var _a3;
         const { options } = this;
-        const modal = document.createElement(
-          "mm-install-modal"
-        );
+        const modal = document.createElement("mm-install-modal");
         modal.showInstallModal = options.showInstallModal;
         modal.addEventListener("close", (ev) => {
           const { detail } = ev;
@@ -2179,6 +2235,7 @@ import { analytics as analytics2 } from "@metamask/analytics";
 import {
   getMultichainClient
 } from "@metamask/multichain-api-client";
+import { createDeferredPromise as createDeferredPromise2 } from "@metamask/utils";
 
 // src/config/index.ts
 var MWP_RELAY_URL = "wss://mm-sdk-relay.api.cx.metamask.io/connection/websocket";
@@ -2302,17 +2359,93 @@ import { analytics } from "@metamask/analytics";
 init_domain();
 init_utils2();
 init_analytics();
+
+// src/multichain/rpc/invocationError.ts
+init_domain();
+import { isValidJson } from "@metamask/utils";
+var MAX_ERROR_CAUSE_DEPTH = 5;
+function getErrorObject(value) {
+  if (typeof value === "object" && value !== null) {
+    return value;
+  }
+  return void 0;
+}
+function getNumericCode(value) {
+  return typeof value === "number" ? value : void 0;
+}
+function getNonEmptyMessage(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function getJsonData(value) {
+  return value !== void 0 && isValidJson(value) ? value : void 0;
+}
+function getFirstNonEmptyMessage(values) {
+  for (const value of values) {
+    const message = getNonEmptyMessage(value);
+    if (message !== void 0) {
+      return message;
+    }
+  }
+  return void 0;
+}
+function getErrorObjectChain(errorObject) {
+  const chain = [];
+  let currentObject = errorObject;
+  for (let depth = 0; currentObject !== void 0 && depth < MAX_ERROR_CAUSE_DEPTH; depth += 1) {
+    chain.push(currentObject);
+    currentObject = getErrorObject(currentObject.cause);
+  }
+  return chain;
+}
+function getCodedErrorDetails(value) {
+  const code = getNumericCode(value == null ? void 0 : value.code);
+  if (code === void 0) {
+    return void 0;
+  }
+  const message = getNonEmptyMessage(value == null ? void 0 : value.message);
+  const data = getJsonData(value == null ? void 0 : value.data);
+  return __spreadValues(__spreadValues({
+    code
+  }, message === void 0 ? {} : { message }), data === void 0 ? {} : { data });
+}
+function getInvocationErrorDetails(error) {
+  var _a3, _b, _c, _d;
+  const errorObject = getErrorObject(error);
+  const errorObjectChain = getErrorObjectChain(errorObject);
+  const primitiveMessage = getNonEmptyMessage(error);
+  for (const [index, currentObject] of errorObjectChain.entries()) {
+    const codedDetails = getCodedErrorDetails(currentObject);
+    if (codedDetails) {
+      const descendantObjects = errorObjectChain.slice(index + 1);
+      const ancestorObjects = errorObjectChain.slice(0, index);
+      const descendantMessage = getFirstNonEmptyMessage(
+        descendantObjects.map((object) => object.message)
+      );
+      const ancestorMessage = getFirstNonEmptyMessage([
+        primitiveMessage,
+        ...ancestorObjects.map((object) => object.message)
+      ]);
+      const reason2 = (_c = (_b = (_a3 = codedDetails.message) != null ? _a3 : descendantMessage) != null ? _b : ancestorMessage) != null ? _c : "Unknown error";
+      return __spreadValues(__spreadValues({
+        reason: reason2,
+        rpcCode: codedDetails.code
+      }, codedDetails.message === void 0 ? {} : { rpcMessage: codedDetails.message }), codedDetails.data === void 0 ? {} : { rpcData: codedDetails.data });
+    }
+  }
+  const reason = (_d = primitiveMessage != null ? primitiveMessage : getFirstNonEmptyMessage(errorObjectChain.map((object) => object.message))) != null ? _d : "Unknown error";
+  return {
+    reason
+  };
+}
 function toRPCInvokeMethodErr(error) {
-  var _a3;
   if (error instanceof RPCInvokeMethodErr) {
     return error;
   }
-  const castError = error;
-  return new RPCInvokeMethodErr(
-    (_a3 = castError.message) != null ? _a3 : "Unknown error",
-    castError.code
-  );
+  const { reason, rpcCode, rpcMessage, rpcData } = getInvocationErrorDetails(error);
+  return new RPCInvokeMethodErr(reason, rpcCode, rpcMessage, rpcData);
 }
+
+// src/multichain/rpc/requestRouter.ts
 var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
   constructor(transport, rpcClient, config, transportType) {
@@ -2332,6 +2465,9 @@ var RequestRouter = class {
   invokeMethod(options) {
     return __async(this, null, function* () {
       const { method } = options.request;
+      if (EIP1193_PASSTHROUGH_METHODS.has(method)) {
+        return this.handleWithEip1193Passthrough(options);
+      }
       if (RPC_HANDLED_METHODS.has(method)) {
         return this.handleWithRpcNode(options);
       }
@@ -2341,6 +2477,29 @@ var RequestRouter = class {
       return this.handleWithWallet(options);
     });
   }
+  /**
+   * Forwards EIP-1193 / legacy provider methods (e.g. `wallet_addEthereumChain`,
+   * `wallet_switchEthereumChain`, `eth_accounts`) directly to the underlying
+   * transport's `sendEip1193Message`, bypassing the multichain
+   * `wallet_invokeMethod` envelope. These methods are wallet-side concerns the
+   * Multichain API does not model, so we forward the raw `{ method, params }`
+   * payload and return the wallet's full JSON-RPC response envelope unchanged.
+   *
+   * Analytics tracking is intentionally skipped here: ecosystem clients
+   * (e.g. `connect-evm`) emit their own `wallet_action_*` events around these
+   * passthrough calls, and adding router-level tracking would double-count.
+   *
+   * @param options
+   */
+  handleWithEip1193Passthrough(options) {
+    return __async(this, null, function* () {
+      const response = yield this.transport.sendEip1193Message({
+        method: options.request.method,
+        params: options.request.params
+      });
+      return response.result;
+    });
+  }
   /**
    * Forwards the request directly to the wallet via the transport.
    *
@@ -2373,12 +2532,7 @@ var RequestRouter = class {
         }
         const response = yield request;
         if (response.error) {
-          const { error } = response;
-          throw new RPCInvokeMethodErr(
-            `RPC Request failed with code ${error.code}: ${error.message}`,
-            error.code,
-            error.message
-          );
+          throw toRPCInvokeMethodErr(response.error);
         }
         return response.result;
       }));
@@ -2432,13 +2586,15 @@ withAnalyticsTracking_fn = function(options, execute) {
       yield __privateMethod(this, _RequestRouter_instances, trackWalletActionSucceeded_fn).call(this, options);
       return result;
     } catch (error) {
-      const isRejection = isRejectionError(error);
+      const normalizedError = toRPCInvokeMethodErr(error);
+      const analyticsError = normalizedError.rpcCode === void 0 ? error : normalizedError;
+      const isRejection = isRejectionError(analyticsError);
       if (isRejection) {
         yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRejected_fn).call(this, options);
       } else {
-        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options, error);
+        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options, analyticsError);
       }
-      throw toRPCInvokeMethodErr(error);
+      throw normalizedError;
     }
   });
 };
@@ -2493,8 +2649,9 @@ init_utils2();
 import {
   getDefaultTransport
 } from "@metamask/multichain-api-client";
+import { isValidJson as isValidJson2 } from "@metamask/utils";
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, parseWalletError_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -2630,7 +2787,11 @@ var DefaultTransport = class {
   }
   request(_0) {
     return __async(this, arguments, function* (request, options = __privateGet(this, _defaultRequestOptions)) {
-      return __privateGet(this, _transport).request(request, options);
+      const response = yield __privateGet(this, _transport).request(request, options);
+      if (response.error) {
+        throw __privateMethod(this, _DefaultTransport_instances, parseWalletError_fn).call(this, response.error);
+      }
+      return response;
     });
   }
   onNotification(callback) {
@@ -2674,6 +2835,20 @@ notifyCallbacks_fn = function(data) {
     }
   }
 };
+parseWalletError_fn = function(errorPayload) {
+  const errorData = errorPayload;
+  const error = new Error(
+    typeof errorData.message === "string" ? errorData.message : "Request failed"
+  );
+  if (typeof errorData.code === "number") {
+    error.code = errorData.code;
+  }
+  const { data } = errorData;
+  if (isValidJson2(data)) {
+    error.data = data;
+  }
+  return error;
+};
 isMetamaskProviderEvent_fn = function(event) {
   var _a3, _b;
   return ((_b = (_a3 = event == null ? void 0 : event.data) == null ? void 0 : _a3.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
@@ -2696,13 +2871,7 @@ handleResponse_fn = function(event) {
       __privateGet(this, _pendingRequests).delete(responseId);
       const response = responseData;
       if ("error" in response && response.error) {
-        const error = new Error(
-          response.error.message || "Request failed"
-        );
-        if (typeof response.error.code === "number") {
-          error.code = response.error.code;
-        }
-        pendingRequest.reject(error);
+        pendingRequest.reject(__privateMethod(this, _DefaultTransport_instances, parseWalletError_fn).call(this, response.error));
       } else {
         pendingRequest.resolve(response);
       }
@@ -2740,22 +2909,21 @@ init_fn = function() {
 // src/multichain/transports/multichainApiClientWrapper/index.ts
 init_utils2();
 import { providerErrors } from "@metamask/rpc-errors";
-var _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+var _notificationCallbacks2, _getTransport, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
 var MultichainApiClientWrapperTransport = class {
-  constructor(metamaskConnectMultichain) {
+  constructor(metamaskConnectMultichain, getTransport) {
     this.metamaskConnectMultichain = metamaskConnectMultichain;
     __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
     __privateAdd(this, _notificationCallbacks2, /* @__PURE__ */ new Set());
+    __privateAdd(this, _getTransport);
+    __privateSet(this, _getTransport, getTransport);
   }
   isTransportDefined() {
-    try {
-      return Boolean(this.metamaskConnectMultichain.transport);
-    } catch (_error) {
-      return false;
-    }
+    return __privateGet(this, _getTransport).call(this) !== void 0;
   }
   isTransportConnected() {
-    return this.isTransportDefined() && this.metamaskConnectMultichain.transport.isConnected();
+    var _a3, _b;
+    return (_b = (_a3 = __privateGet(this, _getTransport).call(this)) == null ? void 0 : _a3.isConnected()) != null ? _b : false;
   }
   clearNotificationCallbacks() {
     __privateGet(this, _notificationCallbacks2).clear();
@@ -2771,10 +2939,11 @@ var MultichainApiClientWrapperTransport = class {
     this.notificationListener = void 0;
   }
   setupTransportNotificationListener() {
-    if (!this.isTransportDefined() || this.notificationListener) {
+    const transport = __privateGet(this, _getTransport).call(this);
+    if (!transport || this.notificationListener) {
       return;
     }
-    this.notificationListener = this.metamaskConnectMultichain.transport.onNotification(
+    this.notificationListener = transport.onNotification(
       this.notifyCallbacks.bind(this)
     );
   }
@@ -2824,6 +2993,7 @@ var MultichainApiClientWrapperTransport = class {
   }
 };
 _notificationCallbacks2 = new WeakMap();
+_getTransport = new WeakMap();
 _MultichainApiClientWrapperTransport_instances = new WeakSet();
 walletCreateSession_fn = function(request) {
   return __async(this, null, function* () {
@@ -2847,14 +3017,19 @@ walletCreateSession_fn = function(request) {
       accounts,
       createSessionParams.sessionProperties
     );
-    return this.metamaskConnectMultichain.transport.request({
+    const transport = __privateGet(this, _getTransport).call(this);
+    if (!transport) {
+      throw new Error("Transport not initialized after connect");
+    }
+    return transport.request({
       method: "wallet_getSession"
     });
   });
 };
 walletGetSession_fn = function(request) {
   return __async(this, null, function* () {
-    if (!this.isTransportConnected()) {
+    const transport = __privateGet(this, _getTransport).call(this);
+    if (!(transport == null ? void 0 : transport.isConnected())) {
       return {
         jsonrpc: "2.0",
         id: request.id,
@@ -2863,7 +3038,7 @@ walletGetSession_fn = function(request) {
         }
       };
     }
-    return this.metamaskConnectMultichain.transport.request({
+    return transport.request({
       method: "wallet_getSession"
     });
   });
@@ -2941,7 +3116,7 @@ function setupAnalyticsGlobals(options, storage, setAnonId) {
     analytics2.enable();
   });
 }
-var _a2, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _transportType, _listener, _anonId, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, buildConnectionMetadata_fn, init_fn2, 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 _a2, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _transportType, _listener, _anonId, _MetaMaskConnectMultichain_instances, transportOrThrow_fn, _sdkInfo, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, buildConnectionMetadata_fn, init_fn2, 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 _a3, _b, _c, _d;
@@ -2954,9 +3129,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }),
       analytics: normalizeAnalyticsOptions(options.analytics),
       versions: __spreadValues({
-        // typeof guard needed: Metro (React Native) bundles TS source directly,
-        // bypassing the tsup build that substitutes __PACKAGE_VERSION__.
-        "connect-multichain": false ? "unknown" : "0.15.0"
+        "connect-multichain": getVersion()
       }, (_d = options.versions) != null ? _d : {})
     });
     super(allOptions);
@@ -2972,7 +3145,8 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     __privateAdd(this, _anonId);
     __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a2 = this.options.dapp.url) != null ? _a2 : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
     __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(
-      this
+      this,
+      () => __privateGet(this, _transport2)
     ));
     __privateSet(this, _provider, getMultichainClient({
       transport: __privateGet(this, _providerTransportWrapper)
@@ -2991,12 +3165,6 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   get provider() {
     return __privateGet(this, _provider);
   }
-  get transport() {
-    if (!__privateGet(this, _transport2)) {
-      throw new Error("Transport not initialized, establish connection first");
-    }
-    return __privateGet(this, _transport2);
-  }
   get dappClient() {
     if (!__privateGet(this, _dappClient)) {
       throw new Error("DappClient not initialized, establish connection first");
@@ -3010,6 +3178,9 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   get storage() {
     return this.options.storage;
   }
+  get version() {
+    return getVersion();
+  }
   // 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`,
@@ -3024,6 +3195,11 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       const existing = globalObject[SINGLETON_KEY];
       if (existing) {
         const instance = yield existing;
+        if (instance.version !== getVersion()) {
+          console.warn(
+            `MetaMask Connect does not support using multiple versions of @metamask/connect-multichain. Attempted to create a new instance with version ${getVersion()}, but an existing ${instance.version} singleton was already initialized. Using the existing ${instance.version} singleton. This is NOT supported and may lead to unexpected behavior. Please ensure there is only one version of @metamask/connect-multichain package resolved in your application.`
+          );
+        }
         instance.mergeOptions(options);
         if (instance instanceof _MetaMaskConnectMultichain) {
           yield __privateMethod(_a3 = instance, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(_a3);
@@ -3047,12 +3223,12 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
         }
         yield __privateMethod(_a4 = instance, _MetaMaskConnectMultichain_instances, init_fn2).call(_a4);
         return instance;
-      }))();
-      globalObject[SINGLETON_KEY] = instancePromise;
-      instancePromise.catch((error) => {
+      }))().catch((error) => {
         globalObject[SINGLETON_KEY] = void 0;
         console.error("Error initializing MetaMaskConnectMultichain", error);
+        throw error;
       });
+      globalObject[SINGLETON_KEY] = instancePromise;
       return instancePromise;
     });
   }
@@ -3112,9 +3288,9 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
           forceRequest
         }).then(() => __async(this, null, function* () {
           if (__privateGet(this, _transportType) === "mwp" /* MWP */) {
-            return this.storage.setTransport("mwp" /* MWP */);
+            return this.storage.setTransportType("mwp" /* MWP */);
           }
-          return this.storage.setTransport("browser" /* Browser */);
+          return this.storage.setTransportType("browser" /* Browser */);
         })), scopes, transportType);
       }
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
@@ -3143,11 +3319,6 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       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) {
-    var _a3, _b;
-    (_b = (_a3 = this.options.transport) == null ? void 0 : _a3.onNotification) == null ? void 0 : _b.call(_a3, { method: event, params: args });
-    super.emit(event, args);
-  }
   disconnect() {
     return __async(this, arguments, function* (scopes = []) {
       var _a3, _b, _c;
@@ -3157,7 +3328,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       );
       yield (_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.disconnect(scopes);
       if (remainingScopes.length === 0) {
-        yield this.storage.removeTransport();
+        yield this.storage.removeTransportType();
         if (__privateGet(this, _transportType) !== "browser" /* Browser */) {
           yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
           (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
@@ -3175,7 +3346,8 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   invokeMethod(request) {
     return __async(this, null, function* () {
       var _a3;
-      const { transport, options } = this;
+      const transport = __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this);
+      const { options } = this;
       const rpcClient = new RpcClient(options, __privateGet(this, _sdkInfo));
       const requestRouter = new RequestRouter(
         transport,
@@ -3194,7 +3366,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     const shouldOpenDeeplink = secure && !showInstallModal;
     if (shouldOpenDeeplink) {
       setTimeout(() => __async(this, null, function* () {
-        const session = yield this.transport.getActiveSession();
+        const session = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).getActiveSession();
         if (!session) {
           throw new Error("No active session found");
         }
@@ -3218,10 +3390,13 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
         this.emit("wallet_sessionChanged", emptySession);
         return;
       }
-      const response = yield this.transport.request({
+      const response = yield __privateGet(this, _transport2).request({
         method: "wallet_getSession"
       });
-      this.emit("wallet_sessionChanged", (_b = response.result) != null ? _b : emptySession);
+      this.emit(
+        "wallet_sessionChanged",
+        (_b = response.result) != null ? _b : emptySession
+      );
     });
   }
 };
@@ -3233,8 +3408,14 @@ _beforeUnloadListener = new WeakMap();
 _transportType = new WeakMap();
 _listener = new WeakMap();
 _anonId = new WeakMap();
-_sdkInfo = new WeakMap();
 _MetaMaskConnectMultichain_instances = new WeakSet();
+transportOrThrow_fn = function() {
+  if (!__privateGet(this, _transport2)) {
+    throw new Error("Transport not initialized, establish connection first");
+  }
+  return __privateGet(this, _transport2);
+};
+_sdkInfo = new WeakMap();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
     yield setupAnalyticsGlobals(this.options, this.storage, (anonId) => {
@@ -3260,7 +3441,7 @@ onTransportNotification_fn = function(payload) {
 };
 getStoredTransport_fn = function() {
   return __async(this, null, function* () {
-    const transportType = yield this.storage.getTransport();
+    const transportType = yield this.storage.getTransportType();
     const hasExtensionInstalled = yield hasExtension();
     if (transportType) {
       if (transportType === "browser" /* Browser */) {
@@ -3288,7 +3469,7 @@ getStoredTransport_fn = function() {
         ));
         return apiTransport;
       }
-      yield this.storage.removeTransport();
+      yield this.storage.removeTransportType();
     }
     return void 0;
   });
@@ -3298,15 +3479,15 @@ setupTransport_fn = function() {
     var _a3;
     const transport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getStoredTransport_fn).call(this);
     if (transport) {
-      if (!this.transport.isConnected()) {
+      if (!transport.isConnected()) {
         this.status = "connecting";
-        yield this.transport.connect();
+        yield transport.connect();
       }
       this.status = "connected";
       if (__privateGet(this, _transportType) === "mwp" /* MWP */) {
-        yield this.storage.setTransport("mwp" /* MWP */);
+        yield this.storage.setTransportType("mwp" /* MWP */);
       } else {
-        yield this.storage.setTransport("browser" /* Browser */);
+        yield this.storage.setTransportType("browser" /* Browser */);
       }
     } else {
       this.status = "loaded";
@@ -3315,7 +3496,7 @@ setupTransport_fn = function() {
       if (hasExtensionInstalled && preferExtension) {
         yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this, { persist: false });
         try {
-          yield this.transport.init();
+          yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).init();
         } catch (error) {
           console.error("Passive init failed:", error);
         }
@@ -3339,7 +3520,7 @@ init_fn2 = function() {
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
     } catch (error) {
-      yield this.storage.removeTransport();
+      yield this.storage.removeTransportType();
       this.status = "pending";
       logger2("MetaMaskSDK error during initialization", error);
     }
@@ -3385,17 +3566,17 @@ setupMWP_fn = function() {
     __privateSet(this, _transport2, apiTransport);
     __privateSet(this, _transportType, "mwp" /* MWP */);
     __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
-    __privateSet(this, _listener, this.transport.onNotification(
+    __privateSet(this, _listener, apiTransport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
-    yield this.storage.setTransport("mwp" /* MWP */);
+    yield this.storage.setTransportType("mwp" /* MWP */);
   });
 };
 onBeforeUnload_fn = function() {
   return __async(this, null, function* () {
     var _a3;
     if ((_a3 = this.options.ui.factory.modal) == null ? void 0 : _a3.isMounted) {
-      yield this.storage.removeTransport();
+      yield this.storage.removeTransportType();
     }
   });
 };
@@ -3412,70 +3593,65 @@ createBeforeUnloadListener_fn = function() {
 };
 renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
-    return new Promise((resolve, reject) => {
-      this.options.ui.factory.renderInstallModal(
-        desktopPreferred,
-        () => __async(this, null, function* () {
-          if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
-            yield this.dappClient.disconnect();
-          }
-          return new Promise((_resolve) => {
-            this.dappClient.on(
-              "session_request",
-              (sessionRequest) => {
-                _resolve({
-                  sessionRequest,
-                  metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
-                });
-              }
-            );
-            (() => __async(this, null, function* () {
-              var _a3;
-              try {
-                yield this.transport.connect({
-                  scopes,
-                  caipAccountIds,
-                  sessionProperties
-                });
-                yield this.options.ui.factory.unload();
-                (_a3 = this.options.ui.factory.modal) == null ? void 0 : _a3.unmount();
-                this.status = "connected";
-                yield this.storage.setTransport("mwp" /* MWP */);
-              } catch (error) {
-                const { ProtocolError, ErrorCode } = yield import("@metamask/mobile-wallet-protocol-core");
-                if (error instanceof ProtocolError) {
-                  if (error.code !== ErrorCode.REQUEST_EXPIRED) {
-                    this.status = "disconnected";
-                    yield this.options.ui.factory.unload(error);
-                    reject(error);
-                  }
-                } else {
-                  this.status = "disconnected";
-                  const normalizedError = error instanceof Error ? error : new Error(String(error));
-                  yield this.options.ui.factory.unload(normalizedError);
-                  reject(normalizedError);
-                }
-              }
-            }))().catch(() => {
-            });
+    const completion = createDeferredPromise2();
+    const createConnectionRequest = () => __async(this, null, function* () {
+      if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
+        yield this.dappClient.disconnect();
+      }
+      const sessionRequestDeferred = createDeferredPromise2();
+      this.dappClient.on(
+        "session_request",
+        (sessionRequest) => {
+          sessionRequestDeferred.resolve({
+            sessionRequest,
+            metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
           });
-        }),
-        (error) => __async(this, null, function* () {
-          if (error) {
-            yield this.storage.removeTransport();
-            reject(error);
-          } else {
-            yield this.storage.setTransport("mwp" /* MWP */);
-            resolve();
+        }
+      );
+      __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({ scopes, caipAccountIds, sessionProperties }).then(() => __async(this, null, function* () {
+        var _a3;
+        yield this.options.ui.factory.unload();
+        (_a3 = this.options.ui.factory.modal) == null ? void 0 : _a3.unmount();
+        this.status = "connected";
+        yield this.storage.setTransportType("mwp" /* MWP */);
+      })).catch((error) => __async(this, null, function* () {
+        const { ProtocolError, ErrorCode } = yield import("@metamask/mobile-wallet-protocol-core");
+        if (error instanceof ProtocolError) {
+          if (error.code !== ErrorCode.REQUEST_EXPIRED) {
+            this.status = "disconnected";
+            yield this.options.ui.factory.unload(error);
+            completion.reject(error);
           }
-        }),
-        (uri) => {
-          this.emit("display_uri", uri);
+        } else {
+          this.status = "disconnected";
+          const normalizedError = error instanceof Error ? error : new Error(String(error));
+          yield this.options.ui.factory.unload(normalizedError);
+          completion.reject(normalizedError);
         }
-      ).catch((error) => {
-        reject(error instanceof Error ? error : new Error(String(error)));
-      });
+      }));
+      return sessionRequestDeferred.promise;
     });
+    this.options.ui.factory.renderInstallModal(
+      desktopPreferred,
+      createConnectionRequest,
+      (error) => __async(this, null, function* () {
+        if (error) {
+          yield this.storage.removeTransportType();
+          completion.reject(error);
+        } else {
+          yield this.storage.setTransportType("mwp" /* MWP */);
+          completion.resolve();
+        }
+      }),
+      (uri) => {
+        this.emit("display_uri", uri);
+      }
+    ).catch((error) => {
+      completion.reject(
+        error instanceof Error ? error : new Error(String(error))
+      );
+    });
+    return completion.promise;
   });
 };
 showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
@@ -3491,39 +3667,37 @@ showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds, session
 };
 headlessConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
-    return new Promise((resolve, reject) => {
-      if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
-        this.dappClient.disconnect().catch(() => {
-        });
+    if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
+      yield this.dappClient.disconnect().catch(() => void 0);
+    }
+    const onSessionRequest = (sessionRequest) => {
+      const connectionRequest = {
+        sessionRequest,
+        metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
+      };
+      const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+      this.emit("display_uri", deeplink);
+    };
+    this.dappClient.on("session_request", onSessionRequest);
+    try {
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({
+        scopes,
+        caipAccountIds,
+        sessionProperties
+      });
+      this.status = "connected";
+      yield this.storage.setTransportType("mwp" /* MWP */);
+    } catch (error) {
+      const { ProtocolError } = yield import("@metamask/mobile-wallet-protocol-core");
+      this.status = "disconnected";
+      yield this.storage.removeTransportType();
+      if (error instanceof ProtocolError || error instanceof Error) {
+        throw error;
       }
-      this.dappClient.on(
-        "session_request",
-        (sessionRequest) => {
-          const connectionRequest = {
-            sessionRequest,
-            metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
-          };
-          const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
-          this.emit("display_uri", deeplink);
-        }
-      );
-      this.transport.connect({ scopes, caipAccountIds, sessionProperties }).then(() => __async(this, null, function* () {
-        this.status = "connected";
-        yield this.storage.setTransport("mwp" /* MWP */);
-        resolve();
-      })).catch((error) => __async(this, null, function* () {
-        const { ProtocolError } = yield import("@metamask/mobile-wallet-protocol-core");
-        if (error instanceof ProtocolError) {
-          this.status = "disconnected";
-          yield this.storage.removeTransport();
-          reject(error);
-        } else {
-          this.status = "disconnected";
-          yield this.storage.removeTransport();
-          reject(error instanceof Error ? error : new Error(String(error)));
-        }
-      }));
-    });
+      throw new Error(String(error));
+    } finally {
+      this.dappClient.off("session_request", onSessionRequest);
+    }
   });
 };
 setupDefaultTransport_fn = function() {
@@ -3532,7 +3706,7 @@ setupDefaultTransport_fn = function() {
       return __privateGet(this, _transport2);
     }
     if (options == null ? void 0 : options.persist) {
-      yield this.storage.setTransport("browser" /* Browser */);
+      yield this.storage.setTransportType("browser" /* Browser */);
     }
     const transport = new DefaultTransport();
     __privateSet(this, _listener, transport.onNotification(
@@ -3565,7 +3739,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
       };
       this.dappClient.on("message", dappClientMessageHandler);
       let timeout;
-      if (this.transport.isConnected()) {
+      if (__privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).isConnected()) {
         timeout = setTimeout(() => {
           this.openSimpleDeeplinkIfNeeded();
         }, 250);
@@ -3593,8 +3767,8 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
           }
         );
       }
-      return this.transport.connect({ scopes, caipAccountIds, sessionProperties }).then(resolve).catch((error) => __async(this, null, function* () {
-        yield this.storage.removeTransport();
+      return __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({ scopes, caipAccountIds, sessionProperties }).then(resolve).catch((error) => __async(this, null, function* () {
+        yield this.storage.removeTransportType();
         this.dappClient.off("message", dappClientMessageHandler);
         reject(error instanceof Error ? error : new Error(String(error)));
       })).finally(() => {
@@ -3660,7 +3834,7 @@ getCaipSession_fn = function() {
     };
     if ((_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.isConnected()) {
       try {
-        const response = yield this.transport.request({
+        const response = yield __privateGet(this, _transport2).request({
           method: "wallet_getSession"
         });
         if (response.result) {
@@ -3754,14 +3928,14 @@ var Store = class extends StoreClient {
     super();
     this.adapter = adapter;
   }
-  getTransport() {
+  getTransportType() {
     return __async(this, null, function* () {
       try {
-        const transport = yield this.adapter.get("multichain-transport");
-        if (!transport) {
+        const transportType = yield this.adapter.get("multichain-transport");
+        if (!transportType) {
           return null;
         }
-        return getTransportType(transport);
+        return getTransportType(transportType);
       } catch (err) {
         throw new StorageGetErr(
           this.adapter.platform,
@@ -3771,10 +3945,10 @@ var Store = class extends StoreClient {
       }
     });
   }
-  setTransport(transport) {
+  setTransportType(transportType) {
     return __async(this, null, function* () {
       try {
-        yield this.adapter.set("multichain-transport", transport);
+        yield this.adapter.set("multichain-transport", transportType);
       } catch (err) {
         throw new StorageSetErr(
           this.adapter.platform,
@@ -3784,7 +3958,7 @@ var Store = class extends StoreClient {
       }
     });
   }
-  removeTransport() {
+  removeTransportType() {
     return __async(this, null, function* () {
       try {
         yield this.adapter.delete("multichain-transport");
@@ -3998,7 +4172,11 @@ var BaseModalFactory = class {
           (_a4 = this.displayUriCallback) == null ? void 0 : _a4.call(this, newLink);
           return newLink;
         }),
-        onClose: this.onCloseModal.bind(this),
+        onClose: (shouldTerminate) => {
+          this.onCloseModal(shouldTerminate).catch((error) => {
+            console.error("Failed to close modal:", error);
+          });
+        },
         startDesktopOnboarding: this.onStartDesktopOnboarding.bind(this),
         createConnectionRequest,
         onDisplayUri: this.displayUriCallback
@@ -4036,7 +4214,7 @@ function preload() {
     }
     try {
       const { defineCustomElements } = yield import("@metamask/multichain-ui/loader");
-      yield defineCustomElements();
+      defineCustomElements();
     } catch (error) {
       console.error("Failed to load customElements:", error);
     }
@@ -4074,6 +4252,7 @@ var createMultichainClient = (options) => __async(null, null, function* () {
   }));
 });
 export {
+  EIP1193_PASSTHROUGH_METHODS,
   EventEmitter,
   Modal,
   MultichainCore,
@@ -4101,6 +4280,7 @@ export {
   isEnabled,
   isMetamaskExtensionInstalled,
   isRejectionError,
-  isSecure
+  isSecure,
+  packageVersion
 };
 //# sourceMappingURL=connect-multichain.mjs.map