@wagmi/connectors 0.1.7 → 0.1.8

package/dist/coinbaseWallet.d.ts

@@ -6,7 +6,7 @@ import { C as Connector } from './base-6b5431a5.js';
 import 'abitype';
 import 'eventemitter3';
 
-declare type Options = CoinbaseWalletSDKOptions & {
+declare type Options = Omit<CoinbaseWalletSDKOptions, 'reloadOnDisconnect'> & {
     /**
      * Fallback Ethereum JSON RPC URL
      * @default ""
@@ -17,6 +17,10 @@ declare type Options = CoinbaseWalletSDKOptions & {
      * @default 1
      */
     chainId?: number;
+    /**
+     * Whether or not to reload dapp automatically after disconnect.
+     */
+    reloadOnDisconnect?: boolean;
 };
 declare class CoinbaseWalletConnector extends Connector<CoinbaseWalletProvider, Options, providers.JsonRpcSigner> {
     #private;

package/dist/walletConnect.d.ts

@@ -31,6 +31,8 @@ declare class WalletConnectConnector extends Connector<WalletConnectProvider | U
         chains?: Chain[];
         options: WalletConnectOptions;
     });
+    get isQrCode(): boolean;
+    get namespacedChains(): string[];
     get version(): "1" | "2" | undefined;
     connect({ chainId }?: {
         chainId?: number;

package/dist/walletConnect.js

@@ -27,16 +27,20 @@ var defaultV2Config = {
   ],
   events: ["accountsChanged", "chainChanged"]
 };
-var _provider, _isChainsAuthorized, isChainsAuthorized_fn, _switchChain, switchChain_fn;
+var _provider, _universalProviderPromise, _web3Modal, _createWeb3Modal, createWeb3Modal_fn, _getUniversalProvider, getUniversalProvider_fn, _isChainsAuthorized, isChainsAuthorized_fn, _switchChain, switchChain_fn;
 var WalletConnectConnector = class extends Connector {
   constructor(config) {
     super(config);
+    __privateAdd(this, _createWeb3Modal);
+    __privateAdd(this, _getUniversalProvider);
     __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, _universalProviderPromise, void 0);
+    __privateAdd(this, _web3Modal, void 0);
     __publicField(this, "onAccountsChanged", (accounts) => {
       if (accounts.length === 0)
         this.emit("disconnect");
@@ -54,6 +58,19 @@ var WalletConnectConnector = class extends Connector {
     __publicField(this, "onDisplayUri", (uri) => {
       this.emit("message", { type: "display_uri", data: uri });
     });
+    if (this.version === "2") {
+      __privateMethod(this, _getUniversalProvider, getUniversalProvider_fn).call(this);
+      if (this.isQrCode)
+        __privateMethod(this, _createWeb3Modal, createWeb3Modal_fn).call(this);
+    }
+  }
+  get isQrCode() {
+    return this.options.qrcode !== false;
+  }
+  get namespacedChains() {
+    return this.chains.map(
+      (chain) => `${defaultV2Config.namespace}:${chain.id}`
+    );
   }
   get version() {
     if ("version" in this.options)
@@ -61,6 +78,8 @@ var WalletConnectConnector = class extends Connector {
     return "1";
   }
   async connect({ chainId } = {}) {
+    const isV1 = this.version === "1";
+    const isV2 = this.version === "2";
     try {
       let targetChainId = chainId;
       if (!targetChainId) {
@@ -70,12 +89,12 @@ var WalletConnectConnector = class extends Connector {
       }
       const provider = await this.getProvider({
         chainId: targetChainId,
-        create: true
+        create: isV1
       });
       provider.on("accountsChanged", this.onAccountsChanged);
       provider.on("chainChanged", this.onChainChanged);
       provider.on("disconnect", this.onDisconnect);
-      if (this.version === "2") {
+      if (isV2) {
         provider.on("session_delete", this.onDisconnect);
         provider.on("display_uri", this.onDisplayUri);
         const isChainsAuthorized = await __privateMethod(this, _isChainsAuthorized, isChainsAuthorized_fn).call(this);
@@ -88,9 +107,7 @@ var WalletConnectConnector = class extends Connector {
                 [defaultV2Config.namespace]: {
                   methods: defaultV2Config.methods,
                   events: defaultV2Config.events,
-                  chains: this.chains.map(
-                    (chain) => `${defaultV2Config.namespace}:${chain.id}`
-                  ),
+                  chains: this.namespacedChains,
                   rpcMap: this.chains.reduce(
                     (rpc, chain) => ({
                       ...rpc,
@@ -101,26 +118,26 @@ var WalletConnectConnector = class extends Connector {
                 }
               }
             }),
-            ...this.options.qrcode ? [
+            ...this.isQrCode ? [
               new Promise(
-                (_res, reject) => provider.on(
-                  "display_uri",
-                  async (uri) => (await import("@walletconnect/qrcode-modal")).default.open(
-                    uri,
-                    () => reject(new Error("user rejected"))
-                  )
-                )
+                (_resolve, reject) => provider.on("display_uri", async (uri) => {
+                  await __privateGet(this, _web3Modal)?.openModal({ uri });
+                  __privateGet(this, _web3Modal)?.subscribeModal(({ open }) => {
+                    if (!open)
+                      reject(new Error("user rejected"));
+                  });
+                })
               )
             ] : []
           ]);
-          if (this.options.qrcode)
-            (await import("@walletconnect/qrcode-modal")).default.close();
+          if (this.isQrCode)
+            __privateGet(this, _web3Modal)?.closeModal();
         }
       }
       setTimeout(() => this.emit("message", { type: "connecting" }), 0);
       const accounts = await Promise.race([
         provider.enable(),
-        ...this.version === "1" && this.options.qrcode ? [
+        ...isV1 && this.isQrCode ? [
           new Promise(
             (_res, reject) => provider.connector.on(
               "disconnect",
@@ -132,7 +149,7 @@ var WalletConnectConnector = class extends Connector {
       const account = getAddress(accounts[0]);
       const id = await this.getChainId();
       const unsupported = this.isChainUnsupported(id);
-      if (this.version === "1") {
+      if (isV1) {
         const walletName = provider.connector?.peerMeta?.name ?? "";
         const switchChainAllowedRegex = /(imtoken|metamask|omni|rainbow|trust wallet)/i;
         if (switchChainAllowedRegex.test(walletName))
@@ -147,8 +164,8 @@ var WalletConnectConnector = class extends Connector {
         )
       };
     } catch (error) {
-      if (this.version === "2" && this.options.qrcode)
-        (await import("@walletconnect/qrcode-modal")).default.close();
+      if (isV2 && this.isQrCode)
+        __privateGet(this, _web3Modal)?.closeModal();
       if (/user closed modal|user rejected/i.test(
         error?.message
       )) {
@@ -196,33 +213,29 @@ var WalletConnectConnector = class extends Connector {
     chainId,
     create
   } = {}) {
-    if (!__privateGet(this, _provider) || chainId || create) {
-      if (this.options.version === "2") {
-        const WalletConnectProvider = (await import("@walletconnect/universal-provider")).default;
-        __privateSet(this, _provider, await WalletConnectProvider.init(
-          this.options
-        ));
-        if (chainId)
-          __privateGet(this, _provider).setDefaultChain(
-            `${defaultV2Config.namespace}:${chainId}`
-          );
-        return __privateGet(this, _provider);
-      } else {
-        const rpc = !this.options?.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({
-          ...this.options,
-          chainId,
-          rpc: { ...rpc, ...this.options?.rpc }
-        }));
-        return __privateGet(this, _provider);
-      }
+    if (this.options.version === "2") {
+      if (!__privateGet(this, _provider) || create)
+        __privateSet(this, _provider, await __privateMethod(this, _getUniversalProvider, getUniversalProvider_fn).call(this));
+      if (chainId)
+        __privateGet(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(
+        (rpc2, chain) => ({
+          ...rpc2,
+          [chain.id]: chain.rpcUrls.default.http[0]
+        }),
+        {}
+      ) : {};
+      const WalletConnectProvider = (await import("@walletconnect/ethereum-provider")).default;
+      __privateSet(this, _provider, new WalletConnectProvider({
+        ...this.options,
+        chainId,
+        rpc: { ...rpc, ...this.options?.rpc }
+      }));
+      return __privateGet(this, _provider);
     }
     return __privateGet(this, _provider);
   }
@@ -259,6 +272,27 @@ var WalletConnectConnector = class extends Connector {
   }
 };
 _provider = new WeakMap();
+_universalProviderPromise = new WeakMap();
+_web3Modal = new WeakMap();
+_createWeb3Modal = new WeakSet();
+createWeb3Modal_fn = async function() {
+  const { Web3Modal } = await import("@web3modal/standalone");
+  const { version } = this.options;
+  __privateSet(this, _web3Modal, new Web3Modal({
+    projectId: version === "2" ? this.options.projectId : void 0,
+    standaloneChains: this.namespacedChains
+  }));
+};
+_getUniversalProvider = new WeakSet();
+getUniversalProvider_fn = async function() {
+  if (!__privateGet(this, _universalProviderPromise)) {
+    const WalletConnectProvider = (await import("@walletconnect/universal-provider")).default;
+    __privateSet(this, _universalProviderPromise, WalletConnectProvider.init(
+      this.options
+    ));
+  }
+  return __privateGet(this, _universalProviderPromise);
+};
 _isChainsAuthorized = new WeakSet();
 isChainsAuthorized_fn = async function() {
   const provider = await this.getProvider();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wagmi/connectors",
   "description": "A collection of connectors for wagmi",
   "license": "MIT",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "peerDependencies": {
     "@wagmi/core": "0.8.x",
     "ethers": "^5.0.0"
@@ -16,8 +16,8 @@
     "@coinbase/wallet-sdk": "^3.5.4",
     "@ledgerhq/connect-kit-loader": "^1.0.1",
     "@walletconnect/ethereum-provider": "^1.8.0",
-    "@walletconnect/qrcode-modal": "^1.8.0",
-    "@walletconnect/universal-provider": "^2.2.0",
+    "@web3modal/standalone": "^2.0.0-rc.2",
+    "@walletconnect/universal-provider": "^2.2.1",
     "abitype": "^0.1.8",
     "eventemitter3": "^4.0.7"
   },