@metamask/connect-evm 1.4.0 → 2.1.0

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

@@ -88,6 +88,7 @@ import {
   TransportType
 } from "@metamask/connect-multichain";
 import { hexToNumber as hexToNumber3 } from "@metamask/utils";
+import { satisfies } from "semver";
 
 // src/constants.ts
 var IGNORED_METHODS = [
@@ -119,6 +120,9 @@ var CONNECT_EVM_SESSION_PROPERTIES = {
   [EIP1193_COMPATIBLE_SESSION_PROPERTY]: true
 };
 
+// src/assets/metamask-fox.svg
+var metamask_fox_default = 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 142 137">%0A  <path fill="%23FF5C16" d="m132.24 131.751-30.481-9.076-22.986 13.741-16.038-.007-23-13.734-30.467 9.076L0 100.465l9.268-34.723L0 36.385 9.268 0l47.607 28.443h27.757L132.24 0l9.268 36.385-9.268 29.357 9.268 34.723-9.268 31.286Z"/>%0A  <path fill="%23FF5C16" d="m9.274 0 47.608 28.463-1.893 19.534L9.274 0Zm30.468 100.478 20.947 15.957-20.947 6.24v-22.197Zm19.273-26.381L54.989 48.01l-25.77 17.74-.014-.007v.013l.08 18.26 10.45-9.918h19.28ZM132.24 0 84.632 28.463l1.887 19.534L132.24 0Zm-30.467 100.478-20.948 15.957 20.948 6.24v-22.197Zm10.529-34.723h.007-.007v-.013l-.006.007-25.77-17.739L82.5 74.097h19.272l10.457 9.917.073-18.259Z"/>%0A  <path fill="%23E34807" d="m39.735 122.675-30.467 9.076L0 100.478h39.735v22.197ZM59.008 74.09l5.82 37.714-8.066-20.97-27.49-6.82 10.456-9.923h19.28Zm42.764 48.585 30.468 9.076 9.268-31.273h-39.736v22.197ZM82.5 74.09l-5.82 37.714 8.065-20.97 27.491-6.82-10.463-9.923H82.5Z"/>%0A  <path fill="%23FF8D5D" d="m0 100.465 9.268-34.723h19.93l.073 18.266 27.492 6.82 8.065 20.969-4.146 4.618-20.947-15.957H0v.007Zm141.508 0-9.268-34.723h-19.931l-.073 18.266-27.49 6.82-8.066 20.969 4.145 4.618 20.948-15.957h39.735v.007ZM84.632 28.443H56.875L54.99 47.977l9.839 63.8H76.68l9.845-63.8-1.893-19.534Z"/>%0A  <path fill="%23661800" d="M9.268 0 0 36.385l9.268 29.357h19.93l25.784-17.745L9.268 0Zm43.98 81.665h-9.029l-4.916 4.819 17.466 4.33-3.521-9.155v.006ZM132.24 0l9.268 36.385-9.268 29.357h-19.931L86.526 47.997 132.24 0ZM88.273 81.665h9.042l4.916 4.825-17.486 4.338 3.528-9.17v.007Zm-9.507 42.305 2.06-7.542-4.146-4.618H64.82l-4.145 4.618 2.059 7.542"/>%0A  <path fill="%23C0C4CD" d="M78.766 123.969v12.453H62.735v-12.453h16.03Z"/>%0A  <path fill="%23E7EBF6" d="m39.742 122.662 23.006 13.754v-12.453l-2.06-7.541-20.946 6.24Zm62.031 0-23.007 13.754v-12.453l2.06-7.541 20.947 6.24Z"/>%0A</svg>%0A';
+
 // src/logger.ts
 import {
   createLogger,
@@ -130,6 +134,220 @@ var enableDebug = () => {
   debug(namespace);
 };
 
+// src/eip6963.ts
+var EIP6963_ANNOUNCE_PROVIDER_EVENT = "eip6963:announceProvider";
+var EIP6963_REQUEST_PROVIDER_EVENT = "eip6963:requestProvider";
+var EIP6963_DETECTION_TIMEOUT_MS = 300;
+var CONNECT_EVM_EIP6963_NAME = "MetaMask";
+var CONNECT_EVM_EIP6963_RDNS = "io.metamask.mmc";
+var METAMASK_EIP6963_RDNS = [
+  "io.metamask",
+  "io.metamask.mobile"
+];
+var CONNECT_EVM_EIP6963_ICON = metamask_fox_default;
+var getBrowserWindow = () => {
+  const { window: browserWindow } = globalThis;
+  return typeof (browserWindow == null ? void 0 : browserWindow.dispatchEvent) === "function" ? browserWindow : void 0;
+};
+var delay = (ms) => __async(null, null, function* () {
+  return yield new Promise((resolve) => setTimeout(resolve, ms));
+});
+var isNativeMetaMaskRdns = (rdns) => METAMASK_EIP6963_RDNS.some((nativeRdns) => nativeRdns === rdns);
+var getAnnouncementRdns = (event) => {
+  var _a;
+  const { detail } = event;
+  const rdns = (_a = detail == null ? void 0 : detail.info) == null ? void 0 : _a.rdns;
+  return typeof rdns === "string" ? rdns : void 0;
+};
+var UUID_BYTE_TO_HEX = Array.from(
+  { length: 256 },
+  (_, byte) => byte.toString(16).padStart(2, "0")
+);
+var formatUuidV4 = (bytes) => {
+  bytes[6] = bytes[6] % 16 + 64;
+  bytes[8] = bytes[8] % 64 + 128;
+  return [
+    UUID_BYTE_TO_HEX[bytes[0]],
+    UUID_BYTE_TO_HEX[bytes[1]],
+    UUID_BYTE_TO_HEX[bytes[2]],
+    UUID_BYTE_TO_HEX[bytes[3]],
+    "-",
+    UUID_BYTE_TO_HEX[bytes[4]],
+    UUID_BYTE_TO_HEX[bytes[5]],
+    "-",
+    UUID_BYTE_TO_HEX[bytes[6]],
+    UUID_BYTE_TO_HEX[bytes[7]],
+    "-",
+    UUID_BYTE_TO_HEX[bytes[8]],
+    UUID_BYTE_TO_HEX[bytes[9]],
+    "-",
+    UUID_BYTE_TO_HEX[bytes[10]],
+    UUID_BYTE_TO_HEX[bytes[11]],
+    UUID_BYTE_TO_HEX[bytes[12]],
+    UUID_BYTE_TO_HEX[bytes[13]],
+    UUID_BYTE_TO_HEX[bytes[14]],
+    UUID_BYTE_TO_HEX[bytes[15]]
+  ].join("");
+};
+var createUuid = () => {
+  const { crypto: cryptoProvider } = globalThis;
+  if (cryptoProvider == null ? void 0 : cryptoProvider.randomUUID) {
+    return cryptoProvider.randomUUID();
+  }
+  if (cryptoProvider == null ? void 0 : cryptoProvider.getRandomValues) {
+    const bytes = new Uint8Array(16);
+    cryptoProvider.getRandomValues(bytes);
+    return formatUuidV4(bytes);
+  }
+  throw new Error("Web Crypto API is required for EIP-6963 announcement");
+};
+var createAnnouncementEvent = (detail) => {
+  const { CustomEvent: CustomEventConstructor } = globalThis;
+  return new CustomEventConstructor(EIP6963_ANNOUNCE_PROVIDER_EVENT, {
+    detail
+  });
+};
+var createRequestProviderEvent = () => {
+  const { Event: EventConstructor } = globalThis;
+  return new EventConstructor(EIP6963_REQUEST_PROVIDER_EVENT);
+};
+var createProviderInfo = () => Object.freeze({
+  uuid: createUuid(),
+  name: CONNECT_EVM_EIP6963_NAME,
+  icon: CONNECT_EVM_EIP6963_ICON,
+  rdns: CONNECT_EVM_EIP6963_RDNS
+});
+var hasNativeMetaMaskProvider = () => __async(null, null, function* () {
+  const browserWindow = getBrowserWindow();
+  if (!browserWindow) {
+    return false;
+  }
+  const announcedRdns = /* @__PURE__ */ new Set();
+  const handler = (event) => {
+    const rdns = getAnnouncementRdns(event);
+    if (rdns) {
+      announcedRdns.add(rdns);
+    }
+  };
+  browserWindow.addEventListener(EIP6963_ANNOUNCE_PROVIDER_EVENT, handler);
+  try {
+    browserWindow.dispatchEvent(createRequestProviderEvent());
+    yield delay(EIP6963_DETECTION_TIMEOUT_MS);
+  } finally {
+    browserWindow.removeEventListener(EIP6963_ANNOUNCE_PROVIDER_EVENT, handler);
+  }
+  return [...announcedRdns].some(isNativeMetaMaskRdns);
+});
+var _provider, _detail, _suppressed, _requestHandler, _announcementPromise, _EIP6963ProviderAnnouncer_instances, announceOnce_fn, installRequestProviderListener_fn, dispatchAnnouncement_fn;
+var EIP6963ProviderAnnouncer = class {
+  /**
+   * Creates an EIP-6963 announcer for one SDK provider instance.
+   *
+   * @param provider - EIP-1193 provider to announce.
+   */
+  constructor(provider) {
+    __privateAdd(this, _EIP6963ProviderAnnouncer_instances);
+    /** EIP-1193 provider exposed in EIP-6963 announcements. */
+    __privateAdd(this, _provider);
+    /** Stable announcement payload for this SDK provider instance. */
+    __privateAdd(this, _detail);
+    /** Whether native MetaMask detection already suppressed this provider. */
+    __privateAdd(this, _suppressed, false);
+    /** Listener used to re-announce the SDK provider on future requests. */
+    __privateAdd(this, _requestHandler);
+    /** In-flight announcement detection promise, shared by concurrent calls. */
+    __privateAdd(this, _announcementPromise);
+    __privateSet(this, _provider, provider);
+  }
+  /**
+   * Announces the SDK provider unless native MetaMask has already announced.
+   *
+   * Repeated calls are idempotent: once announced, this re-dispatches the same
+   * provider detail and does not install duplicate request listeners. The first
+   * call may take up to `EIP6963_DETECTION_TIMEOUT_MS` while native providers
+   * are requested.
+   *
+   * @returns A promise that resolves once detection and any announcement finish.
+   */
+  announce() {
+    return __async(this, null, function* () {
+      try {
+        if (__privateGet(this, _suppressed)) {
+          return;
+        }
+        if (__privateGet(this, _detail)) {
+          __privateMethod(this, _EIP6963ProviderAnnouncer_instances, dispatchAnnouncement_fn).call(this);
+          return;
+        }
+        if (!__privateGet(this, _announcementPromise)) {
+          __privateSet(this, _announcementPromise, __privateMethod(this, _EIP6963ProviderAnnouncer_instances, announceOnce_fn).call(this).catch((error) => {
+            logger("EIP-6963 provider announcement failed", error);
+          }).finally(() => {
+            __privateSet(this, _announcementPromise, void 0);
+          }));
+        }
+        yield __privateGet(this, _announcementPromise);
+      } catch (error) {
+        logger("EIP-6963 provider announcement failed", error);
+      }
+    });
+  }
+};
+_provider = new WeakMap();
+_detail = new WeakMap();
+_suppressed = new WeakMap();
+_requestHandler = new WeakMap();
+_announcementPromise = new WeakMap();
+_EIP6963ProviderAnnouncer_instances = new WeakSet();
+announceOnce_fn = function() {
+  return __async(this, null, function* () {
+    if (!getBrowserWindow()) {
+      return;
+    }
+    if (yield hasNativeMetaMaskProvider()) {
+      logger("MetaMask EIP-6963 provider is already announced. Skipping...");
+      __privateSet(this, _suppressed, true);
+      return;
+    }
+    __privateSet(this, _detail, Object.freeze({
+      info: createProviderInfo(),
+      provider: __privateGet(this, _provider)
+    }));
+    __privateMethod(this, _EIP6963ProviderAnnouncer_instances, installRequestProviderListener_fn).call(this);
+    __privateMethod(this, _EIP6963ProviderAnnouncer_instances, dispatchAnnouncement_fn).call(this);
+  });
+};
+/**
+ * Installs a single persistent EIP-6963 request listener for re-announcement.
+ */
+installRequestProviderListener_fn = function() {
+  const browserWindow = getBrowserWindow();
+  if (!browserWindow || __privateGet(this, _requestHandler)) {
+    return;
+  }
+  __privateSet(this, _requestHandler, () => {
+    try {
+      __privateMethod(this, _EIP6963ProviderAnnouncer_instances, dispatchAnnouncement_fn).call(this);
+    } catch (error) {
+      logger("EIP-6963 provider announcement failed", error);
+    }
+  });
+  browserWindow.addEventListener(
+    EIP6963_REQUEST_PROVIDER_EVENT,
+    __privateGet(this, _requestHandler)
+  );
+};
+/**
+ * Dispatches the current provider detail through EIP-6963.
+ */
+dispatchAnnouncement_fn = function() {
+  const browserWindow = getBrowserWindow();
+  if (!browserWindow || !__privateGet(this, _detail)) {
+    return;
+  }
+  browserWindow.dispatchEvent(createAnnouncementEvent(__privateGet(this, _detail)));
+};
+
 // src/provider.ts
 import { EventEmitter, RPCInvokeMethodErr } from "@metamask/connect-multichain";
 import { hexToNumber as hexToNumber2 } from "@metamask/utils";
@@ -195,10 +413,14 @@ var EIP1193Provider = class extends EventEmitter {
         });
       } catch (error) {
         if (error instanceof RPCInvokeMethodErr && error.rpcCode !== void 0) {
+          const invokeError = error;
           const rpcError = new Error(
             (_d = error.rpcMessage) != null ? _d : error.reason
           );
           rpcError.code = error.rpcCode;
+          if (invokeError.rpcData !== void 0) {
+            rpcError.data = invokeError.rpcData;
+          }
           throw rpcError;
         }
         throw error;
@@ -397,7 +619,61 @@ function isAnalyticsEnabled(options) {
   var _a;
   return ((_a = options == null ? void 0 : options.analytics) == null ? void 0 : _a.enabled) !== false;
 }
-var _core2, _provider, _sessionScopes, _eventHandlers, _sessionChangedHandler, _displayUriHandler, _removeNotificationHandler, _status, _pendingPreferredChainId, _MetamaskConnectEVM_instances, getCoreOptions_fn, createInvokeOptions_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, getSelectedChainId_fn, requestInterceptor_fn, clearConnectionState_fn, addEthereumChain_fn, request_fn, cacheChainId_fn, onSessionChanged_fn, onChainChanged_fn, onAccountsChanged_fn, onConnect_fn, onDisconnect_fn, onDisplayUri_fn;
+var createPermissionId = () => {
+  var _a;
+  if ((_a = globalThis.crypto) == null ? void 0 : _a.randomUUID) {
+    return globalThis.crypto.randomUUID();
+  }
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+};
+var getDappInvoker = (options) => {
+  const { name, nativeScheme, url: dappUrl } = options.dapp;
+  const fallbackInvoker = nativeScheme != null ? nativeScheme : name;
+  if (!dappUrl) {
+    return fallbackInvoker;
+  }
+  try {
+    const { origin } = new URL(dappUrl);
+    return origin === "null" ? fallbackInvoker : origin;
+  } catch (e) {
+    return fallbackInvoker;
+  }
+};
+var getRequestedPermissions = ({
+  accounts,
+  chainIds,
+  invoker
+}) => {
+  const id = createPermissionId();
+  const date = Date.now();
+  return [
+    {
+      id,
+      parentCapability: "eth_accounts",
+      invoker,
+      caveats: [
+        {
+          type: "restrictReturnedAccounts",
+          value: accounts
+        }
+      ],
+      date
+    },
+    {
+      id,
+      parentCapability: "endowment:permitted-chains",
+      invoker,
+      caveats: [
+        {
+          type: "restrictNetworkSwitching",
+          value: chainIds
+        }
+      ],
+      date
+    }
+  ];
+};
+var _core2, _provider2, _eip6963Announcer, _sessionScopes, _eventHandlers, _sessionChangedHandler, _displayUriHandler, _removeNotificationHandler, _status, _pendingPreferredChainId, _MetamaskConnectEVM_instances, getCoreOptions_fn, createInvokeOptions_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, getSelectedChainId_fn, requestInterceptor_fn, clearConnectionState_fn, addEthereumChain_fn, request_fn, cacheChainId_fn, onSessionChanged_fn, onChainChanged_fn, onAccountsChanged_fn, onConnect_fn, onDisconnect_fn, onDisplayUri_fn;
 var _MetamaskConnectEVM = class _MetamaskConnectEVM {
   /**
    * Creates a new MetamaskConnectEVM instance.
@@ -412,7 +688,9 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
     /** The core instance of the Multichain SDK */
     __privateAdd(this, _core2);
     /** An instance of the EIP-1193 provider interface */
-    __privateAdd(this, _provider);
+    __privateAdd(this, _provider2);
+    /** Handles EIP-6963 discovery announcements for the provider */
+    __privateAdd(this, _eip6963Announcer);
     /** The session scopes currently permitted */
     __privateAdd(this, _sessionScopes, {});
     /** Optional event handlers for the EIP-1193 provider events. */
@@ -433,10 +711,11 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
      */
     __privateAdd(this, _pendingPreferredChainId);
     __privateSet(this, _core2, core);
-    __privateSet(this, _provider, new EIP1193Provider(
+    __privateSet(this, _provider2, new EIP1193Provider(
       core,
       __privateMethod(this, _MetamaskConnectEVM_instances, requestInterceptor_fn).bind(this)
     ));
+    __privateSet(this, _eip6963Announcer, new EIP6963ProviderAnnouncer(__privateGet(this, _provider2)));
     __privateSet(this, _eventHandlers, eventHandlers);
     __privateSet(this, _sessionChangedHandler, __privateMethod(this, _MetamaskConnectEVM_instances, onSessionChanged_fn).bind(this));
     __privateGet(this, _core2).on("wallet_sessionChanged", __privateGet(this, _sessionChangedHandler));
@@ -498,7 +777,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
       try {
         const result = new Promise(
           (resolve) => {
-            __privateGet(this, _provider).once("connect", ({ chainId, accounts }) => {
+            __privateGet(this, _provider2).once("connect", ({ chainId, accounts }) => {
               logger("fulfilled-request: connect", {
                 chainId,
                 accounts
@@ -544,7 +823,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
       const { accounts, chainId } = yield this.connect({
         chainIds: chainIds != null ? chainIds : [DEFAULT_CHAIN_ID]
       });
-      const signature = yield __privateGet(this, _provider).request({
+      const signature = yield __privateGet(this, _provider2).request({
         method: "personal_sign",
         params: [accounts[0], message]
       });
@@ -583,7 +862,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
         forceRequest
       });
       const resolvedParams = typeof params === "function" ? params(connectedAccounts[0]) : params;
-      const result = yield __privateGet(this, _provider).request({
+      const result = yield __privateGet(this, _provider2).request({
         method,
         params: resolvedParams
       });
@@ -645,15 +924,12 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
       yield __privateMethod(this, _MetamaskConnectEVM_instances, trackWalletActionRequested_fn).call(this, method, scope, params);
       try {
         const result = yield __privateMethod(this, _MetamaskConnectEVM_instances, request_fn).call(this, {
+          scope,
           method: "wallet_switchEthereumChain",
           params
         });
-        const resultWithError = result;
-        if (resultWithError == null ? void 0 : resultWithError.error) {
-          throw new Error(resultWithError.error.message);
-        }
         yield __privateMethod(this, _MetamaskConnectEVM_instances, trackWalletActionSucceeded_fn).call(this, method, scope, params);
-        if (result.result === null) {
+        if (result === null) {
           yield __privateMethod(this, _MetamaskConnectEVM_instances, cacheChainId_fn).call(this, chainId);
           __privateMethod(this, _MetamaskConnectEVM_instances, onChainChanged_fn).call(this, chainId);
         }
@@ -676,7 +952,19 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
    * @returns The EIP-1193 provider instance
    */
   getProvider() {
-    return __privateGet(this, _provider);
+    return __privateGet(this, _provider2);
+  }
+  /**
+   * Announces the EIP-1193 provider through EIP-6963 wallet discovery.
+   *
+   * This is a no-op when a native MetaMask EIP-6963 provider has already
+   * announced, or when running outside a browser environment. The first call
+   * may take up to 300 ms while native providers are requested.
+   */
+  announceProvider() {
+    return __async(this, null, function* () {
+      yield __privateGet(this, _eip6963Announcer).announce();
+    });
   }
   /**
    * Gets the currently selected chain ID on the wallet
@@ -692,7 +980,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
    * @returns The currently selected account or undefined if no account is selected
    */
   getAccount() {
-    return __privateGet(this, _provider).selectedAccount;
+    return __privateGet(this, _provider2).selectedAccount;
   }
   // Convenience getters for the EIP-1193 provider
   /**
@@ -701,7 +989,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
    * @returns The currently permitted accounts
    */
   get accounts() {
-    return __privateGet(this, _provider).accounts;
+    return __privateGet(this, _provider2).accounts;
   }
   /**
    * Gets the currently selected account on the wallet
@@ -709,7 +997,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
    * @returns The currently selected account or undefined if no account is selected
    */
   get selectedAccount() {
-    return __privateGet(this, _provider).selectedAccount;
+    return __privateGet(this, _provider2).selectedAccount;
   }
   /**
    * Gets the currently selected chain ID on the wallet
@@ -717,7 +1005,7 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
    * @returns The currently selected chain ID or undefined if no chain is selected
    */
   get selectedChainId() {
-    return __privateGet(this, _provider).selectedChainId;
+    return __privateGet(this, _provider2).selectedChainId;
   }
   /**
    * Gets the current connection status
@@ -729,7 +1017,8 @@ var _MetamaskConnectEVM = class _MetamaskConnectEVM {
   }
 };
 _core2 = new WeakMap();
-_provider = new WeakMap();
+_provider2 = new WeakMap();
+_eip6963Announcer = new WeakMap();
 _sessionScopes = new WeakMap();
 _eventHandlers = new WeakMap();
 _sessionChangedHandler = new WeakMap();
@@ -865,7 +1154,7 @@ requestInterceptor_fn = function(request) {
       if (permitted.length === 0) {
         permitted.push(DEFAULT_CHAIN_ID);
       }
-      const selected = __privateGet(this, _provider).selectedChainId;
+      const selected = __privateGet(this, _provider2).selectedChainId;
       const preferred = selected && permitted.includes(selected) ? selected : permitted[0];
       const chainIds = [
         preferred,
@@ -882,6 +1171,13 @@ requestInterceptor_fn = function(request) {
         if (request.method === "eth_requestAccounts") {
           return result.accounts;
         }
+        if (request.method === "wallet_requestPermissions") {
+          return getRequestedPermissions({
+            accounts: result.accounts,
+            chainIds: getPermittedEthChainIds(__privateGet(this, _sessionScopes)),
+            invoker: getDappInvoker(__privateMethod(this, _MetamaskConnectEVM_instances, getCoreOptions_fn).call(this))
+          });
+        }
         return result;
       } catch (error) {
         yield __privateMethod(this, _MetamaskConnectEVM_instances, trackWalletActionFailed_fn).call(this, method, scope, params, error);
@@ -889,21 +1185,23 @@ requestInterceptor_fn = function(request) {
       }
     }
     if (isSwitchChainRequest(request)) {
-      return this.switchChain({
+      yield this.switchChain({
         chainId: request.params[0].chainId
       });
+      return null;
     }
     if (isAddChainRequest(request)) {
-      return __privateMethod(this, _MetamaskConnectEVM_instances, addEthereumChain_fn).call(this, request.params[0]);
+      yield __privateMethod(this, _MetamaskConnectEVM_instances, addEthereumChain_fn).call(this, request.params[0]);
+      return null;
     }
     if (isAccountsRequest(request)) {
       if (request.method === "eth_coinbase") {
-        return (_a = __privateGet(this, _provider).selectedAccount) != null ? _a : null;
+        return (_a = __privateGet(this, _provider2).selectedAccount) != null ? _a : null;
       }
-      return __privateGet(this, _provider).accounts;
+      return __privateGet(this, _provider2).accounts;
     }
     if (isChainIdRequest(request)) {
-      return __privateGet(this, _provider).selectedChainId;
+      return __privateGet(this, _provider2).selectedChainId;
     }
     logger("Request not intercepted, forwarding to default handler", request);
     return Promise.resolve();
@@ -913,8 +1211,8 @@ requestInterceptor_fn = function(request) {
  * Clears the internal connection state: accounts and chainId
  */
 clearConnectionState_fn = function() {
-  __privateGet(this, _provider).accounts = [];
-  __privateGet(this, _provider).selectedChainId = void 0;
+  __privateGet(this, _provider2).accounts = [];
+  __privateGet(this, _provider2).selectedChainId = void 0;
 };
 addEthereumChain_fn = function(chainConfiguration) {
   return __async(this, null, function* () {
@@ -923,17 +1221,18 @@ addEthereumChain_fn = function(chainConfiguration) {
     if (!chainConfiguration) {
       throw new Error("No chain configuration found.");
     }
-    const chainId = chainConfiguration.chainId || __privateGet(this, _provider).selectedChainId || "0x1";
+    const chainId = chainConfiguration.chainId || __privateGet(this, _provider2).selectedChainId || "0x1";
     const decimalChainId = hexToNumber3(chainId);
     const scope = `eip155:${decimalChainId}`;
     const params = [chainConfiguration];
     yield __privateMethod(this, _MetamaskConnectEVM_instances, trackWalletActionRequested_fn).call(this, method, scope, params);
     try {
       const result = yield __privateMethod(this, _MetamaskConnectEVM_instances, request_fn).call(this, {
+        scope,
         method: "wallet_addEthereumChain",
         params
       });
-      if (result.result === null) {
+      if (result === null) {
         yield __privateMethod(this, _MetamaskConnectEVM_instances, cacheChainId_fn).call(this, chainId);
         __privateMethod(this, _MetamaskConnectEVM_instances, onChainChanged_fn).call(this, chainId);
       }
@@ -947,7 +1246,10 @@ addEthereumChain_fn = function(chainConfiguration) {
 request_fn = function(request) {
   return __async(this, null, function* () {
     logger("direct request to metamask-provider called", request);
-    const result = __privateGet(this, _core2).transport.sendEip1193Message(request);
+    const result = __privateGet(this, _core2).invokeMethod({
+      scope: request.scope,
+      request: { method: request.method, params: request.params }
+    });
     if (request.method === "wallet_addEthereumChain" || request.method === "wallet_switchEthereumChain") {
       __privateGet(this, _core2).openSimpleDeeplinkIfNeeded();
     }
@@ -977,11 +1279,10 @@ onSessionChanged_fn = function(session) {
     } else {
       let initialAccounts = [];
       if (__privateGet(this, _core2).status === "connected") {
-        const ethAccountsResponse = yield __privateGet(this, _core2).transport.sendEip1193Message({
-          method: "eth_accounts",
-          params: []
+        initialAccounts = yield __privateGet(this, _core2).invokeMethod({
+          scope: `eip155:${hexToNumber3(hexPermittedChainIds[0])}`,
+          request: { method: "eth_accounts", params: [] }
         });
-        initialAccounts = ethAccountsResponse.result;
       } else {
         initialAccounts = getEthAccounts(__privateGet(this, _sessionScopes));
       }
@@ -1000,12 +1301,12 @@ onSessionChanged_fn = function(session) {
  */
 onChainChanged_fn = function(chainId) {
   var _a, _b;
-  if (chainId === __privateGet(this, _provider).selectedChainId) {
+  if (chainId === __privateGet(this, _provider2).selectedChainId) {
     return;
   }
   logger("handler: chainChanged", { chainId });
-  __privateGet(this, _provider).selectedChainId = chainId;
-  __privateGet(this, _provider).emit("chainChanged", chainId);
+  __privateGet(this, _provider2).selectedChainId = chainId;
+  __privateGet(this, _provider2).emit("chainChanged", chainId);
   (_b = (_a = __privateGet(this, _eventHandlers)) == null ? void 0 : _a.chainChanged) == null ? void 0 : _b.call(_a, chainId);
 };
 /**
@@ -1015,13 +1316,13 @@ onChainChanged_fn = function(chainId) {
  */
 onAccountsChanged_fn = function(accounts) {
   var _a, _b;
-  const accountsUnchanged = accounts.length === __privateGet(this, _provider).accounts.length && accounts.every((acct, idx) => acct === __privateGet(this, _provider).accounts[idx]);
+  const accountsUnchanged = accounts.length === __privateGet(this, _provider2).accounts.length && accounts.every((acct, idx) => acct === __privateGet(this, _provider2).accounts[idx]);
   if (accountsUnchanged) {
     return;
   }
   logger("handler: accountsChanged", accounts);
-  __privateGet(this, _provider).accounts = accounts;
-  __privateGet(this, _provider).emit("accountsChanged", accounts);
+  __privateGet(this, _provider2).accounts = accounts;
+  __privateGet(this, _provider2).emit("accountsChanged", accounts);
   (_b = (_a = __privateGet(this, _eventHandlers)) == null ? void 0 : _a.accountsChanged) == null ? void 0 : _b.call(_a, accounts);
 };
 /**
@@ -1046,14 +1347,14 @@ onConnect_fn = function({
     __privateMethod(this, _MetamaskConnectEVM_instances, onAccountsChanged_fn).call(this, accounts);
     return;
   }
-  __privateGet(this, _provider).selectedChainId = chainId;
-  __privateGet(this, _provider).accounts = accounts;
+  __privateGet(this, _provider2).selectedChainId = chainId;
+  __privateGet(this, _provider2).accounts = accounts;
   __privateSet(this, _status, "connected");
-  __privateGet(this, _provider).emit("connect", data);
+  __privateGet(this, _provider2).emit("connect", data);
   (_b = (_a = __privateGet(this, _eventHandlers)) == null ? void 0 : _a.connect) == null ? void 0 : _b.call(_a, data);
-  __privateGet(this, _provider).emit("chainChanged", chainId);
+  __privateGet(this, _provider2).emit("chainChanged", chainId);
   (_d = (_c = __privateGet(this, _eventHandlers)) == null ? void 0 : _c.chainChanged) == null ? void 0 : _d.call(_c, chainId);
-  __privateGet(this, _provider).emit("accountsChanged", accounts);
+  __privateGet(this, _provider2).emit("accountsChanged", accounts);
   (_f = (_e = __privateGet(this, _eventHandlers)) == null ? void 0 : _e.accountsChanged) == null ? void 0 : _f.call(_e, accounts);
   (_g = __privateGet(this, _removeNotificationHandler)) == null ? void 0 : _g.call(this);
   const onAccountsChanged = (accs) => {
@@ -1085,7 +1386,7 @@ onDisconnect_fn = function() {
   }
   __privateSet(this, _status, "disconnected");
   logger("handler: disconnect");
-  __privateGet(this, _provider).emit("disconnect");
+  __privateGet(this, _provider2).emit("disconnect");
   (_b = (_a = __privateGet(this, _eventHandlers)) == null ? void 0 : _a.disconnect) == null ? void 0 : _b.call(_a);
   __privateMethod(this, _MetamaskConnectEVM_instances, onAccountsChanged_fn).call(this, []);
 };
@@ -1101,7 +1402,7 @@ onDisplayUri_fn = function(uri) {
     return;
   }
   logger("handler: display_uri", uri);
-  __privateGet(this, _provider).emit("display_uri", uri);
+  __privateGet(this, _provider2).emit("display_uri", uri);
   (_b = (_a = __privateGet(this, _eventHandlers)) == null ? void 0 : _a.displayUri) == null ? void 0 : _b.call(_a, uri);
 };
 var MetamaskConnectEVM = _MetamaskConnectEVM;
@@ -1138,14 +1439,26 @@ function createEVMClient(options) {
         versions: {
           // typeof guard needed: Metro (React Native) bundles TS source directly,
           // bypassing the tsup build that substitutes __PACKAGE_VERSION__.
-          "connect-evm": false ? "unknown" : "1.4.0"
+          "connect-evm": false ? "unknown" : "2.1.0"
         }
       }));
-      return MetamaskConnectEVM.create({
+      const multichainClientPeerRange = false ? "unknown" : "^1.1.0";
+      if (multichainClientPeerRange !== "unknown" && multichainClientPeerRange !== "" && !satisfies(core.version, multichainClientPeerRange)) {
+        console.warn(
+          `@metamask/connect-evm expected @metamask/connect-multichain version ${multichainClientPeerRange}, but got ${core.version}. This may lead to unexpected behavior.`
+        );
+      }
+      const client = yield MetamaskConnectEVM.create({
         core,
         eventHandlers: options.eventHandlers,
         supportedNetworks: options.api.supportedNetworks
       });
+      if (!options.skipAutoAnnounce) {
+        client.announceProvider().catch((error) => {
+          logger("EIP-6963 provider announcement failed", error);
+        });
+      }
+      return client;
     } catch (error) {
       console.error("Error creating Metamask Connect/EVM", error);
       throw error;
@@ -1153,6 +1466,8 @@ function createEVMClient(options) {
   });
 }
 export {
+  EIP6963_ANNOUNCE_PROVIDER_EVENT,
+  EIP6963_REQUEST_PROVIDER_EVENT,
   createEVMClient,
   getInfuraRpcUrls
 };