@metamask/connect-multichain 0.7.0 → 0.9.0

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

@@ -422,7 +422,7 @@ var init_multichain = __esm({
       }
       /**
        * Merges the given options into the current instance options.
-       * Only the mergeable keys are updated (api.supportedNetworks, ui.*, mobile.*, transport.extensionId, debug).
+       * Only the mergeable keys are updated (api.supportedNetworks, versions, ui.*, mobile.*, transport.extensionId, debug).
        * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
        * subsequent calls to `createMultichainClient` to have a different `dapp` value.
        * Used when createMultichainClient is called with an existing singleton.
@@ -430,22 +430,23 @@ var init_multichain = __esm({
        * @param partial - Options to merge/overwrite onto the current instance
        */
       mergeOptions(partial) {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
         const opts = this.options;
         this.options = __spreadProps(__spreadValues({}, opts), {
           api: __spreadProps(__spreadValues({}, opts.api), {
             supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a2 = partial.api) == null ? void 0 : _a2.supportedNetworks) != null ? _b : {})
           }),
+          versions: __spreadValues(__spreadValues({}, opts.versions), (_c = partial.versions) != null ? _c : {}),
           ui: __spreadProps(__spreadValues({}, opts.ui), {
-            headless: (_d = (_c = partial.ui) == null ? void 0 : _c.headless) != null ? _d : opts.ui.headless,
-            preferExtension: (_f = (_e = partial.ui) == null ? void 0 : _e.preferExtension) != null ? _f : opts.ui.preferExtension,
-            showInstallModal: (_h = (_g = partial.ui) == null ? void 0 : _g.showInstallModal) != null ? _h : opts.ui.showInstallModal
+            headless: (_e = (_d = partial.ui) == null ? void 0 : _d.headless) != null ? _e : opts.ui.headless,
+            preferExtension: (_g = (_f = partial.ui) == null ? void 0 : _f.preferExtension) != null ? _g : opts.ui.preferExtension,
+            showInstallModal: (_i = (_h = partial.ui) == null ? void 0 : _h.showInstallModal) != null ? _i : opts.ui.showInstallModal
           }),
-          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_i = partial.mobile) != null ? _i : {}),
-          transport: __spreadProps(__spreadValues({}, (_j = opts.transport) != null ? _j : {}), {
-            extensionId: (_m = (_k = partial.transport) == null ? void 0 : _k.extensionId) != null ? _m : (_l = opts.transport) == null ? void 0 : _l.extensionId
+          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_j = partial.mobile) != null ? _j : {}),
+          transport: __spreadProps(__spreadValues({}, (_k = opts.transport) != null ? _k : {}), {
+            extensionId: (_n = (_l = partial.transport) == null ? void 0 : _l.extensionId) != null ? _n : (_m = opts.transport) == null ? void 0 : _m.extensionId
           }),
-          debug: (_n = partial.debug) != null ? _n : opts.debug
+          debug: (_o = partial.debug) != null ? _o : opts.debug
         });
       }
     };
@@ -914,14 +915,13 @@ function isRejectionError(error) {
 }
 function getBaseAnalyticsProperties(options, storage) {
   return __async(this, null, function* () {
-    var _a2, _b;
-    const version = getVersion();
+    var _a2, _b, _c;
     const dappId = getDappId(options.dapp);
     const platform = getPlatformType();
     const anonId = yield storage.getAnonId();
     const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
     return {
-      mmconnect_version: version,
+      mmconnect_versions: (_c = options.versions) != null ? _c : {},
       dapp_id: dappId,
       platform,
       integration_type: integrationType,
@@ -929,20 +929,20 @@ function getBaseAnalyticsProperties(options, storage) {
     };
   });
 }
-function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
+function getWalletActionAnalyticsProperties(options, storage, invokeOptions, transportType) {
   return __async(this, null, function* () {
-    var _a2, _b;
-    const version = getVersion();
+    var _a2, _b, _c;
     const dappId = getDappId(options.dapp);
     const anonId = yield storage.getAnonId();
     const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown";
     return {
-      mmconnect_version: version,
+      mmconnect_versions: (_c = options.versions) != null ? _c : {},
       dapp_id: dappId,
       method: invokeOptions.request.method,
       integration_type: integrationType,
       caip_chain_id: invokeOptions.scope,
-      anon_id: anonId
+      anon_id: anonId,
+      transport_type: transportType
     };
   });
 }
@@ -1400,10 +1400,11 @@ init_utils();
 init_analytics();
 var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
-  constructor(transport, rpcClient, config) {
+  constructor(transport, rpcClient, config, transportType) {
     this.transport = transport;
     this.rpcClient = rpcClient;
     this.config = config;
+    this.transportType = transportType;
     __privateAdd(this, _RequestRouter_instances);
   }
   /**
@@ -1473,16 +1474,14 @@ var RequestRouter = class {
    */
   handleWithRpcNode(options) {
     return __async(this, null, function* () {
-      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;
+      try {
+        return yield this.rpcClient.request(options);
+      } catch (error) {
+        if (error instanceof MissingRpcEndpointErr) {
+          return this.handleWithWallet(options);
         }
-      }));
+        throw error;
+      }
     });
   }
   /**
@@ -1526,7 +1525,8 @@ trackWalletActionRequested_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_requested", props);
   });
@@ -1536,7 +1536,8 @@ trackWalletActionSucceeded_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_succeeded", props);
   });
@@ -1546,7 +1547,8 @@ trackWalletActionFailed_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_failed", props);
   });
@@ -1556,7 +1558,8 @@ trackWalletActionRejected_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_rejected", props);
   });
@@ -1566,7 +1569,7 @@ trackWalletActionRejected_fn = function(options) {
 var import_multichain_api_client = require("@metamask/multichain-api-client");
 init_utils();
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1614,11 +1617,31 @@ var DefaultTransport = class {
       });
     });
   }
+  init() {
+    return __async(this, null, function* () {
+      yield __privateMethod(this, _DefaultTransport_instances, init_fn).call(this);
+      let walletSession = { sessionScopes: {} };
+      try {
+        const sessionRequest = yield this.request(
+          { method: "wallet_getSession" },
+          __privateGet(this, _defaultRequestOptions)
+        );
+        walletSession = sessionRequest.result;
+      } catch (e) {
+        console.error(
+          "Failed to get wallet session during DefaultTransport init"
+        );
+      }
+      __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, {
+        method: "wallet_sessionChanged",
+        params: walletSession
+      });
+    });
+  }
   connect(options) {
     return __async(this, null, function* () {
       var _a2, _b, _c, _d, _e;
-      __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
-      yield __privateGet(this, _transport).connect();
+      yield __privateMethod(this, _DefaultTransport_instances, init_fn).call(this);
       const sessionRequest = yield this.request(
         { method: "wallet_getSession" },
         __privateGet(this, _defaultRequestOptions)
@@ -1675,26 +1698,6 @@ var DefaultTransport = class {
   disconnect() {
     return __async(this, arguments, function* (scopes = []) {
       yield this.request({ method: "wallet_revokeSession", params: { scopes } });
-      const response = yield this.request({ method: "wallet_getSession" });
-      const { sessionScopes } = response.result;
-      if (Object.keys(sessionScopes).length > 0) {
-        return;
-      }
-      __privateGet(this, _notificationCallbacks).clear();
-      if (__privateGet(this, _handleResponseListener)) {
-        window.removeEventListener("message", __privateGet(this, _handleResponseListener));
-        __privateSet(this, _handleResponseListener, void 0);
-      }
-      if (__privateGet(this, _handleNotificationListener)) {
-        window.removeEventListener("message", __privateGet(this, _handleNotificationListener));
-        __privateSet(this, _handleNotificationListener, void 0);
-      }
-      for (const [, request] of __privateGet(this, _pendingRequests)) {
-        clearTimeout(request.timeout);
-        request.reject(new Error("Transport disconnected"));
-      }
-      __privateGet(this, _pendingRequests).clear();
-      yield __privateGet(this, _transport).disconnect();
     });
   }
   isConnected() {
@@ -1783,7 +1786,7 @@ handleNotification_fn = function(event) {
     return;
   }
   const responseData = (_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.data;
-  if (typeof responseData === "object" && responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged") {
+  if (typeof responseData === "object" && responseData !== null && (responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged")) {
     __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, responseData);
   }
 };
@@ -1796,6 +1799,14 @@ setupMessageListener_fn = function() {
   window.addEventListener("message", __privateGet(this, _handleResponseListener));
   window.addEventListener("message", __privateGet(this, _handleNotificationListener));
 };
+init_fn = function() {
+  return __async(this, null, function* () {
+    __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
+    if (!__privateGet(this, _transport).isConnected()) {
+      yield __privateGet(this, _transport).connect();
+    }
+  });
+};
 
 // src/multichain/transports/multichainApiClientWrapper/index.ts
 var import_rpc_errors = require("@metamask/rpc-errors");
@@ -2193,6 +2204,10 @@ var MWPTransport = class {
       }
     });
   }
+  init() {
+    return __async(this, null, function* () {
+    });
+  }
   // TODO: Rename this
   sendEip1193Message(payload, options) {
     return __async(this, null, function* () {
@@ -2545,7 +2560,7 @@ var MWPTransport = class {
   getActiveSession() {
     return __async(this, null, function* () {
       const { kvstore } = this;
-      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
+      const sessionStore = yield import_mobile_wallet_protocol_core.SessionStore.create(kvstore);
       try {
         const [activeSession] = yield sessionStore.list();
         return activeSession;
@@ -2619,6 +2634,9 @@ var KeyManager = class {
       return Buffer.from(decryptedBuffer).toString("utf8");
     });
   }
+  validatePeerKey(key) {
+    import_eciesjs.PublicKey.fromHex(Buffer.from(key).toString("hex"));
+  }
 };
 var keymanager = new KeyManager();
 
@@ -2626,10 +2644,10 @@ var keymanager = new KeyManager();
 init_utils();
 var logger2 = createLogger("metamask-sdk:core");
 var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
-var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
+var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_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 _a2, _b, _c, _d, _e, _f;
+    var _a2, _b, _c, _d, _e, _f, _g;
     const withDappMetadata = setupDappMetadata(options);
     const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
@@ -2640,7 +2658,10 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }),
       analytics: __spreadProps(__spreadValues({}, (_f = options.analytics) != null ? _f : {}), {
         integrationType
-      })
+      }),
+      versions: __spreadValues({
+        "connect-multichain": "0.9.0"
+      }, (_g = options.versions) != null ? _g : {})
     });
     super(allOptions);
     __privateAdd(this, _MetaMaskConnectMultichain_instances);
@@ -2664,6 +2685,9 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   }
   set status(value) {
     var _a2, _b;
+    if (this._status === value) {
+      return;
+    }
     this._status = value;
     (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, {
       method: "stateChanged",
@@ -2694,23 +2718,28 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   // Creates a singleton instance of MetaMaskConnectMultichain.
   // If the singleton already exists, it merges the incoming options with the
   // existing singleton options for the following keys: `api.supportedNetworks`,
-  // `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note that the
-  // value for `dapp` is not merged as it does not make sense for subsequent calls to
-  // `createMultichainClient` to have a different `dapp` value.
+  // `versions`, `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note
+  // that the value for `dapp` is not merged as it does not make sense for
+  // subsequent calls to `createMultichainClient` to have a different `dapp` value.
   static create(options) {
     return __async(this, null, function* () {
+      var _a2;
       const globalObject = getGlobalObject();
       const existing = globalObject[SINGLETON_KEY];
       if (existing) {
         const instance = yield existing;
         instance.mergeOptions(options);
+        import_analytics4.analytics.setGlobalProperty(
+          "mmconnect_versions",
+          (_a2 = instance.options.versions) != null ? _a2 : {}
+        );
         if (options.debug) {
           enableDebug("metamask-sdk:*");
         }
         return instance;
       }
       const instancePromise = (() => __async(null, null, function* () {
-        var _a2;
+        var _a3;
         const instance = new _MetaMaskConnectMultichain(options);
         const isEnabled2 = yield isEnabled(
           "metamask-sdk:core",
@@ -2719,7 +2748,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
         if (isEnabled2) {
           enableDebug("metamask-sdk:core");
         }
-        yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
+        yield __privateMethod(_a3 = instance, _MetaMaskConnectMultichain_instances, init_fn2).call(_a3);
         return instance;
       }))();
       globalObject[SINGLETON_KEY] = instancePromise;
@@ -2829,14 +2858,16 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       );
       yield (_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.disconnect(scopes);
       if (remainingScopes.length === 0) {
-        yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
-        (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
         yield this.storage.removeTransport();
-        __privateSet(this, _listener, void 0);
-        __privateSet(this, _beforeUnloadListener, void 0);
-        __privateSet(this, _transport2, void 0);
-        __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
-        __privateSet(this, _dappClient, void 0);
+        if (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);
+          __privateSet(this, _listener, void 0);
+          __privateSet(this, _beforeUnloadListener, void 0);
+          __privateSet(this, _transport2, void 0);
+          __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
+          __privateSet(this, _dappClient, void 0);
+        }
         this.status = "disconnected";
       }
     });
@@ -2845,7 +2876,12 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     return __async(this, null, function* () {
       const { transport, options } = this;
       const rpcClient = new RpcClient(options, __privateGet(this, _sdkInfo));
-      const requestRouter = new RequestRouter(transport, rpcClient, options);
+      const requestRouter = new RequestRouter(
+        transport,
+        rpcClient,
+        options,
+        this.transportType
+      );
       return requestRouter.invokeMethod(request);
     });
   }
@@ -2875,16 +2911,16 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   // without having to concern themselves with the current transport connection status.
   emitSessionChanged() {
     return __async(this, null, function* () {
-      var _a2;
+      var _a2, _b;
       const emptySession = { sessionScopes: {} };
-      if (this.status !== "connected" && this.status !== "connecting") {
+      if (!((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected())) {
         this.emit("wallet_sessionChanged", emptySession);
         return;
       }
       const response = yield this.transport.request({
         method: "wallet_getSession"
       });
-      this.emit("wallet_sessionChanged", (_a2 = response.result) != null ? _a2 : emptySession);
+      this.emit("wallet_sessionChanged", (_b = response.result) != null ? _b : emptySession);
     });
   }
 };
@@ -2898,20 +2934,22 @@ _sdkInfo = new WeakMap();
 _MetaMaskConnectMultichain_instances = new WeakSet();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
-    var _a2;
+    var _a2, _b;
     const platform = getPlatformType();
     const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
     const isReactNative2 = platform === "react-native" /* ReactNative */;
     if (!isBrowser && !isReactNative2) {
       return;
     }
-    const version = getVersion();
     const dappId = getDappId(this.options.dapp);
     const anonId = yield this.storage.getAnonId();
     const { integrationType } = (_a2 = this.options.analytics) != null ? _a2 : {
       integrationType: ""
     };
-    import_analytics4.analytics.setGlobalProperty("mmconnect_version", version);
+    import_analytics4.analytics.setGlobalProperty(
+      "mmconnect_versions",
+      (_b = this.options.versions) != null ? _b : {}
+    );
     import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
     import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
     import_analytics4.analytics.setGlobalProperty("platform", platform);
@@ -2921,9 +2959,17 @@ setupAnalytics_fn = function() {
 };
 onTransportNotification_fn = function(payload) {
   return __async(this, null, function* () {
-    var _a2;
+    var _a2, _b, _c;
     if (typeof payload === "object" && payload !== null && "method" in payload) {
-      this.emit(payload.method, (_a2 = payload.params) != null ? _a2 : payload.result);
+      if (payload.method === "wallet_sessionChanged") {
+        const sessionScopes = (_b = (_a2 = payload.params) == null ? void 0 : _a2.sessionScopes) != null ? _b : {};
+        const hasScopes = Object.keys(sessionScopes).length > 0;
+        if (this.status === "loaded" && !hasScopes) {
+          return;
+        }
+        this.status = hasScopes ? "connected" : "disconnected";
+      }
+      this.emit(payload.method, (_c = payload.params) != null ? _c : payload.result);
     }
   });
 };
@@ -2961,6 +3007,7 @@ getStoredTransport_fn = function() {
 };
 setupTransport_fn = function() {
   return __async(this, null, function* () {
+    var _a2;
     const transport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getStoredTransport_fn).call(this);
     if (transport) {
       if (!this.transport.isConnected()) {
@@ -2975,23 +3022,24 @@ setupTransport_fn = function() {
       }
     } else {
       this.status = "loaded";
+      const hasExtensionInstalled = yield hasExtension();
+      const preferExtension = (_a2 = this.options.ui.preferExtension) != null ? _a2 : true;
+      if (hasExtensionInstalled && preferExtension) {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this, { persist: false });
+        try {
+          yield this.transport.init();
+        } catch (error) {
+          console.error("Passive init failed:", error);
+        }
+      }
     }
   });
 };
-init_fn = function() {
+init_fn2 = function() {
   return __async(this, null, function* () {
     try {
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
-      try {
-        const baseProps = yield getBaseAnalyticsProperties(
-          this.options,
-          this.storage
-        );
-        import_analytics4.analytics.track("mmconnect_initialized", baseProps);
-      } catch (error) {
-        logger2("Error tracking initialized event", error);
-      }
     } catch (error) {
       yield this.storage.removeTransport();
       this.status = "pending";
@@ -3002,7 +3050,7 @@ init_fn = function() {
 createDappClient_fn = function() {
   return __async(this, null, function* () {
     const { adapter: kvstore } = this.options.storage;
-    const sessionstore = new import_mobile_wallet_protocol_core2.SessionStore(kvstore);
+    const sessionstore = yield import_mobile_wallet_protocol_core2.SessionStore.create(kvstore);
     const websocket = (
       // eslint-disable-next-line no-negated-condition
       typeof window !== "undefined" ? WebSocket : (yield import("ws")).WebSocket
@@ -3179,9 +3227,13 @@ headlessConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   });
 };
 setupDefaultTransport_fn = function() {
-  return __async(this, null, function* () {
-    this.status = "connecting";
-    yield this.storage.setTransport("browser" /* Browser */);
+  return __async(this, arguments, function* (options = { persist: true }) {
+    if (__privateGet(this, _transport2) instanceof DefaultTransport) {
+      return __privateGet(this, _transport2);
+    }
+    if (options == null ? void 0 : options.persist) {
+      yield this.storage.setTransport("browser" /* Browser */);
+    }
     const transport = new DefaultTransport();
     __privateSet(this, _listener, transport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
@@ -3299,16 +3351,20 @@ handleConnection_fn = function(promise, scopes, transportType) {
 };
 getCaipSession_fn = function() {
   return __async(this, null, function* () {
+    var _a2;
     let sessionData = {
       sessionScopes: {},
       sessionProperties: {}
     };
-    if (this.status === "connected") {
-      const response = yield this.transport.request({
-        method: "wallet_getSession"
-      });
-      if (response.result) {
-        sessionData = response.result;
+    if ((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected()) {
+      try {
+        const response = yield this.transport.request({
+          method: "wallet_getSession"
+        });
+        if (response.result) {
+          sessionData = response.result;
+        }
+      } catch (e) {
       }
     }
     return sessionData;
@@ -3637,7 +3693,6 @@ var BaseModalFactory = class {
         parentElement,
         showInstallModal,
         link: qrCodeLink,
-        sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
           var _a3;
           const newLink = this.createConnectionDeeplink(request);
@@ -3663,7 +3718,6 @@ var BaseModalFactory = class {
       const otpCode = yield createOTPCode();
       const modal = new this.options.OTPCodeModal({
         parentElement: container,
-        sdkVersion: getVersion(),
         otpCode,
         onClose: this.onCloseModal.bind(this),
         createOTPCode,