@metamask/connect-multichain 0.1.0 → 0.2.1

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

@@ -32,6 +32,7 @@ var __export = (target, all) => {
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -176,6 +177,41 @@ var init_events = __esm({
       off(eventName, handler) {
         __privateGet(this, _emitter).off(eventName, handler);
       }
+      /**
+       * Removes a specific event handler for the specified event.
+       * Added for compatibility as some libraries use this method name.
+       *
+       * @template TEventName - The name of the event to remove the handler from (must be a key of TEvents)
+       * @param eventName - The name of the event to remove the handler from
+       * @param handler - The specific handler function to remove
+       */
+      removeListener(eventName, handler) {
+        __privateGet(this, _emitter).off(eventName, handler);
+      }
+      /**
+       * Registers an event handler for the specified event that will only be called once.
+       *
+       * @template TEventName - The name of the event to listen for (must be a key of TEvents)
+       * @param eventName - The name of the event to listen for
+       * @param handler - The function to call when the event is emitted (only once)
+       * @returns A function to remove the listener
+       */
+      once(eventName, handler) {
+        __privateGet(this, _emitter).once(eventName, handler);
+        return () => {
+          this.off(eventName, handler);
+        };
+      }
+      /**
+       * Returns the number of listeners registered for the specified event.
+       *
+       * @template TEventName - The name of the event to count listeners for (must be a key of TEvents)
+       * @param eventName - The name of the event to count listeners for
+       * @returns The number of listeners registered for the event
+       */
+      listenerCount(eventName) {
+        return __privateGet(this, _emitter).listenerCount(eventName);
+      }
     };
     _emitter = new WeakMap();
   }
@@ -340,7 +376,7 @@ function getTransportType(type) {
     case "browser":
       return "browser" /* Browser */;
     case "mwp":
-      return "mwp" /* MPW */;
+      return "mwp" /* MWP */;
     default:
       return "unknown" /* UNKNOWN */;
   }
@@ -354,7 +390,7 @@ var init_multichain = __esm({
     init_infura();
     TransportType = /* @__PURE__ */ ((TransportType2) => {
       TransportType2["Browser"] = "browser";
-      TransportType2["MPW"] = "mwp";
+      TransportType2["MWP"] = "mwp";
       TransportType2["UNKNOWN"] = "unknown";
       return TransportType2;
     })(TransportType || {});
@@ -368,7 +404,7 @@ var init_multichain = __esm({
 });
 
 // src/domain/platform/index.ts
-import { parse } from "bowser";
+import Bowser from "bowser";
 function isNotBrowser() {
   var _a;
   if (typeof window === "undefined") {
@@ -397,7 +433,7 @@ function isMetaMaskMobileWebView() {
 }
 function isMobile() {
   var _a, _b;
-  const browser = parse(window.navigator.userAgent);
+  const browser = Bowser.parse(window.navigator.userAgent);
   return ((_a = browser == null ? void 0 : browser.platform) == null ? void 0 : _a.type) === "mobile" || ((_b = browser == null ? void 0 : browser.platform) == null ? void 0 : _b.type) === "tablet";
 }
 function getPlatformType() {
@@ -462,8 +498,8 @@ var init_platform = __esm({
           window.removeEventListener("eip6963:announceProvider", handler);
           const hasMetaMask = providers.some(
             (provider) => {
-              var _a;
-              return ((_a = provider == null ? void 0 : provider.info) == null ? void 0 : _a.rdns) === "io.metamask";
+              var _a, _b;
+              return (_b = (_a = provider == null ? void 0 : provider.info) == null ? void 0 : _a.rdns) == null ? void 0 : _b.startsWith("io.metamask");
             }
           );
           resolve(hasMetaMask);
@@ -547,13 +583,265 @@ var init_ui = __esm({
   }
 });
 
+// src/multichain/utils/index.ts
+import { deflate } from "pako";
+import {
+  parseCaipAccountId,
+  parseCaipChainId
+} from "@metamask/utils";
+function base64Encode(str) {
+  if (typeof btoa !== "undefined") {
+    return btoa(str);
+  } else if (typeof Buffer !== "undefined") {
+    return Buffer.from(str).toString("base64");
+  }
+  throw new Error("No base64 encoding method available");
+}
+function compressString(str) {
+  const compressed = deflate(str);
+  const binaryString = String.fromCharCode.apply(null, Array.from(compressed));
+  return base64Encode(binaryString);
+}
+function getDappId(dapp) {
+  var _a, _b;
+  if (typeof window === "undefined" || typeof window.location === "undefined") {
+    return (_b = (_a = dapp == null ? void 0 : dapp.name) != null ? _a : dapp == null ? void 0 : dapp.url) != null ? _b : "N/A";
+  }
+  return window.location.hostname;
+}
+function openDeeplink(options, deeplink, universalLink) {
+  const { mobile } = options;
+  const useDeeplink = mobile && mobile.useDeeplink !== void 0 ? mobile.useDeeplink : true;
+  if (useDeeplink) {
+    if (typeof window !== "undefined") {
+      window.location.href = deeplink;
+    }
+  } else if (typeof document !== "undefined") {
+    const link = document.createElement("a");
+    link.href = universalLink;
+    link.target = "_self";
+    link.rel = "noreferrer noopener";
+    link.click();
+  }
+}
+function getOptionalScopes(scopes) {
+  return scopes.reduce(
+    (prev, scope) => __spreadProps(__spreadValues({}, prev), {
+      [scope]: {
+        methods: [],
+        notifications: [],
+        accounts: []
+      }
+    }),
+    {}
+  );
+}
+function setupDappMetadata(options) {
+  var _a;
+  const platform = getPlatformType();
+  const isBrowser = platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */ || platform === "in-app-browser" /* MetaMaskMobileWebview */;
+  if (!((_a = options.dapp) == null ? void 0 : _a.url)) {
+    if (isBrowser) {
+      options.dapp = __spreadProps(__spreadValues({}, options.dapp), {
+        url: `${window.location.protocol}//${window.location.host}`
+      });
+    } else {
+      throw new Error("You must provide dapp url");
+    }
+  }
+  const BASE_64_ICON_MAX_LENGTH = 163400;
+  const urlPattern = /^(http|https):\/\/[^\s]*$/;
+  if (options.dapp) {
+    if ("iconUrl" in options.dapp) {
+      if (options.dapp.iconUrl && !urlPattern.test(options.dapp.iconUrl)) {
+        console.warn(
+          "Invalid dappMetadata.iconUrl: URL must start with http:// or https://"
+        );
+        options.dapp.iconUrl = void 0;
+      }
+    }
+    if ("base64Icon" in options.dapp) {
+      if (options.dapp.base64Icon && options.dapp.base64Icon.length > BASE_64_ICON_MAX_LENGTH) {
+        console.warn(
+          "Invalid dappMetadata.base64Icon: Base64-encoded icon string length must be less than 163400 characters"
+        );
+        options.dapp.base64Icon = void 0;
+      }
+    }
+    if (options.dapp.url && !urlPattern.test(options.dapp.url)) {
+      console.warn(
+        "Invalid dappMetadata.url: URL must start with http:// or https://"
+      );
+    }
+    const favicon = extractFavicon();
+    if (favicon && !("iconUrl" in options.dapp) && !("base64Icon" in options.dapp)) {
+      const faviconUrl = `${window.location.protocol}//${window.location.host}${favicon}`;
+      options.dapp.iconUrl = faviconUrl;
+    }
+  }
+  return options;
+}
+function isSameScopesAndAccounts(currentScopes, proposedScopes, walletSession, proposedCaipAccountIds) {
+  const isSameScopes = currentScopes.every((scope) => proposedScopes.includes(scope)) && proposedScopes.every((scope) => currentScopes.includes(scope));
+  if (!isSameScopes) {
+    return false;
+  }
+  const existingAccountIds = Object.values(
+    walletSession.sessionScopes
+  ).filter(({ accounts }) => Boolean(accounts)).flatMap(({ accounts }) => accounts != null ? accounts : []);
+  const allProposedAccountsIncluded = proposedCaipAccountIds.every(
+    (proposedAccountId) => existingAccountIds.includes(proposedAccountId)
+  );
+  return allProposedAccountsIncluded;
+}
+function getValidAccounts(caipAccountIds) {
+  return caipAccountIds.reduce(
+    (caipAccounts, caipAccountId) => {
+      try {
+        return [...caipAccounts, parseCaipAccountId(caipAccountId)];
+      } catch (err) {
+        const stringifiedAccountId = JSON.stringify(caipAccountId);
+        console.error(`Invalid CAIP account ID: ${stringifiedAccountId}`, err);
+        return caipAccounts;
+      }
+    },
+    []
+  );
+}
+function addValidAccounts(optionalScopes, validAccounts) {
+  var _a;
+  if (!optionalScopes || !(validAccounts == null ? void 0 : validAccounts.length)) {
+    return optionalScopes;
+  }
+  const result = Object.fromEntries(
+    Object.entries(optionalScopes).map(([scope, scopeData]) => {
+      var _a2, _b, _c;
+      return [
+        scope,
+        {
+          methods: [...(_a2 = scopeData == null ? void 0 : scopeData.methods) != null ? _a2 : []],
+          notifications: [...(_b = scopeData == null ? void 0 : scopeData.notifications) != null ? _b : []],
+          accounts: [...(_c = scopeData == null ? void 0 : scopeData.accounts) != null ? _c : []]
+        }
+      ];
+    })
+  );
+  const accountsByChain = /* @__PURE__ */ new Map();
+  for (const account of validAccounts) {
+    const chainKey = `${account.chain.namespace}:${account.chain.reference}`;
+    const accountId = `${account.chainId}:${account.address}`;
+    if (!accountsByChain.has(chainKey)) {
+      accountsByChain.set(chainKey, []);
+    }
+    (_a = accountsByChain.get(chainKey)) == null ? void 0 : _a.push(accountId);
+  }
+  for (const [scopeKey, scopeData] of Object.entries(result)) {
+    if (!(scopeData == null ? void 0 : scopeData.accounts)) {
+      continue;
+    }
+    try {
+      const scope = scopeKey;
+      const scopeDetails = parseCaipChainId(scope);
+      const chainKey = `${scopeDetails.namespace}:${scopeDetails.reference}`;
+      const matchingAccounts = accountsByChain.get(chainKey);
+      if (matchingAccounts) {
+        const existingAccounts = new Set(scopeData.accounts);
+        const newAccounts = matchingAccounts.filter(
+          (account) => !existingAccounts.has(account)
+        );
+        scopeData.accounts.push(...newAccounts);
+      }
+    } catch (error) {
+      console.error(`Invalid scope format: ${scopeKey}`, error);
+    }
+  }
+  return result;
+}
+var extractFavicon;
+var init_utils = __esm({
+  "src/multichain/utils/index.ts"() {
+    "use strict";
+    init_domain();
+    extractFavicon = () => {
+      var _a;
+      if (typeof document === "undefined") {
+        return void 0;
+      }
+      let favicon;
+      const nodeList = document.getElementsByTagName("link");
+      for (let i = 0; i < nodeList.length; i++) {
+        if (nodeList[i].getAttribute("rel") === "icon" || nodeList[i].getAttribute("rel") === "shortcut icon") {
+          favicon = (_a = nodeList[i].getAttribute("href")) != null ? _a : void 0;
+        }
+      }
+      return favicon;
+    };
+  }
+});
+
+// src/multichain/utils/analytics.ts
+function isRejectionError(error) {
+  var _a, _b;
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const errorObj = error;
+  const errorCode = errorObj.code;
+  const errorMessage = (_b = (_a = errorObj.message) == null ? void 0 : _a.toLowerCase()) != null ? _b : "";
+  return errorCode === 4001 || // User rejected request (common EIP-1193 code)
+  errorCode === 4100 || // Unauthorized (common rejection code)
+  errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || errorMessage.includes("user");
+}
+function getBaseAnalyticsProperties(options, storage) {
+  return __async(this, null, function* () {
+    var _a, _b;
+    const version = getVersion();
+    const dappId = getDappId(options.dapp);
+    const platform = getPlatformType();
+    const anonId = yield storage.getAnonId();
+    const integrationType = (_b = (_a = options.analytics) == null ? void 0 : _a.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
+    return {
+      mmconnect_version: version,
+      dapp_id: dappId,
+      platform,
+      integration_type: integrationType,
+      anon_id: anonId
+    };
+  });
+}
+function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
+  return __async(this, null, function* () {
+    var _a, _b;
+    const version = getVersion();
+    const dappId = getDappId(options.dapp);
+    const anonId = yield storage.getAnonId();
+    const integrationType = (_b = (_a = options.analytics) == null ? void 0 : _a.integrationType) != null ? _b : "unknown";
+    return {
+      mmconnect_version: version,
+      dapp_id: dappId,
+      method: invokeOptions.request.method,
+      integration_type: integrationType,
+      caip_chain_id: invokeOptions.scope,
+      anon_id: anonId
+    };
+  });
+}
+var init_analytics = __esm({
+  "src/multichain/utils/analytics.ts"() {
+    "use strict";
+    init_utils();
+    init_domain();
+  }
+});
+
 // src/domain/utils/index.ts
 function getVersion() {
   return "0.0.0";
 }
-var init_utils = __esm({
+var init_utils2 = __esm({
   "src/domain/utils/index.ts"() {
     "use strict";
+    init_analytics();
   }
 });
 
@@ -568,7 +856,7 @@ var init_domain = __esm({
     init_platform();
     init_store();
     init_ui();
-    init_utils();
+    init_utils2();
   }
 });
 
@@ -591,7 +879,7 @@ function shouldLogCountdown(remainingSeconds) {
     return remainingSeconds % 60 === 0;
   }
 }
-var init_utils2 = __esm({
+var init_utils3 = __esm({
   "src/ui/modals/base/utils.ts"() {
     "use strict";
   }
@@ -603,7 +891,7 @@ var init_AbstractInstallModal = __esm({
   "src/ui/modals/base/AbstractInstallModal.ts"() {
     "use strict";
     init_domain();
-    init_utils2();
+    init_utils3();
     logger3 = createLogger("metamask-sdk:ui");
     AbstractInstallModal = class extends Modal {
       constructor() {
@@ -704,7 +992,7 @@ var init_install = __esm({
         const modal = document.createElement(
           "mm-install-modal"
         );
-        modal.preferDesktop = options.preferDesktop;
+        modal.showInstallModal = options.showInstallModal;
         modal.sdkVersion = options.sdkVersion;
         modal.addEventListener("close", (ev) => {
           const { detail } = ev;
@@ -848,273 +1136,67 @@ var init_web2 = __esm({
         return __async(this, null, function* () {
           const { storeName } = this;
           const db = yield this.dbPromise;
-          return new Promise((resolve, reject) => {
-            try {
-              const tx = db.transaction(storeName, "readwrite");
-              const store = tx.objectStore(storeName);
-              const request = store.put(value, key);
-              request.onerror = () => reject(new Error("Failed to set value in IndexedDB."));
-              request.onsuccess = () => resolve();
-            } catch (error) {
-              reject(error);
-            }
-          });
-        });
-      }
-      delete(key) {
-        return __async(this, null, function* () {
-          const { storeName } = this;
-          const db = yield this.dbPromise;
-          return new Promise((resolve, reject) => {
-            try {
-              const tx = db.transaction(storeName, "readwrite");
-              const store = tx.objectStore(storeName);
-              const request = store.delete(key);
-              request.onerror = () => reject(new Error("Failed to delete value from IndexedDB."));
-              request.onsuccess = () => resolve();
-            } catch (error) {
-              reject(error);
-            }
-          });
-        });
-      }
-    };
-    _StoreAdapterWeb.stores = ["sdk-kv-store", "key-value-pairs"];
-    _StoreAdapterWeb.DB_NAME = "mmsdk";
-    StoreAdapterWeb = _StoreAdapterWeb;
-  }
-});
-
-// src/multichain/index.ts
-import { analytics } from "@metamask/analytics";
-import {
-  ErrorCode,
-  ProtocolError,
-  SessionStore as SessionStore2,
-  WebSocketTransport
-} from "@metamask/mobile-wallet-protocol-core";
-import { DappClient } from "@metamask/mobile-wallet-protocol-dapp-client";
-import {
-  getMultichainClient
-} from "@metamask/multichain-api-client";
-
-// src/config/index.ts
-var MWP_RELAY_URL = "wss://mm-sdk-relay.api.cx.metamask.io/connection/websocket";
-var METAMASK_CONNECT_BASE_URL = "https://metamask.app.link/connect";
-var METAMASK_DEEPLINK_BASE = "metamask://connect";
-
-// src/multichain/index.ts
-init_domain();
-init_logger();
-init_multichain();
-init_platform();
-
-// src/multichain/rpc/requestRouter.ts
-init_domain();
-
-// src/multichain/utils/index.ts
-init_domain();
-import { deflate } from "pako";
-import {
-  parseCaipAccountId,
-  parseCaipChainId
-} from "@metamask/utils";
-function base64Encode(str) {
-  if (typeof btoa !== "undefined") {
-    return btoa(str);
-  } else if (typeof Buffer !== "undefined") {
-    return Buffer.from(str).toString("base64");
-  }
-  throw new Error("No base64 encoding method available");
-}
-function compressString(str) {
-  const compressed = deflate(str);
-  const binaryString = String.fromCharCode.apply(null, Array.from(compressed));
-  return base64Encode(binaryString);
-}
-function getDappId(dapp) {
-  var _a, _b;
-  if (typeof window === "undefined" || typeof window.location === "undefined") {
-    return (_b = (_a = dapp == null ? void 0 : dapp.name) != null ? _a : dapp == null ? void 0 : dapp.url) != null ? _b : "N/A";
-  }
-  return window.location.hostname;
-}
-function openDeeplink(options, deeplink, universalLink) {
-  const { mobile } = options;
-  const useDeeplink = mobile && mobile.useDeeplink !== void 0 ? mobile.useDeeplink : true;
-  if (useDeeplink) {
-    if (typeof window !== "undefined") {
-      window.location.href = deeplink;
-    }
-  } else if (typeof document !== "undefined") {
-    const link = document.createElement("a");
-    link.href = universalLink;
-    link.target = "_self";
-    link.rel = "noreferrer noopener";
-    link.click();
-  }
-}
-function getOptionalScopes(scopes) {
-  return scopes.reduce(
-    (prev, scope) => __spreadProps(__spreadValues({}, prev), {
-      [scope]: {
-        methods: [],
-        notifications: [],
-        accounts: []
-      }
-    }),
-    {}
-  );
-}
-var extractFavicon = () => {
-  var _a;
-  if (typeof document === "undefined") {
-    return void 0;
-  }
-  let favicon;
-  const nodeList = document.getElementsByTagName("link");
-  for (let i = 0; i < nodeList.length; i++) {
-    if (nodeList[i].getAttribute("rel") === "icon" || nodeList[i].getAttribute("rel") === "shortcut icon") {
-      favicon = (_a = nodeList[i].getAttribute("href")) != null ? _a : void 0;
-    }
-  }
-  return favicon;
-};
-function setupInfuraProvider(options) {
-  var _a, _b;
-  const infuraAPIKey = (_a = options.api) == null ? void 0 : _a.infuraAPIKey;
-  if (!infuraAPIKey) {
-    return options;
-  }
-  const urlsWithToken = getInfuraRpcUrls(infuraAPIKey);
-  if ((_b = options.api) == null ? void 0 : _b.readonlyRPCMap) {
-    options.api.readonlyRPCMap = __spreadValues(__spreadValues({}, options.api.readonlyRPCMap), urlsWithToken);
-  } else if (options.api) {
-    options.api.readonlyRPCMap = urlsWithToken;
-  }
-  return options;
-}
-function setupDappMetadata(options) {
-  var _a;
-  const platform = getPlatformType();
-  const isBrowser = platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */ || platform === "in-app-browser" /* MetaMaskMobileWebview */;
-  if (!((_a = options.dapp) == null ? void 0 : _a.url)) {
-    if (isBrowser) {
-      options.dapp = __spreadProps(__spreadValues({}, options.dapp), {
-        url: `${window.location.protocol}//${window.location.host}`
-      });
-    } else {
-      throw new Error("You must provide dapp url");
-    }
-  }
-  const BASE_64_ICON_MAX_LENGTH = 163400;
-  const urlPattern = /^(http|https):\/\/[^\s]*$/;
-  if (options.dapp) {
-    if ("iconUrl" in options.dapp) {
-      if (options.dapp.iconUrl && !urlPattern.test(options.dapp.iconUrl)) {
-        console.warn(
-          "Invalid dappMetadata.iconUrl: URL must start with http:// or https://"
-        );
-        options.dapp.iconUrl = void 0;
-      }
-    }
-    if ("base64Icon" in options.dapp) {
-      if (options.dapp.base64Icon && options.dapp.base64Icon.length > BASE_64_ICON_MAX_LENGTH) {
-        console.warn(
-          "Invalid dappMetadata.base64Icon: Base64-encoded icon string length must be less than 163400 characters"
-        );
-        options.dapp.base64Icon = void 0;
-      }
-    }
-    if (options.dapp.url && !urlPattern.test(options.dapp.url)) {
-      console.warn(
-        "Invalid dappMetadata.url: URL must start with http:// or https://"
-      );
-    }
-    const favicon = extractFavicon();
-    if (favicon && !("iconUrl" in options.dapp) && !("base64Icon" in options.dapp)) {
-      const faviconUrl = `${window.location.protocol}//${window.location.host}${favicon}`;
-      options.dapp.iconUrl = faviconUrl;
-    }
-  }
-  return options;
-}
-function isSameScopesAndAccounts(currentScopes, proposedScopes, walletSession, proposedCaipAccountIds) {
-  const isSameScopes = currentScopes.every((scope) => proposedScopes.includes(scope)) && proposedScopes.every((scope) => currentScopes.includes(scope));
-  if (!isSameScopes) {
-    return false;
-  }
-  const existingAccountIds = Object.values(
-    walletSession.sessionScopes
-  ).filter(({ accounts }) => Boolean(accounts)).flatMap(({ accounts }) => accounts != null ? accounts : []);
-  const allProposedAccountsIncluded = proposedCaipAccountIds.every(
-    (proposedAccountId) => existingAccountIds.includes(proposedAccountId)
-  );
-  return allProposedAccountsIncluded;
-}
-function getValidAccounts(caipAccountIds) {
-  return caipAccountIds.reduce(
-    (caipAccounts, caipAccountId) => {
-      try {
-        return [...caipAccounts, parseCaipAccountId(caipAccountId)];
-      } catch (err) {
-        const stringifiedAccountId = JSON.stringify(caipAccountId);
-        console.error(`Invalid CAIP account ID: ${stringifiedAccountId}`, err);
-        return caipAccounts;
-      }
-    },
-    []
-  );
-}
-function addValidAccounts(optionalScopes, validAccounts) {
-  var _a;
-  if (!optionalScopes || !(validAccounts == null ? void 0 : validAccounts.length)) {
-    return optionalScopes;
-  }
-  const result = Object.fromEntries(
-    Object.entries(optionalScopes).map(([scope, scopeData]) => {
-      var _a2, _b, _c;
-      return [
-        scope,
-        {
-          methods: [...(_a2 = scopeData == null ? void 0 : scopeData.methods) != null ? _a2 : []],
-          notifications: [...(_b = scopeData == null ? void 0 : scopeData.notifications) != null ? _b : []],
-          accounts: [...(_c = scopeData == null ? void 0 : scopeData.accounts) != null ? _c : []]
-        }
-      ];
-    })
-  );
-  const accountsByChain = /* @__PURE__ */ new Map();
-  for (const account of validAccounts) {
-    const chainKey = `${account.chain.namespace}:${account.chain.reference}`;
-    const accountId = `${account.chainId}:${account.address}`;
-    if (!accountsByChain.has(chainKey)) {
-      accountsByChain.set(chainKey, []);
-    }
-    (_a = accountsByChain.get(chainKey)) == null ? void 0 : _a.push(accountId);
-  }
-  for (const [scopeKey, scopeData] of Object.entries(result)) {
-    if (!(scopeData == null ? void 0 : scopeData.accounts)) {
-      continue;
-    }
-    try {
-      const scope = scopeKey;
-      const scopeDetails = parseCaipChainId(scope);
-      const chainKey = `${scopeDetails.namespace}:${scopeDetails.reference}`;
-      const matchingAccounts = accountsByChain.get(chainKey);
-      if (matchingAccounts) {
-        const existingAccounts = new Set(scopeData.accounts);
-        const newAccounts = matchingAccounts.filter(
-          (account) => !existingAccounts.has(account)
-        );
-        scopeData.accounts.push(...newAccounts);
+          return new Promise((resolve, reject) => {
+            try {
+              const tx = db.transaction(storeName, "readwrite");
+              const store = tx.objectStore(storeName);
+              const request = store.put(value, key);
+              request.onerror = () => reject(new Error("Failed to set value in IndexedDB."));
+              request.onsuccess = () => resolve();
+            } catch (error) {
+              reject(error);
+            }
+          });
+        });
       }
-    } catch (error) {
-      console.error(`Invalid scope format: ${scopeKey}`, error);
-    }
+      delete(key) {
+        return __async(this, null, function* () {
+          const { storeName } = this;
+          const db = yield this.dbPromise;
+          return new Promise((resolve, reject) => {
+            try {
+              const tx = db.transaction(storeName, "readwrite");
+              const store = tx.objectStore(storeName);
+              const request = store.delete(key);
+              request.onerror = () => reject(new Error("Failed to delete value from IndexedDB."));
+              request.onsuccess = () => resolve();
+            } catch (error) {
+              reject(error);
+            }
+          });
+        });
+      }
+    };
+    _StoreAdapterWeb.stores = ["sdk-kv-store", "key-value-pairs"];
+    _StoreAdapterWeb.DB_NAME = "mmsdk";
+    StoreAdapterWeb = _StoreAdapterWeb;
   }
-  return result;
-}
+});
+
+// src/multichain/index.ts
+import { analytics as analytics2 } from "@metamask/analytics";
+import {
+  ErrorCode,
+  ProtocolError,
+  SessionStore as SessionStore2,
+  WebSocketTransport
+} from "@metamask/mobile-wallet-protocol-core";
+import { DappClient } from "@metamask/mobile-wallet-protocol-dapp-client";
+import {
+  getMultichainClient
+} from "@metamask/multichain-api-client";
+
+// src/config/index.ts
+var MWP_RELAY_URL = "wss://mm-sdk-relay.api.cx.metamask.io/connection/websocket";
+var METAMASK_CONNECT_BASE_URL = "https://metamask.app.link/connect";
+var METAMASK_DEEPLINK_BASE = "metamask://connect";
+
+// src/multichain/index.ts
+init_domain();
+init_analytics();
+init_logger();
+init_multichain();
+init_platform();
 
 // src/multichain/rpc/handlers/rpcClient.ts
 init_domain();
@@ -1133,6 +1215,7 @@ var RpcClient = class {
   }
   /**
    * Routes the request to a configured RPC node.
+   * @param options - The invoke method options
    */
   request(options) {
     return __async(this, null, function* () {
@@ -1144,46 +1227,45 @@ var RpcClient = class {
         id: getNextRpcId()
       });
       const rpcEndpoint = this.getRpcEndpoint(options.scope);
-      const rpcRequest = yield this.fetch(rpcEndpoint, body, "POST", this.getHeaders(rpcEndpoint));
+      const rpcRequest = yield this.fetchWithTimeout(rpcEndpoint, body, "POST", this.getHeaders(rpcEndpoint), 3e4);
       const response = yield this.parseResponse(rpcRequest);
       return response;
     });
   }
   getRpcEndpoint(scope) {
-    var _a, _b, _c, _d, _e;
-    let infuraAPIKey = (_b = (_a = this.config) == null ? void 0 : _a.api) == null ? void 0 : _b.infuraAPIKey;
-    let readonlyRPCMap = (_e = (_d = (_c = this.config) == null ? void 0 : _c.api) == null ? void 0 : _d.readonlyRPCMap) != null ? _e : {};
-    if (infuraAPIKey) {
-      const urlsWithToken = getInfuraRpcUrls(infuraAPIKey);
-      if (readonlyRPCMap) {
-        readonlyRPCMap = __spreadValues(__spreadValues({}, urlsWithToken), readonlyRPCMap);
-      } else {
-        readonlyRPCMap = urlsWithToken;
-      }
-    }
-    const rpcEndpoint = readonlyRPCMap[scope];
+    var _a, _b, _c;
+    const supportedNetworks = (_c = (_b = (_a = this.config) == null ? void 0 : _a.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
+    const rpcEndpoint = supportedNetworks[scope];
     if (!rpcEndpoint) {
       throw new MissingRpcEndpointErr(`No RPC endpoint found for scope ${scope}`);
     }
     return rpcEndpoint;
   }
-  fetch(endpoint, body, method, headers) {
+  fetchWithTimeout(endpoint, body, method, headers, timeout) {
     return __async(this, null, function* () {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), timeout);
       try {
         const response = yield fetch(endpoint, {
           method,
           headers,
-          body
+          body,
+          signal: controller.signal
         });
+        clearTimeout(timeoutId);
         if (!response.ok) {
           throw new RPCHttpErr(endpoint, method, response.status);
         }
         return response;
       } catch (error) {
+        clearTimeout(timeoutId);
         if (error instanceof RPCHttpErr) {
           throw error;
         }
-        throw new RPCReadonlyRequestErr(error.message);
+        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");
       }
     });
   }
@@ -1212,11 +1294,17 @@ var RpcClient = class {
 };
 
 // src/multichain/rpc/requestRouter.ts
+import { analytics } from "@metamask/analytics";
+init_domain();
+init_utils();
+init_analytics();
+var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
   constructor(transport, rpcClient, config) {
     this.transport = transport;
     this.rpcClient = rpcClient;
     this.config = config;
+    __privateAdd(this, _RequestRouter_instances);
   }
   /**
    * The main entry point for invoking an RPC method.
@@ -1240,15 +1328,15 @@ var RequestRouter = class {
    */
   handleWithWallet(options) {
     return __async(this, null, function* () {
-      try {
+      return __privateMethod(this, _RequestRouter_instances, withAnalyticsTracking_fn).call(this, options, () => __async(this, null, function* () {
         const request = this.transport.request({
           method: "wallet_invokeMethod",
           params: options
         });
         const { ui, mobile } = this.config;
-        const { preferDesktop = false } = ui != null ? ui : {};
+        const { showInstallModal = false } = ui != null ? ui : {};
         const secure = isSecure();
-        const shouldOpenDeeplink = secure && !preferDesktop;
+        const shouldOpenDeeplink = secure && !showInstallModal;
         if (shouldOpenDeeplink) {
           setTimeout(() => {
             if (mobile == null ? void 0 : mobile.preferredOpenLink) {
@@ -1263,9 +1351,7 @@ var RequestRouter = class {
           throw new RPCInvokeMethodErr(`RPC Request failed with code ${response.error.code}: ${response.error.message}`);
         }
         return response.result;
-      } catch (error) {
-        throw new RPCInvokeMethodErr(error.message);
-      }
+      }));
     });
   }
   /**
@@ -1273,14 +1359,16 @@ var RequestRouter = class {
    */
   handleWithRpcNode(options) {
     return __async(this, null, function* () {
-      try {
-        return yield this.rpcClient.request(options);
-      } catch (error) {
-        if (error instanceof MissingRpcEndpointErr) {
-          return this.handleWithWallet(options);
+      return __privateMethod(this, _RequestRouter_instances, withAnalyticsTracking_fn).call(this, options, () => __async(this, null, function* () {
+        try {
+          return yield this.rpcClient.request(options);
+        } catch (error) {
+          if (error instanceof MissingRpcEndpointErr) {
+            return this.handleWithWallet(options);
+          }
+          throw error;
         }
-        throw error;
-      }
+      }));
     });
   }
   /**
@@ -1293,13 +1381,64 @@ var RequestRouter = class {
     });
   }
 };
+_RequestRouter_instances = new WeakSet();
+withAnalyticsTracking_fn = function(options, execute) {
+  return __async(this, null, function* () {
+    var _a, _b, _c;
+    if ((_a = this.config.analytics) == null ? void 0 : _a.enabled) {
+      yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRequested_fn).call(this, options);
+    }
+    try {
+      const result = yield execute();
+      if ((_b = this.config.analytics) == null ? void 0 : _b.enabled) {
+        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionSucceeded_fn).call(this, options);
+      }
+      return result;
+    } catch (error) {
+      if ((_c = this.config.analytics) == null ? void 0 : _c.enabled) {
+        const isRejection = isRejectionError(error);
+        if (isRejection) {
+          yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRejected_fn).call(this, options);
+        } else {
+          yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options);
+        }
+      }
+      throw new RPCInvokeMethodErr(error.message);
+    }
+  });
+};
+trackWalletActionRequested_fn = function(options) {
+  return __async(this, null, function* () {
+    const props = yield getWalletActionAnalyticsProperties(this.config, this.config.storage, options);
+    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);
+    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);
+    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);
+    analytics.track("mmconnect_wallet_action_rejected", props);
+  });
+};
 
 // src/multichain/transports/default/index.ts
+init_utils();
 import {
   getDefaultTransport
 } from "@metamask/multichain-api-client";
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _DefaultTransport_instances, notifyCallbacks_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _reqId, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1308,10 +1447,52 @@ 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);
+  }
+  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 request = __spreadValues({
+        jsonrpc: "2.0",
+        id: requestId
+      }, payload);
+      return new Promise((resolve, reject) => {
+        var _a;
+        const timeout = setTimeout(() => {
+          __privateGet(this, _pendingRequests).delete(requestId);
+          reject(new Error("Request timeout"));
+        }, (_a = options == null ? void 0 : options.timeout) != null ? _a : __privateGet(this, _defaultRequestOptions).timeout);
+        __privateGet(this, _pendingRequests).set(requestId, {
+          resolve: (response) => {
+            resolve(response);
+          },
+          reject,
+          timeout
+        });
+        window.postMessage(
+          {
+            target: "metamask-contentscript",
+            data: {
+              name: "metamask-provider",
+              data: request
+            }
+          },
+          // eslint-disable-next-line no-restricted-globals
+          location.origin
+        );
+      });
+    });
   }
   connect(options) {
     return __async(this, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g;
+      __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
       yield __privateGet(this, _transport).connect();
       const sessionRequest = yield this.request(
         { method: "wallet_getSession" },
@@ -1321,7 +1502,7 @@ var DefaultTransport = class {
         throw new Error(sessionRequest.error.message);
       }
       let walletSession = sessionRequest.result;
-      if (walletSession && options) {
+      if (walletSession && options && !options.forceRequest) {
         const currentScopes = Object.keys(
           (_a = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a : {}
         );
@@ -1342,9 +1523,11 @@ var DefaultTransport = class {
             getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
             getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
           );
-          const sessionRequest2 = { optionalScopes };
+          const createSessionParams = {
+            optionalScopes
+          };
           const response = yield this.request(
-            { method: "wallet_createSession", params: sessionRequest2 },
+            { method: "wallet_createSession", params: createSessionParams },
             __privateGet(this, _defaultRequestOptions)
           );
           if (response.error) {
@@ -1352,14 +1535,16 @@ var DefaultTransport = class {
           }
           walletSession = response.result;
         }
-      } else if (!walletSession) {
+      } 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 sessionRequest2 = { optionalScopes };
+        const createSessionParams = {
+          optionalScopes
+        };
         const response = yield this.request(
-          { method: "wallet_createSession", params: sessionRequest2 },
+          { method: "wallet_createSession", params: createSessionParams },
           __privateGet(this, _defaultRequestOptions)
         );
         if (response.error) {
@@ -1376,6 +1561,16 @@ var DefaultTransport = class {
   disconnect() {
     return __async(this, null, function* () {
       __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);
+      }
+      for (const [, request] of __privateGet(this, _pendingRequests)) {
+        clearTimeout(request.timeout);
+        request.reject(new Error("Transport disconnected"));
+      }
+      __privateGet(this, _pendingRequests).clear();
       return __privateGet(this, _transport).disconnect();
     });
   }
@@ -1398,33 +1593,101 @@ var DefaultTransport = class {
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
 _defaultRequestOptions = new WeakMap();
+_reqId = new WeakMap();
+_pendingRequests = new WeakMap();
+_handleResponseListener = new WeakMap();
+_handleNotificationListener = new WeakMap();
 _DefaultTransport_instances = new WeakSet();
 notifyCallbacks_fn = function(data) {
-  for (const cb of __privateGet(this, _notificationCallbacks)) {
+  for (const callback of __privateGet(this, _notificationCallbacks)) {
     try {
-      cb(data);
-    } catch (err) {
-      console.log("[WindowPostMessageTransport] notifyCallbacks error:", err);
+      callback(data);
+    } catch (error) {
+      console.log(
+        "[WindowPostMessageTransport] notifyCallbacks error:",
+        error
+      );
+    }
+  }
+};
+isMetamaskProviderEvent_fn = function(event) {
+  var _a, _b;
+  return ((_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
+  event.origin === location.origin;
+};
+handleResponse_fn = function(event) {
+  var _a, _b;
+  if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
+    return;
+  }
+  const responseData = (_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.data;
+  if (typeof responseData === "object" && responseData !== null && "method" in responseData) {
+    return;
+  }
+  if (typeof responseData === "object" && responseData !== null && "id" in responseData && ("result" in responseData || "error" in responseData)) {
+    const responseId = String(responseData.id);
+    const pendingRequest = __privateGet(this, _pendingRequests).get(responseId);
+    if (pendingRequest) {
+      clearTimeout(pendingRequest.timeout);
+      __privateGet(this, _pendingRequests).delete(responseId);
+      const response = responseData;
+      if ("error" in response && response.error) {
+        pendingRequest.reject(
+          new Error(response.error.message || "Request failed")
+        );
+      } else {
+        pendingRequest.resolve(response);
+      }
     }
   }
 };
+handleNotification_fn = function(event) {
+  var _a, _b;
+  if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
+    return;
+  }
+  const responseData = (_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.data;
+  if (typeof responseData === "object" && responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged") {
+    __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, responseData);
+  }
+};
+setupMessageListener_fn = function() {
+  if (__privateGet(this, _handleResponseListener)) {
+    return;
+  }
+  __privateSet(this, _handleResponseListener, __privateMethod(this, _DefaultTransport_instances, handleResponse_fn).bind(this));
+  __privateSet(this, _handleNotificationListener, __privateMethod(this, _DefaultTransport_instances, handleNotification_fn).bind(this));
+  window.addEventListener("message", __privateGet(this, _handleResponseListener));
+  window.addEventListener("message", __privateGet(this, _handleNotificationListener));
+};
 
 // src/multichain/transports/mwp/index.ts
 init_domain();
+init_utils();
 import { SessionStore } from "@metamask/mobile-wallet-protocol-core";
 import {
   TransportTimeoutError
 } from "@metamask/multichain-api-client";
+
+// src/multichain/transports/constants.ts
+var MULTICHAIN_PROVIDER_STREAM_NAME = "metamask-multichain-provider";
+
+// src/multichain/transports/mwp/index.ts
 var DEFAULT_REQUEST_TIMEOUT2 = 60 * 1e3;
 var CONNECTION_GRACE_PERIOD = 60 * 1e3;
 var DEFAULT_CONNECTION_TIMEOUT = DEFAULT_REQUEST_TIMEOUT2 + CONNECTION_GRACE_PERIOD;
 var SESSION_STORE_KEY = "cache_wallet_getSession";
+var ACCOUNTS_STORE_KEY = "cache_eth_accounts";
+var CHAIN_STORE_KEY = "cache_eth_chainId";
 var CACHED_METHOD_LIST = [
   "wallet_getSession",
   "wallet_createSession",
   "wallet_sessionChanged"
 ];
-var CACHED_RESET_METHOD_LIST = ["wallet_revokeSession"];
+var CACHED_RESET_METHOD_LIST = [
+  "wallet_revokeSession",
+  "wallet_revokePermissions"
+];
 var logger = createLogger("metamask-sdk:transport");
 var MWPTransport = class {
   constructor(dappClient, kvstore, options = {
@@ -1488,6 +1751,22 @@ var MWPTransport = class {
             this.pendingRequests.delete(messagePayload.id);
           }
         } else {
+          if (message.data.method === "metamask_chainChanged") {
+            this.kvstore.set(
+              CHAIN_STORE_KEY,
+              JSON.stringify(
+                message.data.params.chainId
+              )
+            );
+          }
+          if (message.data.method === "metamask_accountsChanged") {
+            this.kvstore.set(
+              ACCOUNTS_STORE_KEY,
+              JSON.stringify(
+                message.data.params
+              )
+            );
+          }
           this.notifyCallbacks(message.data);
         }
       }
@@ -1558,6 +1837,40 @@ var MWPTransport = class {
       }
     });
   }
+  // TODO: Rename this
+  sendEip1193Message(payload, options) {
+    return __async(this, null, function* () {
+      const request = __spreadValues({
+        jsonrpc: "2.0",
+        id: `${this.__reqId++}`
+      }, payload);
+      const cachedWalletSession = yield this.getCachedResponse(request);
+      if (cachedWalletSession) {
+        this.notifyCallbacks(cachedWalletSession);
+        return cachedWalletSession;
+      }
+      return new Promise((resolve, reject) => {
+        var _a;
+        const timeout = setTimeout(() => {
+          this.rejectRequest(request.id, new TransportTimeoutError());
+        }, (_a = options == null ? void 0 : options.timeout) != null ? _a : this.options.requestTimeout);
+        this.pendingRequests.set(request.id, {
+          request,
+          method: request.method,
+          resolve: (response) => __async(this, null, function* () {
+            yield this.storeWalletSession(request, response);
+            return resolve(response);
+          }),
+          reject,
+          timeout
+        });
+        this.dappClient.sendRequest({
+          name: "metamask-provider",
+          data: request
+        }).catch(reject);
+      });
+    });
+  }
   connect(options) {
     return __async(this, null, function* () {
       const { dappClient, kvstore } = this;
@@ -1611,17 +1924,23 @@ var MWPTransport = class {
                       if (messagePayload.error) {
                         return rejectConnection(messagePayload.error);
                       }
-                      this.notifyCallbacks(message.data);
                       yield this.storeWalletSession(
                         request,
                         messagePayload
                       );
+                      this.notifyCallbacks(messagePayload);
                       return resolveConnection();
                     }
                   }
                 }
               }));
-              dappClient.connect({ mode: "trusted", initialPayload: request }).catch(rejectConnection);
+              dappClient.connect({
+                mode: "trusted",
+                initialPayload: {
+                  name: MULTICHAIN_PROVIDER_STREAM_NAME,
+                  data: request
+                }
+              }).catch(rejectConnection);
             }
           );
         }
@@ -1648,6 +1967,9 @@ var MWPTransport = class {
         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();
     });
   }
@@ -1659,7 +1981,39 @@ var MWPTransport = class {
   isConnected() {
     return this.dappClient.state === "CONNECTED";
   }
-  fetchCachedWalletSession(request) {
+  /**
+   * Attempts to re-establish a connection via DappClient
+   *
+   * @returns Nothing
+   */
+  // TODO: We should re-evaluate adding this to the WebSocketTransport layer from `@metamask/mobile-wallet-protocol-core`
+  // ticket: https://consensyssoftware.atlassian.net/browse/WAPI-862
+  attemptResumeSession() {
+    return __async(this, null, function* () {
+      try {
+        yield this.dappClient.reconnect();
+        yield new Promise((resolve, reject) => {
+          const timeout = setTimeout(() => {
+            reject(new Error("Resume timeout"));
+          }, 2e3);
+          if (this.isConnected()) {
+            clearTimeout(timeout);
+            resolve();
+          } else {
+            this.dappClient.once("connected", () => {
+              clearTimeout(timeout);
+              resolve();
+            });
+          }
+        });
+      } catch (error) {
+        return Promise.reject(
+          new Error(`Failed to resume session: ${error.message}`)
+        );
+      }
+    });
+  }
+  getCachedResponse(request) {
     return __async(this, null, function* () {
       var _a;
       if (request.method === "wallet_getSession") {
@@ -1670,6 +2024,27 @@ var MWPTransport = class {
             id: request.id,
             jsonrpc: "2.0",
             result: (_a = walletSession.params) != null ? _a : walletSession.result,
+            // "what?... why walletSession.params?.."
+            method: request.method
+          };
+        }
+      } else if (request.method === "eth_accounts") {
+        const ethAccounts = yield this.kvstore.get(ACCOUNTS_STORE_KEY);
+        if (ethAccounts) {
+          return {
+            id: request.id,
+            jsonrpc: "2.0",
+            result: JSON.parse(ethAccounts),
+            method: request.method
+          };
+        }
+      } else if (request.method === "eth_chainId") {
+        const ethChainId = yield this.kvstore.get(CHAIN_STORE_KEY);
+        if (ethChainId) {
+          return {
+            id: request.id,
+            jsonrpc: "2.0",
+            result: JSON.parse(ethChainId),
             method: request.method
           };
         }
@@ -1680,8 +2055,17 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       if (CACHED_METHOD_LIST.includes(request.method)) {
         yield this.kvstore.set(SESSION_STORE_KEY, JSON.stringify(response));
+      } else if (request.method === "eth_accounts") {
+        yield this.kvstore.set(
+          ACCOUNTS_STORE_KEY,
+          JSON.stringify(response.result)
+        );
+      } else if (request.method === "eth_chainId") {
+        yield this.kvstore.set(CHAIN_STORE_KEY, JSON.stringify(response.result));
       } else if (CACHED_RESET_METHOD_LIST.includes(request.method)) {
         yield this.kvstore.delete(SESSION_STORE_KEY);
+        yield this.kvstore.delete(ACCOUNTS_STORE_KEY);
+        yield this.kvstore.delete(CHAIN_STORE_KEY);
       }
     });
   }
@@ -1691,11 +2075,14 @@ var MWPTransport = class {
         jsonrpc: "2.0",
         id: `${this.__reqId++}`
       }, payload);
-      const cachedWalletSession = yield this.fetchCachedWalletSession(request);
+      const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
         this.notifyCallbacks(cachedWalletSession);
         return cachedWalletSession;
       }
+      if (!this.isConnected()) {
+        yield this.attemptResumeSession();
+      }
       return new Promise((resolve, reject) => {
         var _a;
         const timeout = setTimeout(() => {
@@ -1705,15 +2092,16 @@ var MWPTransport = class {
           request,
           method: request.method,
           resolve: (response) => __async(this, null, function* () {
-            if (CACHED_METHOD_LIST.includes(request.method)) {
-              yield this.storeWalletSession(request, response);
-            }
+            yield this.storeWalletSession(request, response);
             return resolve(response);
           }),
           reject,
           timeout
         });
-        this.dappClient.sendRequest(request).catch(reject);
+        this.dappClient.sendRequest({
+          name: MULTICHAIN_PROVIDER_STREAM_NAME,
+          data: request
+        }).catch(reject);
       });
     });
   }
@@ -1753,21 +2141,22 @@ var KeyManager = class {
 var keymanager = new KeyManager();
 
 // src/multichain/index.ts
+init_utils();
 var logger2 = createLogger("metamask-sdk:core");
 var MultichainSDK = class _MultichainSDK extends MultichainCore {
   constructor(options) {
-    var _a, _b, _c, _d, _e, _f;
-    const withInfuraRPCMethods = setupInfuraProvider(options);
-    const withDappMetadata = setupDappMetadata(withInfuraRPCMethods);
+    var _a, _b, _c, _d, _e, _f, _g;
+    const withDappMetadata = setupDappMetadata(options);
+    const integrationType = ((_a = options.analytics) == null ? void 0 : _a.enabled) ? options.analytics.integrationType : "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
       ui: __spreadProps(__spreadValues({}, withDappMetadata.ui), {
-        preferExtension: (_a = withDappMetadata.ui.preferExtension) != null ? _a : true,
-        preferDesktop: (_b = withDappMetadata.ui.preferDesktop) != null ? _b : false,
-        headless: (_c = withDappMetadata.ui.headless) != null ? _c : false
+        preferExtension: (_b = withDappMetadata.ui.preferExtension) != null ? _b : true,
+        showInstallModal: (_c = withDappMetadata.ui.showInstallModal) != null ? _c : false,
+        headless: (_d = withDappMetadata.ui.headless) != null ? _d : false
       }),
-      analytics: __spreadProps(__spreadValues({}, (_d = options.analytics) != null ? _d : {}), {
-        enabled: (_f = (_e = options.analytics) == null ? void 0 : _e.enabled) != null ? _f : true,
-        integrationType: "unknown"
+      analytics: __spreadProps(__spreadValues({}, (_e = options.analytics) != null ? _e : {}), {
+        enabled: (_g = (_f = options.analytics) == null ? void 0 : _f.enabled) != null ? _g : true,
+        integrationType
       })
     });
     super(allOptions);
@@ -1788,6 +2177,10 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
     });
   }
   get provider() {
+    if (!this.__provider && this.__transport) {
+      this.__provider = getMultichainClient({ transport: this.__transport });
+      return this.__provider;
+    }
     if (!this.__provider) {
       throw new Error("Provider not initialized, establish connection first");
     }
@@ -1808,6 +2201,9 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
   get storage() {
     return this.options.storage;
   }
+  get transportType() {
+    return this.__transport instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
+  }
   get sdkInfo() {
     var _a;
     return `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a = this.options.dapp.url) != null ? _a : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`;
@@ -1844,12 +2240,12 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       const { integrationType } = (_b = this.options.analytics) != null ? _b : {
         integrationType: ""
       };
-      analytics.setGlobalProperty("sdk_version", version);
-      analytics.setGlobalProperty("dapp_id", dappId);
-      analytics.setGlobalProperty("anon_id", anonId);
-      analytics.setGlobalProperty("platform", platform);
-      analytics.setGlobalProperty("integration_type", integrationType);
-      analytics.enable();
+      analytics2.setGlobalProperty("mmconnect_version", version);
+      analytics2.setGlobalProperty("dapp_id", dappId);
+      analytics2.setGlobalProperty("anon_id", anonId);
+      analytics2.setGlobalProperty("platform", platform);
+      analytics2.setGlobalProperty("integration_type", integrationType);
+      analytics2.enable();
     });
   }
   onTransportNotification(payload) {
@@ -1862,13 +2258,11 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
   }
   getStoredTransport() {
     return __async(this, null, function* () {
-      const { ui } = this.options;
-      const { preferExtension = true } = ui;
       const transportType = yield this.storage.getTransport();
       const hasExtensionInstalled = yield hasExtension();
       if (transportType) {
         if (transportType === "browser" /* Browser */) {
-          if (hasExtensionInstalled && preferExtension) {
+          if (hasExtensionInstalled) {
             const apiTransport = new DefaultTransport();
             this.__transport = apiTransport;
             this.listener = apiTransport.onNotification(
@@ -1876,7 +2270,7 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
             );
             return apiTransport;
           }
-        } else if (transportType === "mwp" /* MPW */) {
+        } else if (transportType === "mwp" /* MWP */) {
           const { adapter: kvstore } = this.options.storage;
           const dappClient = yield this.createDappClient();
           const apiTransport = new MWPTransport(dappClient, kvstore);
@@ -1902,7 +2296,7 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
         }
         this.state = "connected";
         if (this.transport instanceof MWPTransport) {
-          yield this.storage.setTransport("mwp" /* MPW */);
+          yield this.storage.setTransport("mwp" /* MWP */);
         } else {
           yield this.storage.setTransport("browser" /* Browser */);
         }
@@ -1913,14 +2307,24 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
   }
   init() {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       try {
         if (typeof window !== "undefined" && ((_a = window.mmsdk) == null ? void 0 : _a.isInitialized)) {
           logger2("MetaMaskSDK: init already initialized");
         } else {
           yield this.setupAnalytics();
           yield this.setupTransport();
-          analytics.track("sdk_initialized", {});
+          if ((_b = this.options.analytics) == null ? void 0 : _b.enabled) {
+            try {
+              const baseProps = yield getBaseAnalyticsProperties(
+                this.options,
+                this.storage
+              );
+              analytics2.track("mmconnect_initialized", baseProps);
+            } catch (error) {
+              logger2("Error tracking initialized event", error);
+            }
+          }
           if (typeof window !== "undefined") {
             window.mmsdk = this;
           }
@@ -1962,7 +2366,7 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       this.listener = this.transport.onNotification(
         this.onTransportNotification.bind(this)
       );
-      yield this.storage.setTransport("mwp" /* MPW */);
+      yield this.storage.setTransport("mwp" /* MWP */);
     });
   }
   onBeforeUnload() {
@@ -2018,7 +2422,7 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
                 this.options.ui.factory.unload();
                 (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
                 this.state = "connected";
-                return this.storage.setTransport("mwp" /* MPW */);
+                return this.storage.setTransport("mwp" /* MWP */);
               }).catch((error) => {
                 if (error instanceof ProtocolError) {
                   if (error.code !== ErrorCode.REQUEST_EXPIRED) {
@@ -2034,7 +2438,7 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
           }),
           (error) => __async(this, null, function* () {
             if (!error) {
-              yield this.storage.setTransport("mwp" /* MPW */);
+              yield this.storage.setTransport("mwp" /* MWP */);
               resolve();
             } else {
               yield this.storage.removeTransport();
@@ -2122,52 +2526,128 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       }));
     });
   }
-  handleConnection(promise) {
+  handleConnection(promise, scopes, transportType) {
     return __async(this, null, function* () {
       this.state = "connecting";
-      return promise.then(() => {
+      return promise.then(() => __async(this, null, function* () {
+        var _a;
         this.state = "connected";
-      }).catch((error) => {
+        if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
+          try {
+            const baseProps = yield getBaseAnalyticsProperties(
+              this.options,
+              this.storage
+            );
+            analytics2.track("mmconnect_connection_established", __spreadProps(__spreadValues({}, baseProps), {
+              transport_type: transportType,
+              user_permissioned_chains: scopes
+            }));
+          } catch (error) {
+            logger2("Error tracking connection_established event", error);
+          }
+        }
+      })).catch((error) => __async(this, null, function* () {
+        var _a;
         this.state = "disconnected";
+        if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
+          try {
+            const baseProps = yield getBaseAnalyticsProperties(
+              this.options,
+              this.storage
+            );
+            const isRejection = isRejectionError(error);
+            if (isRejection) {
+              analytics2.track("mmconnect_connection_rejected", __spreadProps(__spreadValues({}, baseProps), {
+                transport_type: transportType
+              }));
+            } else {
+              analytics2.track("mmconnect_connection_failed", __spreadProps(__spreadValues({}, baseProps), {
+                transport_type: transportType
+              }));
+            }
+          } catch (e) {
+            logger2("Error tracking connection failed/rejected event", error);
+          }
+        }
         return Promise.reject(error);
-      });
+      }));
     });
   }
-  connect(scopes, caipAccountIds) {
+  connect(scopes, caipAccountIds, forceRequest) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
       const { ui } = this.options;
       const platformType = getPlatformType();
       const isWeb = platformType === "in-app-browser" /* MetaMaskMobileWebview */ || platformType === "web-desktop" /* DesktopWeb */;
-      const { preferExtension = true, preferDesktop = false } = ui;
+      const { preferExtension = true, showInstallModal = false } = ui;
       const secure = isSecure();
       const hasExtensionInstalled = yield hasExtension();
-      if (((_a = this.__transport) == null ? void 0 : _a.isConnected()) && !secure) {
+      let transportType;
+      if (platformType === "in-app-browser" /* MetaMaskMobileWebview */ || isWeb && hasExtensionInstalled && preferExtension) {
+        transportType = "browser" /* Browser */;
+      } else {
+        transportType = "mwp" /* MWP */;
+      }
+      if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
+        try {
+          const baseProps = yield getBaseAnalyticsProperties(
+            this.options,
+            this.storage
+          );
+          const dappConfiguredChains = Object.keys(
+            this.options.api.supportedNetworks
+          );
+          analytics2.track("mmconnect_connection_initiated", __spreadProps(__spreadValues({}, baseProps), {
+            transport_type: transportType,
+            dapp_configured_chains: dappConfiguredChains,
+            dapp_requested_chains: scopes
+          }));
+        } catch (error) {
+          logger2("Error tracking connection_initiated event", error);
+        }
+      }
+      if (((_b = this.__transport) == null ? void 0 : _b.isConnected()) && !secure) {
         return this.handleConnection(
-          this.__transport.connect({ scopes, caipAccountIds }).then(() => {
+          this.__transport.connect({ scopes, caipAccountIds, forceRequest }).then(() => {
             if (this.__transport instanceof MWPTransport) {
-              return this.storage.setTransport("mwp" /* MPW */);
+              return this.storage.setTransport("mwp" /* MWP */);
             } else {
               return this.storage.setTransport("browser" /* Browser */);
             }
-          })
+          }),
+          scopes,
+          transportType
+        );
+      }
+      if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
+        const defaultTransport = yield this.setupDefaultTransport();
+        return this.handleConnection(
+          defaultTransport.connect({ scopes, caipAccountIds, forceRequest }),
+          scopes,
+          transportType
         );
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
         const defaultTransport = yield this.setupDefaultTransport();
         return this.handleConnection(
-          defaultTransport.connect({ scopes, caipAccountIds })
+          defaultTransport.connect({ scopes, caipAccountIds, forceRequest }),
+          scopes,
+          transportType
         );
       }
       yield this.setupMWP();
-      const isDesktopPreferred = hasExtensionInstalled ? preferDesktop : !preferExtension || preferDesktop;
-      if (secure && !isDesktopPreferred) {
+      const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
+      if (secure && !shouldShowInstallModal) {
         return this.handleConnection(
-          this.deeplinkConnect(scopes, caipAccountIds)
+          this.deeplinkConnect(scopes, caipAccountIds),
+          scopes,
+          transportType
         );
       }
       return this.handleConnection(
-        this.showInstallModal(isDesktopPreferred, scopes, caipAccountIds)
+        this.showInstallModal(shouldShowInstallModal, scopes, caipAccountIds),
+        scopes,
+        transportType
       );
     });
   }
@@ -2202,6 +2682,26 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       return requestRouter.invokeMethod(request);
     });
   }
+  // DRY THIS WITH REQUEST ROUTER
+  openDeeplinkIfNeeded() {
+    const { ui, mobile } = this.options;
+    const { showInstallModal = false } = ui != null ? ui : {};
+    const secure = isSecure();
+    const shouldOpenDeeplink = secure && !showInstallModal;
+    if (shouldOpenDeeplink) {
+      setTimeout(() => {
+        if (mobile == null ? void 0 : mobile.preferredOpenLink) {
+          mobile.preferredOpenLink(METAMASK_DEEPLINK_BASE, "_self");
+        } else {
+          openDeeplink(
+            this.options,
+            METAMASK_DEEPLINK_BASE,
+            METAMASK_CONNECT_BASE_URL
+          );
+        }
+      }, 10);
+    }
+  }
 };
 
 // src/store/index.ts
@@ -2400,25 +2900,34 @@ function preloadQR() {
 }
 
 // src/ui/index.ts
+init_utils();
 var __instance;
 function preload() {
   return __async(this, null, function* () {
-    __instance != null ? __instance : __instance = yield import(
-      // Use a non-literal specifier to avoid Vite static analysis of deep imports
-      // and gracefully handle absence of the Stencil loader in this package build.
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      "@metamask/multichain-ui".concat("/dist/loader/index.js")
-      // Prefer ESM loader in browsers
-    ).then((loader) => __async(null, null, function* () {
-      if (typeof (loader == null ? void 0 : loader.defineCustomElements) === "function") {
-        loader.defineCustomElements();
-      }
-      return Promise.resolve(loader);
-    })).catch((error) => __async(null, null, function* () {
-      console.error(`Gracefully Failed to load modal customElements:`, error);
-      return Promise.resolve(void 0);
-    }));
+    if (true) {
+      __instance != null ? __instance : __instance = yield import("@metamask/multichain-ui/dist/loader/index.js").then((loader) => __async(null, null, function* () {
+        if (typeof (loader == null ? void 0 : loader.defineCustomElements) === "function") {
+          loader.defineCustomElements();
+        }
+        return Promise.resolve(loader);
+      })).catch((error) => __async(null, null, function* () {
+        console.error(`Gracefully Failed to load modal customElements:`, error);
+        return Promise.resolve(void 0);
+      }));
+    } else {
+      const dynamicImport = (0, eval)("import");
+      __instance != null ? __instance : __instance = yield dynamicImport(
+        "@metamask/multichain-ui/dist/loader/index.js"
+      ).then((loader) => __async(null, null, function* () {
+        if (typeof (loader == null ? void 0 : loader.defineCustomElements) === "function") {
+          loader.defineCustomElements();
+        }
+        return Promise.resolve(loader);
+      })).catch((error) => __async(null, null, function* () {
+        console.error(`Gracefully Failed to load modal customElements:`, error);
+        return Promise.resolve(void 0);
+      }));
+    }
   });
 }
 var ModalFactory = class {
@@ -2510,7 +3019,7 @@ var ModalFactory = class {
   onStartDesktopOnboarding() {
     new MetaMaskOnboarding().startOnboarding();
   }
-  renderInstallModal(preferDesktop, createConnectionRequest, successCallback) {
+  renderInstallModal(showInstallModal, createConnectionRequest, successCallback) {
     return __async(this, null, function* () {
       var _a;
       (_a = this.modal) == null ? void 0 : _a.unmount();
@@ -2523,7 +3032,7 @@ var ModalFactory = class {
         expiresIn: (connectionRequest.sessionRequest.expiresAt - Date.now()) / 1e3,
         connectionRequest,
         parentElement,
-        preferDesktop,
+        showInstallModal,
         link: qrCodeLink,
         sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
@@ -2600,10 +3109,12 @@ export {
   getPlatformType,
   getTransportType,
   getVersion,
+  getWalletActionAnalyticsProperties,
   hasExtension,
   infuraRpcUrls,
   isEnabled,
   isMetamaskExtensionInstalled,
+  isRejectionError,
   isSecure
 };
 //# sourceMappingURL=connect-multichain.mjs.map