@wagmi/connectors 2.3.0-cjs → 2.4.0

package/dist/ledger.js

@@ -1,103 +1,120 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-
-var _chunkOQILYQDOjs = require('./chunk-OQILYQDO.js');
-
-
-
-
-
-
-
-var _chunkQYMCVNHTjs = require('./chunk-QYMCVNHT.js');
+import {
+  normalizeChainId
+} from "./chunk-OQILYQDO.js";
+import {
+  Connector,
+  __privateAdd,
+  __privateGet,
+  __privateMethod,
+  __privateSet,
+  __publicField
+} from "./chunk-QYMCVNHT.js";
 
 // src/ledger.ts
-
-
-
-var _connectkitloader = require('@ledgerhq/connect-kit-loader');
-
-
-
-
-
-
-
-var _viem = require('viem');
-var _provider, _switchChain, switchChain_fn;
-var LedgerConnector = class extends _chunkQYMCVNHTjs.Connector {
-  constructor({
-    chains,
-    options = { enableDebugLogs: false }
-  } = {}) {
-    super({ chains, options });
-    _chunkQYMCVNHTjs.__privateAdd.call(void 0, this, _switchChain);
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "id", "ledger");
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "name", "Ledger");
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "ready", true);
-    _chunkQYMCVNHTjs.__privateAdd.call(void 0, this, _provider, void 0);
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "onAccountsChanged", (accounts) => {
+import {
+  SupportedProviders,
+  loadConnectKit
+} from "@ledgerhq/connect-kit-loader";
+import {
+  SwitchChainError,
+  UserRejectedRequestError,
+  createWalletClient,
+  custom,
+  getAddress,
+  numberToHex
+} from "viem";
+var _provider, _initProviderPromise, _isV1, _createProvider, createProvider_fn, _initProvider, initProvider_fn, _setupListeners, setupListeners_fn, _removeListeners, removeListeners_fn;
+var LedgerConnector = class extends Connector {
+  constructor(config) {
+    super({
+      ...config,
+      options: { ...config.options }
+    });
+    __privateAdd(this, _createProvider);
+    __privateAdd(this, _initProvider);
+    __privateAdd(this, _setupListeners);
+    __privateAdd(this, _removeListeners);
+    __publicField(this, "id", "ledger");
+    __publicField(this, "name", "Ledger");
+    __publicField(this, "ready", true);
+    __privateAdd(this, _provider, void 0);
+    __privateAdd(this, _initProviderPromise, void 0);
+    __privateAdd(this, _isV1, void 0);
+    __publicField(this, "onAccountsChanged", (accounts) => {
       if (accounts.length === 0)
         this.emit("disconnect");
       else
-        this.emit("change", { account: _viem.getAddress.call(void 0, accounts[0]) });
+        this.emit("change", { account: getAddress(accounts[0]) });
     });
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "onChainChanged", (chainId) => {
-      const id = _chunkOQILYQDOjs.normalizeChainId.call(void 0, chainId);
+    __publicField(this, "onChainChanged", (chainId) => {
+      const id = normalizeChainId(chainId);
       const unsupported = this.isChainUnsupported(id);
       this.emit("change", { chain: { id, unsupported } });
     });
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "onDisconnect", () => {
+    __publicField(this, "onDisconnect", () => {
       this.emit("disconnect");
     });
+    __publicField(this, "onConnect", () => {
+      this.emit("connect", {});
+    });
+    __privateSet(this, _isV1, this.walletConnectVersion === 1);
+  }
+  get walletConnectVersion() {
+    if (this.options.walletConnectVersion)
+      return this.options.walletConnectVersion;
+    else if (this.options.projectId)
+      return 2;
+    return 1;
   }
-  async connect() {
+  async connect({ chainId } = {}) {
     try {
       const provider = await this.getProvider({ create: true });
-      if (provider.on) {
-        provider.on("accountsChanged", this.onAccountsChanged);
-        provider.on("chainChanged", this.onChainChanged);
-        provider.on("disconnect", this.onDisconnect);
+      __privateMethod(this, _setupListeners, setupListeners_fn).call(this);
+      if (!provider.session) {
+        this.emit("message", { type: "connecting" });
+        await provider.request({
+          method: "eth_requestAccounts"
+        });
+      }
+      const account = await this.getAccount();
+      let id = await this.getChainId();
+      let unsupported = this.isChainUnsupported(id);
+      if (chainId && id !== chainId) {
+        const chain = await this.switchChain(chainId);
+        id = chain.id;
+        unsupported = this.isChainUnsupported(id);
       }
-      this.emit("message", { type: "connecting" });
-      const accounts = await provider.request({
-        method: "eth_requestAccounts"
-      });
-      const account = _viem.getAddress.call(void 0, accounts[0]);
-      const id = await this.getChainId();
-      const unsupported = this.isChainUnsupported(id);
-      this.switchChain = _chunkQYMCVNHTjs.__privateMethod.call(void 0, this, _switchChain, switchChain_fn);
       return {
         account,
-        chain: { id, unsupported }
+        chain: { id, unsupported },
+        provider
       };
     } catch (error) {
-      if (error.code === 4001) {
-        throw new (0, _viem.UserRejectedRequestError)(error);
-      }
-      if (error.code === -32002) {
-        throw error instanceof Error ? error : new Error(String(error));
+      if (/user rejected/i.test(error?.message)) {
+        throw new UserRejectedRequestError(error);
       }
       throw error;
     }
   }
   async disconnect() {
     const provider = await this.getProvider();
-    if (_optionalChain([provider, 'optionalAccess', _ => _.disconnect])) {
-      await provider.disconnect();
-    }
-    if (_optionalChain([provider, 'optionalAccess', _2 => _2.removeListener])) {
-      provider.removeListener("accountsChanged", this.onAccountsChanged);
-      provider.removeListener("chainChanged", this.onChainChanged);
-      provider.removeListener("disconnect", this.onDisconnect);
+    try {
+      if (provider?.disconnect)
+        await provider.disconnect();
+    } catch (error) {
+      if (!/No matching key/i.test(error.message))
+        throw error;
+    } finally {
+      __privateMethod(this, _removeListeners, removeListeners_fn).call(this);
+      __privateGet(this, _isV1) && typeof localStorage !== "undefined" && localStorage.removeItem("walletconnect");
     }
-    typeof localStorage !== "undefined" && localStorage.removeItem("walletconnect");
   }
   async getAccount() {
     const provider = await this.getProvider();
     const accounts = await provider.request({
       method: "eth_accounts"
     });
-    const account = _viem.getAddress.call(void 0, accounts[0]);
+    const account = getAddress(accounts[0]);
     return account;
   }
   async getChainId() {
@@ -105,32 +122,17 @@ var LedgerConnector = class extends _chunkQYMCVNHTjs.Connector {
     const chainId = await provider.request({
       method: "eth_chainId"
     });
-    return _chunkOQILYQDOjs.normalizeChainId.call(void 0, chainId);
+    return normalizeChainId(chainId);
   }
   async getProvider({ chainId, create } = {
     create: false
   }) {
-    if (!_chunkQYMCVNHTjs.__privateGet.call(void 0, this, _provider) || chainId || create) {
-      const connectKit = await _connectkitloader.loadConnectKit.call(void 0, );
-      if (this.options.enableDebugLogs) {
-        connectKit.enableDebugLogs();
-      }
-      const rpc = this.chains.reduce(
-        (rpc2, chain) => ({
-          ...rpc2,
-          [chain.id]: chain.rpcUrls.default.http[0]
-        }),
-        {}
-      );
-      connectKit.checkSupport({
-        bridge: this.options.bridge,
-        providerType: _connectkitloader.SupportedProviders.Ethereum,
-        chainId: chainId || this.options.chainId,
-        rpc: { ...rpc, ..._optionalChain([this, 'access', _3 => _3.options, 'optionalAccess', _4 => _4.rpc]) }
-      });
-      _chunkQYMCVNHTjs.__privateSet.call(void 0, this, _provider, await connectKit.getProvider());
+    if (!__privateGet(this, _provider) || __privateGet(this, _isV1) && create) {
+      await __privateMethod(this, _createProvider, createProvider_fn).call(this);
     }
-    return _chunkQYMCVNHTjs.__privateGet.call(void 0, this, _provider);
+    if (chainId)
+      await this.switchChain(chainId);
+    return __privateGet(this, _provider);
   }
   async getWalletClient({ chainId } = {}) {
     const [provider, account] = await Promise.all([
@@ -140,53 +142,119 @@ var LedgerConnector = class extends _chunkQYMCVNHTjs.Connector {
     const chain = this.chains.find((x) => x.id === chainId);
     if (!provider)
       throw new Error("provider is required.");
-    return _viem.createWalletClient.call(void 0, {
-      account,
-      chain,
-      transport: _viem.custom.call(void 0, provider)
-    });
+    return createWalletClient({ account, chain, transport: custom(provider) });
   }
   async isAuthorized() {
     try {
       const account = await this.getAccount();
       return !!account;
-    } catch (e) {
+    } catch {
       return false;
     }
   }
+  async switchChain(chainId) {
+    const chain = this.chains.find((chain2) => chain2.id === chainId);
+    if (!chain)
+      throw new SwitchChainError(new Error("chain not found on connector."));
+    try {
+      const provider = await this.getProvider();
+      await provider.request({
+        method: "wallet_switchEthereumChain",
+        params: [{ chainId: numberToHex(chainId) }]
+      });
+      return chain;
+    } catch (error) {
+      const message = typeof error === "string" ? error : error?.message;
+      if (/user rejected request/i.test(message)) {
+        throw new UserRejectedRequestError(error);
+      }
+      throw new SwitchChainError(error);
+    }
+  }
 };
 _provider = new WeakMap();
-_switchChain = new WeakSet();
-switchChain_fn = async function(chainId) {
-  const provider = await this.getProvider();
-  const id = _viem.numberToHex.call(void 0, chainId);
-  try {
-    await Promise.race([
-      provider.request({
-        method: "wallet_switchEthereumChain",
-        params: [{ chainId: id }]
-      }),
-      new Promise(
-        (res) => this.on("change", ({ chain }) => {
-          if (_optionalChain([chain, 'optionalAccess', _5 => _5.id]) === chainId)
-            res(chainId);
-        })
+_initProviderPromise = new WeakMap();
+_isV1 = new WeakMap();
+_createProvider = new WeakSet();
+createProvider_fn = async function() {
+  if (!__privateGet(this, _initProviderPromise) && typeof window !== "undefined") {
+    __privateSet(this, _initProviderPromise, __privateMethod(this, _initProvider, initProvider_fn).call(this));
+  }
+  return __privateGet(this, _initProviderPromise);
+};
+_initProvider = new WeakSet();
+initProvider_fn = async function() {
+  const connectKit = await loadConnectKit();
+  if (this.options.enableDebugLogs) {
+    connectKit.enableDebugLogs();
+  }
+  let checkSupportOptions;
+  if (__privateGet(this, _isV1)) {
+    const { chainId, bridge } = this.options;
+    checkSupportOptions = {
+      providerType: SupportedProviders.Ethereum,
+      walletConnectVersion: 1,
+      chainId,
+      bridge,
+      rpc: Object.fromEntries(
+        this.chains.map((chain) => [
+          chain.id,
+          chain.rpcUrls.default.http[0]
+        ])
       )
-    ]);
-    return _nullishCoalesce(this.chains.find((x) => x.id === chainId), () => ( {
-      id: chainId,
-      name: `Chain ${id}`,
-      network: `${id}`,
-      nativeCurrency: { name: "Ether", decimals: 18, symbol: "ETH" },
-      rpcUrls: { default: { http: [""] }, public: { http: [""] } }
-    }));
-  } catch (error) {
-    const message = typeof error === "string" ? error : _optionalChain([error, 'optionalAccess', _6 => _6.message]);
-    if (/user rejected request/i.test(message))
-      throw new (0, _viem.UserRejectedRequestError)(error);
-    throw new (0, _viem.SwitchChainError)(error);
+    };
+  } else {
+    const {
+      projectId,
+      requiredChains,
+      requiredMethods,
+      optionalMethods,
+      requiredEvents,
+      optionalEvents
+    } = this.options;
+    const optionalChains = this.chains.map(({ id }) => id);
+    checkSupportOptions = {
+      providerType: SupportedProviders.Ethereum,
+      walletConnectVersion: 2,
+      projectId,
+      chains: requiredChains,
+      optionalChains,
+      methods: requiredMethods,
+      optionalMethods,
+      events: requiredEvents,
+      optionalEvents,
+      rpcMap: Object.fromEntries(
+        this.chains.map((chain) => [
+          chain.id,
+          chain.rpcUrls.default.http[0]
+        ])
+      )
+    };
   }
+  connectKit.checkSupport(checkSupportOptions);
+  __privateSet(this, _provider, await connectKit.getProvider());
+};
+_setupListeners = new WeakSet();
+setupListeners_fn = function() {
+  if (!__privateGet(this, _provider))
+    return;
+  __privateMethod(this, _removeListeners, removeListeners_fn).call(this);
+  __privateGet(this, _provider).on("accountsChanged", this.onAccountsChanged);
+  __privateGet(this, _provider).on("chainChanged", this.onChainChanged);
+  __privateGet(this, _provider).on("disconnect", this.onDisconnect);
+  __privateGet(this, _provider).on("session_delete", this.onDisconnect);
+  __privateGet(this, _provider).on("connect", this.onConnect);
+};
+_removeListeners = new WeakSet();
+removeListeners_fn = function() {
+  if (!__privateGet(this, _provider))
+    return;
+  __privateGet(this, _provider).removeListener("accountsChanged", this.onAccountsChanged);
+  __privateGet(this, _provider).removeListener("chainChanged", this.onChainChanged);
+  __privateGet(this, _provider).removeListener("disconnect", this.onDisconnect);
+  __privateGet(this, _provider).removeListener("session_delete", this.onDisconnect);
+  __privateGet(this, _provider).removeListener("connect", this.onConnect);
+};
+export {
+  LedgerConnector
 };
-
-
-exports.LedgerConnector = LedgerConnector;

package/dist/metaMask.d.ts

@@ -1,6 +1,6 @@
 import { Chain } from '@wagmi/chains';
 import { InjectedConnectorOptions, InjectedConnector } from './injected.js';
-import { W as WindowProvider } from './base-0473abd3.js';
+import { W as WindowProvider } from './base-2dd7facf.js';
 import 'viem';
 import 'eventemitter3';
 

package/dist/metaMask.js

@@ -1,25 +1,25 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-
-var _chunk4BSCIAHYjs = require('./chunk-4BSCIAHY.js');
-
-
-var _chunkZCAPXGBXjs = require('./chunk-ZCAPXGBX.js');
-require('./chunk-OQILYQDO.js');
-
-
-
-
-
-var _chunkQYMCVNHTjs = require('./chunk-QYMCVNHT.js');
+import {
+  InjectedConnector
+} from "./chunk-Z2P63ELM.js";
+import {
+  ConnectorNotFoundError
+} from "./chunk-ZCAPXGBX.js";
+import "./chunk-OQILYQDO.js";
+import {
+  __privateAdd,
+  __privateGet,
+  __privateSet,
+  __publicField
+} from "./chunk-QYMCVNHT.js";
 
 // src/metaMask.ts
-
-
-
-
-var _viem = require('viem');
+import {
+  ResourceUnavailableRpcError,
+  UserRejectedRequestError,
+  getAddress
+} from "viem";
 var _UNSTABLE_shimOnConnectSelectAccount;
-var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
+var MetaMaskConnector = class extends InjectedConnector {
   constructor({
     chains,
     options: options_
@@ -29,7 +29,7 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
       shimDisconnect: true,
       getProvider() {
         function getReady(ethereum2) {
-          const isMetaMask = !!_optionalChain([ethereum2, 'optionalAccess', _ => _.isMetaMask]);
+          const isMetaMask = !!ethereum2?.isMetaMask;
           if (!isMetaMask)
             return;
           if (ethereum2.isBraveWallet && !ethereum2._events && !ethereum2._state)
@@ -67,23 +67,23 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
         if (typeof window === "undefined")
           return;
         const ethereum = window.ethereum;
-        if (_optionalChain([ethereum, 'optionalAccess', _2 => _2.providers]))
+        if (ethereum?.providers)
           return ethereum.providers.find(getReady);
         return getReady(ethereum);
       },
       ...options_
     };
     super({ chains, options });
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "id", "metaMask");
-    _chunkQYMCVNHTjs.__publicField.call(void 0, this, "shimDisconnectKey", `${this.id}.shimDisconnect`);
-    _chunkQYMCVNHTjs.__privateAdd.call(void 0, this, _UNSTABLE_shimOnConnectSelectAccount, void 0);
-    _chunkQYMCVNHTjs.__privateSet.call(void 0, this, _UNSTABLE_shimOnConnectSelectAccount, options.UNSTABLE_shimOnConnectSelectAccount);
+    __publicField(this, "id", "metaMask");
+    __publicField(this, "shimDisconnectKey", `${this.id}.shimDisconnect`);
+    __privateAdd(this, _UNSTABLE_shimOnConnectSelectAccount, void 0);
+    __privateSet(this, _UNSTABLE_shimOnConnectSelectAccount, options.UNSTABLE_shimOnConnectSelectAccount);
   }
   async connect({ chainId } = {}) {
     try {
       const provider = await this.getProvider();
       if (!provider)
-        throw new (0, _chunkZCAPXGBXjs.ConnectorNotFoundError)();
+        throw new ConnectorNotFoundError();
       if (provider.on) {
         provider.on("accountsChanged", this.onAccountsChanged);
         provider.on("chainChanged", this.onChainChanged);
@@ -91,7 +91,7 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
       }
       this.emit("message", { type: "connecting" });
       let account = null;
-      if (_chunkQYMCVNHTjs.__privateGet.call(void 0, this, _UNSTABLE_shimOnConnectSelectAccount) && _optionalChain([this, 'access', _3 => _3.options, 'optionalAccess', _4 => _4.shimDisconnect]) && !_optionalChain([this, 'access', _5 => _5.storage, 'optionalAccess', _6 => _6.getItem, 'call', _7 => _7(this.shimDisconnectKey)])) {
+      if (__privateGet(this, _UNSTABLE_shimOnConnectSelectAccount) && this.options?.shimDisconnect && !this.storage?.getItem(this.shimDisconnectKey)) {
         account = await this.getAccount().catch(() => null);
         const isConnected = !!account;
         if (isConnected)
@@ -103,8 +103,8 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
             account = await this.getAccount();
           } catch (error) {
             if (this.isUserRejectedRequestError(error))
-              throw new (0, _viem.UserRejectedRequestError)(error);
-            if (error.code === new (0, _viem.ResourceUnavailableRpcError)(error).code)
+              throw new UserRejectedRequestError(error);
+            if (error.code === new ResourceUnavailableRpcError(error).code)
               throw error;
           }
       }
@@ -112,7 +112,7 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
         const accounts = await provider.request({
           method: "eth_requestAccounts"
         });
-        account = _viem.getAddress.call(void 0, accounts[0]);
+        account = getAddress(accounts[0]);
       }
       let id = await this.getChainId();
       let unsupported = this.isChainUnsupported(id);
@@ -121,19 +121,19 @@ var MetaMaskConnector = class extends _chunk4BSCIAHYjs.InjectedConnector {
         id = chain.id;
         unsupported = this.isChainUnsupported(id);
       }
-      if (_optionalChain([this, 'access', _8 => _8.options, 'optionalAccess', _9 => _9.shimDisconnect]))
-        _optionalChain([this, 'access', _10 => _10.storage, 'optionalAccess', _11 => _11.setItem, 'call', _12 => _12(this.shimDisconnectKey, true)]);
+      if (this.options?.shimDisconnect)
+        this.storage?.setItem(this.shimDisconnectKey, true);
       return { account, chain: { id, unsupported }, provider };
     } catch (error) {
       if (this.isUserRejectedRequestError(error))
-        throw new (0, _viem.UserRejectedRequestError)(error);
+        throw new UserRejectedRequestError(error);
       if (error.code === -32002)
-        throw new (0, _viem.ResourceUnavailableRpcError)(error);
+        throw new ResourceUnavailableRpcError(error);
       throw error;
     }
   }
 };
 _UNSTABLE_shimOnConnectSelectAccount = new WeakMap();
-
-
-exports.MetaMaskConnector = MetaMaskConnector;
+export {
+  MetaMaskConnector
+};

package/dist/mock/index.d.ts

@@ -1,6 +1,6 @@
 import * as viem from 'viem';
 import { Chain } from '@wagmi/chains';
-import { c as WalletClient, C as Connector, a as ConnectorData } from '../base-0473abd3.js';
+import { c as WalletClient, C as Connector, a as ConnectorData } from '../base-2dd7facf.js';
 import EventEmitter from 'eventemitter3';
 
 type MockProviderOptions = {