@wagmi/connectors 0.2.2 → 0.2.3-cjs

package/dist/walletConnect.js

@@ -1,68 +1,73 @@
-import {
-  Connector,
-  __privateAdd,
-  __privateGet,
-  __privateMethod,
-  __privateSet,
-  __publicField
-} from "./chunk-5NCTPR6C.js";
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await 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; } async function _asyncOptionalChain(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 = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+
+
+
+
+
+var _chunk5NCTPR6Cjs = require('./chunk-5NCTPR6C.js');
 
 // src/walletConnect.ts
-import {
-  SwitchChainError,
-  UserRejectedRequestError,
-  getClient,
-  normalizeChainId
-} from "@wagmi/core";
-import { providers } from "ethers";
-import { getAddress, hexValue } from "ethers/lib/utils.js";
+
+
+
+
+
+var _core = require('@wagmi/core');
+var _ethers = require('ethers');
+var _utilsjs = require('ethers/lib/utils.js');
 var defaultV2Config = {
   namespace: "eip155",
   methods: [
     "eth_sendTransaction",
+    "eth_sendRawTransaction",
     "eth_sign",
     "eth_signTransaction",
     "eth_signTypedData",
-    "personal_sign"
+    "eth_signTypedData_v3",
+    "eth_signTypedData_v4",
+    "personal_sign",
+    "wallet_switchEthereumChain",
+    "wallet_addEthereumChain"
   ],
   events: ["accountsChanged", "chainChanged"]
 };
 var _provider, _initUniversalProviderPromise, _web3Modal, _createWeb3Modal, createWeb3Modal_fn, _initUniversalProvider, initUniversalProvider_fn, _createUniversalProvider, createUniversalProvider_fn, _isChainsAuthorized, isChainsAuthorized_fn, _switchChain, switchChain_fn;
-var WalletConnectConnector = class extends Connector {
+var WalletConnectConnector = class extends _chunk5NCTPR6Cjs.Connector {
   constructor(config) {
     super(config);
-    __privateAdd(this, _createWeb3Modal);
-    __privateAdd(this, _initUniversalProvider);
-    __privateAdd(this, _createUniversalProvider);
-    __privateAdd(this, _isChainsAuthorized);
-    __privateAdd(this, _switchChain);
-    __publicField(this, "id", "walletConnect");
-    __publicField(this, "name", "WalletConnect");
-    __publicField(this, "ready", true);
-    __privateAdd(this, _provider, void 0);
-    __privateAdd(this, _initUniversalProviderPromise, void 0);
-    __privateAdd(this, _web3Modal, void 0);
-    __publicField(this, "onAccountsChanged", (accounts) => {
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _createWeb3Modal);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _initUniversalProvider);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _createUniversalProvider);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _isChainsAuthorized);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _switchChain);
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "id", "walletConnect");
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "name", "WalletConnect");
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "ready", true);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _provider, void 0);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _initUniversalProviderPromise, void 0);
+    _chunk5NCTPR6Cjs.__privateAdd.call(void 0, this, _web3Modal, void 0);
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "onAccountsChanged", (accounts) => {
       if (accounts.length === 0)
         this.emit("disconnect");
       else
-        this.emit("change", { account: getAddress(accounts[0]) });
+        this.emit("change", { account: _utilsjs.getAddress.call(void 0, accounts[0]) });
     });
-    __publicField(this, "onChainChanged", (chainId) => {
-      const id = normalizeChainId(chainId);
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "onChainChanged", (chainId) => {
+      const id = _core.normalizeChainId.call(void 0, chainId);
       const unsupported = this.isChainUnsupported(id);
       this.emit("change", { chain: { id, unsupported } });
     });
-    __publicField(this, "onDisconnect", () => {
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "onDisconnect", () => {
       this.emit("disconnect");
     });
-    __publicField(this, "onDisplayUri", (uri) => {
+    _chunk5NCTPR6Cjs.__publicField.call(void 0, this, "onDisplayUri", (uri) => {
       this.emit("message", { type: "display_uri", data: uri });
     });
     if (this.version === "2") {
-      __privateMethod(this, _createUniversalProvider, createUniversalProvider_fn).call(this);
+      _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _createUniversalProvider, createUniversalProvider_fn).call(this);
       if (this.isQrCode)
-        __privateMethod(this, _createWeb3Modal, createWeb3Modal_fn).call(this);
+        _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _createWeb3Modal, createWeb3Modal_fn).call(this);
     }
   }
   get isQrCode() {
@@ -84,7 +89,7 @@ var WalletConnectConnector = class extends Connector {
     try {
       let targetChainId = chainId;
       if (!targetChainId) {
-        const lastUsedChainId = getClient().lastUsedChainId;
+        const lastUsedChainId = _core.getClient.call(void 0, ).lastUsedChainId;
         if (lastUsedChainId && !this.isChainUnsupported(lastUsedChainId))
           targetChainId = lastUsedChainId;
       }
@@ -98,7 +103,7 @@ var WalletConnectConnector = class extends Connector {
       if (isV2) {
         provider.on("session_delete", this.onDisconnect);
         provider.on("display_uri", this.onDisplayUri);
-        const isChainsAuthorized = await __privateMethod(this, _isChainsAuthorized, isChainsAuthorized_fn).call(this);
+        const isChainsAuthorized = await _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _isChainsAuthorized, isChainsAuthorized_fn).call(this);
         if (provider.session && !isChainsAuthorized)
           await provider.disconnect();
         if (!provider.session || provider.session && !isChainsAuthorized) {
@@ -122,17 +127,17 @@ var WalletConnectConnector = class extends Connector {
             ...this.isQrCode ? [
               new Promise(
                 (_resolve, reject) => provider.on("display_uri", async (uri) => {
-                  await __privateGet(this, _web3Modal)?.openModal({ uri });
-                  __privateGet(this, _web3Modal)?.subscribeModal(({ open }) => {
+                  await _optionalChain([_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _web3Modal), 'optionalAccess', _ => _.openModal, 'call', _2 => _2({ uri })]);
+                  _optionalChain([_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _web3Modal), 'optionalAccess', _3 => _3.subscribeModal, 'call', _4 => _4(({ open }) => {
                     if (!open)
                       reject(new Error("user rejected"));
-                  });
+                  })]);
                 })
               )
             ] : []
           ]);
           if (this.isQrCode)
-            __privateGet(this, _web3Modal)?.closeModal();
+            _optionalChain([_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _web3Modal), 'optionalAccess', _5 => _5.closeModal, 'call', _6 => _6()]);
         }
       }
       setTimeout(() => this.emit("message", { type: "connecting" }), 0);
@@ -147,30 +152,30 @@ var WalletConnectConnector = class extends Connector {
           )
         ] : []
       ]);
-      const account = getAddress(accounts[0]);
+      const account = _utilsjs.getAddress.call(void 0, accounts[0]);
       const id = await this.getChainId();
       const unsupported = this.isChainUnsupported(id);
       if (isV1) {
-        const walletName = provider.connector?.peerMeta?.name ?? "";
+        const walletName = _nullishCoalesce(_optionalChain([provider, 'access', _7 => _7.connector, 'optionalAccess', _8 => _8.peerMeta, 'optionalAccess', _9 => _9.name]), () => ( ""));
         const switchChainAllowedRegex = /(imtoken|metamask|omni|rainbow|trust wallet)/i;
         if (switchChainAllowedRegex.test(walletName))
-          this.switchChain = __privateMethod(this, _switchChain, switchChain_fn);
+          this.switchChain = _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _switchChain, switchChain_fn);
       } else
-        this.switchChain = __privateMethod(this, _switchChain, switchChain_fn);
+        this.switchChain = _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _switchChain, switchChain_fn);
       return {
         account,
         chain: { id, unsupported },
-        provider: new providers.Web3Provider(
+        provider: new _ethers.providers.Web3Provider(
           provider
         )
       };
     } catch (error) {
       if (isV2 && this.isQrCode)
-        __privateGet(this, _web3Modal)?.closeModal();
+        _optionalChain([_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _web3Modal), 'optionalAccess', _10 => _10.closeModal, 'call', _11 => _11()]);
       if (/user closed modal|user rejected/i.test(
-        error?.message
+        _optionalChain([error, 'optionalAccess', _12 => _12.message])
       )) {
-        throw new UserRejectedRequestError(error);
+        throw new (0, _core.UserRejectedRequestError)(error);
       }
       throw error;
     }
@@ -202,43 +207,43 @@ var WalletConnectConnector = class extends Connector {
       accounts = await provider.request({
         method: "eth_accounts"
       });
-    return getAddress(accounts[0]);
+    return _utilsjs.getAddress.call(void 0, accounts[0]);
   }
   async getChainId() {
     const provider = await this.getProvider();
     if (this.version === "1")
-      return normalizeChainId(provider.chainId);
-    return getClient().data?.chain?.id ?? normalizeChainId(await provider.request({ method: "eth_chainId" }));
+      return _core.normalizeChainId.call(void 0, provider.chainId);
+    return await _asyncNullishCoalesce(await _asyncOptionalChain([_core.getClient.call(void 0, ), 'access', async _13 => _13.data, 'optionalAccess', async _14 => _14.chain, 'optionalAccess', async _15 => _15.id]), async () => ( _core.normalizeChainId.call(void 0, await provider.request({ method: "eth_chainId" }))));
   }
   async getProvider({
     chainId,
     create
   } = {}) {
     if (this.options.version === "2") {
-      if (!__privateGet(this, _provider))
-        await __privateMethod(this, _createUniversalProvider, createUniversalProvider_fn).call(this);
+      if (!_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider))
+        await _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _createUniversalProvider, createUniversalProvider_fn).call(this);
       if (chainId)
-        __privateGet(this, _provider).setDefaultChain(
+        _chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider).setDefaultChain(
           `${defaultV2Config.namespace}:${chainId}`
         );
-      return __privateGet(this, _provider);
-    } else if (!__privateGet(this, _provider) || chainId || create) {
-      const rpc = !this.options?.infuraId ? this.chains.reduce(
+      return _chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider);
+    } else if (!_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider) || chainId || create) {
+      const rpc = !_optionalChain([this, 'access', _16 => _16.options, 'optionalAccess', _17 => _17.infuraId]) ? this.chains.reduce(
         (rpc2, chain) => ({
           ...rpc2,
           [chain.id]: chain.rpcUrls.default.http[0]
         }),
         {}
       ) : {};
-      const WalletConnectProvider = (await import("@walletconnect/ethereum-provider")).default;
-      __privateSet(this, _provider, new WalletConnectProvider({
+      const WalletConnectProvider = (await Promise.resolve().then(() => require("@walletconnect/ethereum-provider"))).default;
+      _chunk5NCTPR6Cjs.__privateSet.call(void 0, this, _provider, new WalletConnectProvider({
         ...this.options,
         chainId,
-        rpc: { ...rpc, ...this.options?.rpc }
+        rpc: { ...rpc, ..._optionalChain([this, 'access', _18 => _18.options, 'optionalAccess', _19 => _19.rpc]) }
       }));
-      return __privateGet(this, _provider);
+      return _chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider);
     }
-    return __privateGet(this, _provider);
+    return _chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _provider);
   }
   async getSigner({ chainId } = {}) {
     const [provider, account] = await Promise.all([
@@ -253,21 +258,21 @@ var WalletConnectConnector = class extends Connector {
         async request(args) {
           return await provider.request(
             args,
-            `${defaultV2Config.namespace}:${chainId ?? chainId_}`
+            `${defaultV2Config.namespace}:${_nullishCoalesce(chainId, () => ( chainId_))}`
           );
         }
       };
     }
-    return new providers.Web3Provider(provider_, chainId).getSigner(account);
+    return new _ethers.providers.Web3Provider(provider_, chainId).getSigner(account);
   }
   async isAuthorized() {
     try {
       const [account, isChainsAuthorized] = await Promise.all([
         this.getAccount(),
-        __privateMethod(this, _isChainsAuthorized, isChainsAuthorized_fn).call(this)
+        _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _isChainsAuthorized, isChainsAuthorized_fn).call(this)
       ]);
       return !!account && isChainsAuthorized;
-    } catch {
+    } catch (e) {
       return false;
     }
   }
@@ -277,35 +282,35 @@ _initUniversalProviderPromise = new WeakMap();
 _web3Modal = new WeakMap();
 _createWeb3Modal = new WeakSet();
 createWeb3Modal_fn = async function() {
-  const { Web3Modal } = await import("@web3modal/standalone");
+  const { Web3Modal } = await Promise.resolve().then(() => require("@web3modal/standalone"));
   const { version } = this.options;
-  __privateSet(this, _web3Modal, new Web3Modal({
+  _chunk5NCTPR6Cjs.__privateSet.call(void 0, this, _web3Modal, new Web3Modal({
     projectId: version === "2" ? this.options.projectId : void 0,
     standaloneChains: this.namespacedChains
   }));
 };
 _initUniversalProvider = new WeakSet();
 initUniversalProvider_fn = async function() {
-  const WalletConnectProvider = (await import("@walletconnect/universal-provider")).default;
-  if (WalletConnectProvider) {
-    __privateSet(this, _provider, await WalletConnectProvider.init(
+  const WalletConnectProvider = (await Promise.resolve().then(() => require("@walletconnect/universal-provider"))).default;
+  if (typeof _optionalChain([WalletConnectProvider, 'optionalAccess', _20 => _20.init]) === "function") {
+    _chunk5NCTPR6Cjs.__privateSet.call(void 0, this, _provider, await WalletConnectProvider.init(
       this.options
     ));
   }
 };
 _createUniversalProvider = new WeakSet();
 createUniversalProvider_fn = async function() {
-  if (!__privateGet(this, _initUniversalProviderPromise)) {
-    __privateSet(this, _initUniversalProviderPromise, __privateMethod(this, _initUniversalProvider, initUniversalProvider_fn).call(this));
+  if (!_chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _initUniversalProviderPromise)) {
+    _chunk5NCTPR6Cjs.__privateSet.call(void 0, this, _initUniversalProviderPromise, _chunk5NCTPR6Cjs.__privateMethod.call(void 0, this, _initUniversalProvider, initUniversalProvider_fn).call(this));
   }
-  return __privateGet(this, _initUniversalProviderPromise);
+  return _chunk5NCTPR6Cjs.__privateGet.call(void 0, this, _initUniversalProviderPromise);
 };
 _isChainsAuthorized = new WeakSet();
 isChainsAuthorized_fn = async function() {
   const provider = await this.getProvider();
   if (this.version === "1")
     return true;
-  const providerChains = provider.namespaces?.[defaultV2Config.namespace]?.chains || [];
+  const providerChains = _optionalChain([provider, 'access', _21 => _21.namespaces, 'optionalAccess', _22 => _22[defaultV2Config.namespace], 'optionalAccess', _23 => _23.chains]) || [];
   const authorizedChainIds = providerChains.map(
     (chain) => parseInt(chain.split(":")[1] || "")
   );
@@ -314,7 +319,7 @@ isChainsAuthorized_fn = async function() {
 _switchChain = new WeakSet();
 switchChain_fn = async function(chainId) {
   const provider = await this.getProvider();
-  const id = hexValue(chainId);
+  const id = _utilsjs.hexValue.call(void 0, chainId);
   try {
     await Promise.race([
       provider.request({
@@ -323,7 +328,7 @@ switchChain_fn = async function(chainId) {
       }),
       new Promise(
         (res) => this.on("change", ({ chain }) => {
-          if (chain?.id === chainId)
+          if (_optionalChain([chain, 'optionalAccess', _24 => _24.id]) === chainId)
             res(chainId);
         })
       )
@@ -335,20 +340,20 @@ switchChain_fn = async function(chainId) {
       );
       this.onChainChanged(chainId);
     }
-    return this.chains.find((x) => x.id === chainId) ?? {
+    return _nullishCoalesce(this.chains.find((x) => x.id === chainId), () => ( {
       id: chainId,
       name: `Chain ${id}`,
       network: `${id}`,
       nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
       rpcUrls: { default: { http: [""] }, public: { http: [""] } }
-    };
+    }));
   } catch (error) {
-    const message = typeof error === "string" ? error : error?.message;
+    const message = typeof error === "string" ? error : _optionalChain([error, 'optionalAccess', _25 => _25.message]);
     if (/user rejected request/i.test(message))
-      throw new UserRejectedRequestError(error);
-    throw new SwitchChainError(error);
+      throw new (0, _core.UserRejectedRequestError)(error);
+    throw new (0, _core.SwitchChainError)(error);
   }
 };
-export {
-  WalletConnectConnector
-};
+
+
+exports.WalletConnectConnector = WalletConnectConnector;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wagmi/connectors",
   "description": "A collection of connectors for wagmi",
   "license": "MIT",
-  "version": "0.2.2",
+  "version": "0.2.3-cjs",
   "peerDependencies": {
     "@wagmi/core": ">=0.9.x",
     "ethers": ">=5.5.1",
@@ -20,7 +20,7 @@
     "@coinbase/wallet-sdk": "^3.5.4",
     "@ledgerhq/connect-kit-loader": "^1.0.1",
     "@walletconnect/ethereum-provider": "^1.8.0",
-    "@walletconnect/universal-provider": "^2.3.2",
+    "@walletconnect/universal-provider": "^2.3.3",
     "@web3modal/standalone": "^2.0.0",
     "abitype": "^0.3.0",
     "eventemitter3": "^4.0.7"
@@ -29,7 +29,6 @@
     "@wagmi/core": "^0.8.19",
     "ethers": "^5.7.2"
   },
-  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {