@dynamic-labs/ethereum 2.0.0-alpha.5 → 2.0.0-alpha.7

package/CHANGELOG.md

@@ -1,4 +1,43 @@
 
+## [2.0.0-alpha.7](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.6...v2.0.0-alpha.7) (2024-02-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* add networkValidationMode and remove enableForcedNetworkValidation (#4778)
+
+### Features
+
+* add bitget and okx wallets ([51fab41](https://github.com/dynamic-labs/DynamicAuth/commit/51fab413096fd89ce99c6c617cf4f3f5db9bf44d))
+* add networkValidationMode and remove enableForcedNetworkValidation ([#4778](https://github.com/dynamic-labs/DynamicAuth/issues/4778)) ([ccb9576](https://github.com/dynamic-labs/DynamicAuth/commit/ccb9576c81b2c570185f5126d6d1fcfcbb5ac9e3))
+
+
+### Bug Fixes
+
+* **GVTY-1243:** non evm onramp urls ([#4791](https://github.com/dynamic-labs/DynamicAuth/issues/4791)) ([fea602e](https://github.com/dynamic-labs/DynamicAuth/commit/fea602e2835b4bb9bc096b96375fa97297bf35f1))
+* revert use enableForcedNetworkValidation on connect-only ([#4750](https://github.com/dynamic-labs/DynamicAuth/issues/4750)) ([#4772](https://github.com/dynamic-labs/DynamicAuth/issues/4772)) ([b871c22](https://github.com/dynamic-labs/DynamicAuth/commit/b871c2295f39230bc34ae1fca5f8817cd9251a17))
+* use correct chromeId for okx and bitget wallets and remove group from coin98 ([#4795](https://github.com/dynamic-labs/DynamicAuth/issues/4795)) ([e63bad7](https://github.com/dynamic-labs/DynamicAuth/commit/e63bad76ed06636151212c915a102359a03b4218))
+
+## [2.0.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.5...v2.0.0-alpha.6) (2024-02-26)
+
+
+### ⚠ BREAKING CHANGES
+
+* setShowAuthFlow opens dynamic profile in non-multi-wallet states
+
+### Features
+
+* allow passing prop to hide embedded wallet action confirmation UIs ([#4775](https://github.com/dynamic-labs/DynamicAuth/issues/4775)) ([d7c6a46](https://github.com/dynamic-labs/DynamicAuth/commit/d7c6a4699e41f6a62d31880c3bd0346ebfa0e3ba))
+* make sms mobile keyboard numeric ([#4755](https://github.com/dynamic-labs/DynamicAuth/issues/4755)) ([f36844a](https://github.com/dynamic-labs/DynamicAuth/commit/f36844aeaae240c520181b3242492db8ffc64a50))
+* setShowAuthFlow opens dynamic profile in non-multi-wallet states ([42dbbc0](https://github.com/dynamic-labs/DynamicAuth/commit/42dbbc00a5cebe937dca5a80397cdd3c577f6a45))
+
+
+### Bug Fixes
+
+* demo one-time codes for solana wallets fix ([#4760](https://github.com/dynamic-labs/DynamicAuth/issues/4760)) ([a5ab2a8](https://github.com/dynamic-labs/DynamicAuth/commit/a5ab2a8bc348a35a898e03db0900bfab88184c17))
+* only store passcode in backend when auto-generated by dynamic ([#4764](https://github.com/dynamic-labs/DynamicAuth/issues/4764)) ([528bedc](https://github.com/dynamic-labs/DynamicAuth/commit/528bedce5cbd3022ddafe4242954a04f5b70ae74))
+* use enableForcedNetworkValidation on connect-only ([#4750](https://github.com/dynamic-labs/DynamicAuth/issues/4750)) ([6299f7c](https://github.com/dynamic-labs/DynamicAuth/commit/6299f7c3ce705ddb19714f6b7a3a488851ed8dde))
+
 ## [2.0.0-alpha.5](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.4...v2.0.0-alpha.5) (2024-02-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -26,16 +26,16 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coinbase/wallet-sdk": "3.9.1",
+    "@coinbase/wallet-sdk": "3.9.2",
     "@walletconnect/universal-provider": "2.10.6",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.5",
-    "@dynamic-labs/turnkey": "2.0.0-alpha.5",
-    "@dynamic-labs/types": "2.0.0-alpha.5",
-    "@dynamic-labs/utils": "2.0.0-alpha.5",
-    "@dynamic-labs/wallet-book": "2.0.0-alpha.5",
-    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.5",
+    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.7",
+    "@dynamic-labs/turnkey": "2.0.0-alpha.7",
+    "@dynamic-labs/types": "2.0.0-alpha.7",
+    "@dynamic-labs/utils": "2.0.0-alpha.7",
+    "@dynamic-labs/wallet-book": "2.0.0-alpha.7",
+    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.7",
     "stream": "0.0.2"
   },
   "peerDependencies": {

package/src/EthWalletConnector.cjs

@@ -6,7 +6,6 @@ var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var rpcProviderEthereum = require('@dynamic-labs/rpc-provider-ethereum');
 var findEvmNetwork = require('./utils/findEvmNetwork.cjs');
 
 class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
@@ -38,25 +37,7 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
         }, {});
         this.evmNetworks = utils.parseEvmNetworks(props.evmNetworks);
         this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(rpcProviderEthereum.ProviderChain.EVM, (config) => {
-            const rpcProviders = {};
-            if (config === null || config === void 0 ? void 0 : config.evm) {
-                rpcProviders.evm = utils.parseEvmNetworks(config.evm).map((network) => {
-                    var _a;
-                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-                    const provider = viem.createPublicClient({
-                        chain: utils.getOrMapViemChain(network),
-                        transport: viem.http(rpcUrl),
-                    });
-                    return {
-                        chainId: network.chainId,
-                        chainName: network.name,
-                        provider,
-                    };
-                });
-            }
-            return rpcProviders.evm;
-        });
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/EthWalletConnector.d.ts

@@ -40,20 +40,20 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const TAbi extends import("viem").Abi | readonly unknown[], TChainOverride extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, import("viem").Chain | undefined, import("viem").Account | undefined, chainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_1>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
+        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, import("viem").Account | undefined, TChainOverride, TAccountOverride, TParameterType>>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
-        sendRawTransaction: (args: import("node_modules/viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_1>) => Promise<`0x${string}`>;
         signMessage: (args: import("viem").SignMessageParameters<import("viem").Account | undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -264,7 +264,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
         }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, import("viem").Account | undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const TAbi_1 extends import("viem").Abi | readonly unknown[], TFunctionName extends string, TChainOverride_4 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_1, TFunctionName, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_4>) => Promise<`0x${string}`>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -278,7 +278,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>) => client) => import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>;
+        } & Partial<Pick<import("viem").PublicActions<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined>, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>) => client) => import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>;
     } | undefined>;
     getBalance(): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;

package/src/EthWalletConnector.js

@@ -1,8 +1,7 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { createPublicClient, http, formatEther } from 'viem';
+import { formatEther } from 'viem';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { parseEvmNetworks, getOrMapViemChain, retryableFn, FALLBACK_UNDEFINED, DynamicError } from '@dynamic-labs/utils';
-import { ProviderChain } from '@dynamic-labs/rpc-provider-ethereum';
+import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, getOrMapViemChain } from '@dynamic-labs/utils';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
 
 class EthWalletConnector extends WalletConnectorBase {
@@ -34,25 +33,7 @@ class EthWalletConnector extends WalletConnectorBase {
         }, {});
         this.evmNetworks = parseEvmNetworks(props.evmNetworks);
         this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerChainProviders(ProviderChain.EVM, (config) => {
-            const rpcProviders = {};
-            if (config === null || config === void 0 ? void 0 : config.evm) {
-                rpcProviders.evm = parseEvmNetworks(config.evm).map((network) => {
-                    var _a;
-                    const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-                    const provider = createPublicClient({
-                        chain: getOrMapViemChain(network),
-                        transport: http(rpcUrl),
-                    });
-                    return {
-                        chainId: network.chainId,
-                        chainName: network.name,
-                        provider,
-                    };
-                });
-            }
-            return rpcProviders.evm;
-        });
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/coinbase/coinbase.cjs

@@ -12,12 +12,14 @@ var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 require('../walletConnect/walletConnect.cjs');
 var client = require('./client/client.cjs');
+require('@dynamic-labs/rpc-provider-ethereum');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
     constructor(_a) {
         var { appName, appLogoUrl, evmNetworks } = _a, props = _tslib.__rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
         super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
+        this.overrideKey = 'coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;

package/src/coinbase/coinbase.d.ts

@@ -7,6 +7,7 @@ type CoinbaseOpts = EthWalletConnectorOpts & {
 };
 export declare class Coinbase extends EthWalletConnector {
     name: string;
+    overrideKey: string;
     supportedChains: Chain[];
     connectedChain: Chain;
     canConnectViaQrCode: boolean;
@@ -32,20 +33,20 @@ export declare class Coinbase extends EthWalletConnector {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const TAbi extends import("viem").Abi | readonly unknown[], TChainOverride extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, import("viem").Chain | undefined, import("viem").Account | undefined, chainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_1>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
+        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, import("viem").Account | undefined, TChainOverride, TAccountOverride, TParameterType>>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
-        sendRawTransaction: (args: import("node_modules/viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_1>) => Promise<`0x${string}`>;
         signMessage: (args: import("viem").SignMessageParameters<import("viem").Account | undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -256,7 +257,7 @@ export declare class Coinbase extends EthWalletConnector {
         }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, import("viem").Account | undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const TAbi_1 extends import("viem").Abi | readonly unknown[], TFunctionName extends string, TChainOverride_4 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_1, TFunctionName, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_4>) => Promise<`0x${string}`>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, import("viem").Chain | undefined, import("viem").Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -270,7 +271,7 @@ export declare class Coinbase extends EthWalletConnector {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>) => client) => import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>;
+        } & Partial<Pick<import("viem").PublicActions<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>) => client) => import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, import("viem").Account | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain | undefined, import("viem").Account | undefined>>;
     } | {
         account: undefined;
         batch?: {
@@ -289,20 +290,20 @@ export declare class Coinbase extends EthWalletConnector {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const TAbi_2 extends import("viem").Abi | readonly unknown[], TChainOverride_5 extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi_2, undefined, undefined, TChainOverride_5>) => Promise<`0x${string}`>;
+        deployContract: <const abi_2 extends import("viem").Abi | readonly unknown[], chainOverride_1 extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi_2, undefined, undefined, chainOverride_1>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TChainOverride_6 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<undefined, undefined, TChainOverride_6>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
+        prepareTransactionRequest: <TParameterType_1 extends import("viem").PrepareTransactionRequestParameterType, TChainOverride_4 extends import("viem").Chain | undefined = undefined, TAccountOverride_1 extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<undefined, undefined, TChainOverride_4, TAccountOverride_1, TParameterType_1>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, undefined, TChainOverride_4, TAccountOverride_1, TParameterType_1>>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
-        sendRawTransaction: (args: import("node_modules/viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_7 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_7>) => Promise<`0x${string}`>;
+        sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_5 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_5>) => Promise<`0x${string}`>;
         signMessage: (args: import("viem").SignMessageParameters<undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_8 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<undefined, undefined, TChainOverride_8>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_6 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<undefined, undefined, TChainOverride_6>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData_1 extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -513,7 +514,7 @@ export declare class Coinbase extends EthWalletConnector {
         }, TPrimaryType_1 extends string>(args: import("viem").SignTypedDataParameters<TTypedData_1, TPrimaryType_1, undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const TAbi_3 extends import("viem").Abi | readonly unknown[], TFunctionName_1 extends string, TChainOverride_9 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_3, TFunctionName_1, undefined, undefined, TChainOverride_9>) => Promise<`0x${string}`>;
+        writeContract: <const abi_3 extends import("viem").Abi | readonly unknown[], functionName_1 extends import("viem").ContractFunctionName<abi_3, "nonpayable" | "payable">, args_1 extends import("viem").ContractFunctionArgs<abi_3, "pure" | "view", functionName_1>, TChainOverride_7 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_3, functionName_1, args_1, undefined, undefined, TChainOverride_7>) => Promise<`0x${string}`>;
         extend: <const client_1 extends {
             [x: string]: unknown;
             account?: undefined;
@@ -527,7 +528,7 @@ export declare class Coinbase extends EthWalletConnector {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<undefined, undefined>>) => client_1) => import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, { [K_1 in keyof client_1]: client_1[K_1]; } & import("viem").WalletActions<undefined, undefined>>;
+        } & Partial<Pick<import("viem").PublicActions<import("viem").CustomTransport, undefined, undefined>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<undefined, undefined>>) => client_1) => import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, { [K_1 in keyof client_1]: client_1[K_1]; } & import("viem").WalletActions<undefined, undefined>>;
     } | undefined;
     isInstalledOnBrowser(): boolean;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;

package/src/coinbase/coinbase.js

@@ -8,12 +8,14 @@ import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import '../walletConnect/walletConnect.js';
 import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import '@dynamic-labs/rpc-provider-ethereum';
 
 class Coinbase extends EthWalletConnector {
     constructor(_a) {
         var { appName, appLogoUrl, evmNetworks } = _a, props = __rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
         super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
+        this.overrideKey = 'coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;

package/src/index.cjs

@@ -10,6 +10,7 @@ var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConne
 require('./walletConnect/walletConnect.cjs');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
 var coinbase = require('./coinbase/coinbase.cjs');
+require('@dynamic-labs/rpc-provider-ethereum');
 var EthWalletConnector = require('./EthWalletConnector.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
 var constants = require('./constants.cjs');

package/src/index.d.ts

@@ -1,5 +1,6 @@
 import './polyfills';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/rpc-provider-ethereum';
 export * from './injected';
 export * from './EthWalletConnector';
 export * from './ethProviderHelper';

package/src/index.js

@@ -7,6 +7,7 @@ export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injecte
 import './walletConnect/walletConnect.js';
 import { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
 import { Coinbase } from './coinbase/coinbase.js';
+import '@dynamic-labs/rpc-provider-ethereum';
 export { EthWalletConnector } from './EthWalletConnector.js';
 export { EthProviderHelper } from './ethProviderHelper.js';
 export { INFURA_ID } from './constants.js';

package/src/injected/ExodusEvm.cjs

@@ -10,6 +10,7 @@ class ExodusEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'ExodusEvm';
+        this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/ExodusEvm.d.ts

@@ -2,6 +2,7 @@ import { EthWalletConnectorOpts } from '..';
 import InjectedWalletBase from './InjectedWalletBase';
 export declare class ExodusEvm extends InjectedWalletBase {
     name: string;
+    overrideKey: string;
     walletConnectorFallback: boolean;
     constructor(props: EthWalletConnectorOpts);
 }

package/src/injected/ExodusEvm.js

@@ -6,6 +6,7 @@ class ExodusEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'ExodusEvm';
+        this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/PhantomEvm.cjs

@@ -11,6 +11,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/injected/PhantomEvm.d.ts

@@ -2,6 +2,7 @@ import { EthWalletConnectorOpts } from '..';
 import InjectedWalletBase from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
+    overrideKey: string;
     constructor(props: EthWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
 }

package/src/injected/PhantomEvm.js

@@ -7,6 +7,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/walletConnect/fetchWalletConnectWallets.cjs

@@ -6,14 +6,15 @@ var walletConnect = require('./walletConnect.cjs');
 
 const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
         return class extends walletConnect.WalletConnect {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
             }
         };
     });

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -2,14 +2,15 @@ import { WalletConnect } from './walletConnect.js';
 
 const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
         return class extends WalletConnect {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
             }
         };
     });

package/src/walletConnect/walletConnect.cjs

@@ -6,9 +6,9 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var Provider = require('@walletconnect/universal-provider');
 var EventEmitter = require('eventemitter3');
 var viem = require('viem');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
+var walletBook = require('@dynamic-labs/wallet-book');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var parseIntSafe = require('../utils/parseIntSafe.cjs');
 
@@ -53,11 +53,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             .map((network) => `eip155:${network.chainId}`));
     }
     getMappedChainsByPreferredOrder() {
-        // adding Ethereum to avoid an error connecting if none of the evm networks are supported by the wallet
         const allChains = this.getMappedChains();
-        if (!allChains.includes('eip155:1')) {
-            allChains.push('eip155:1');
-        }
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
         return [...reorderedChains, ...remainingChains];
@@ -102,15 +98,17 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
     }
     createInitProviderPromise() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = yield Provider__default["default"].init({
+            WalletConnect.provider = yield Provider__default["default"].init({
                 logger: walletConnectorCore.logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
                 projectId: this.projectId,
             });
-            WalletConnect.provider = provider;
             this.teardownEventListeners();
             this.setupEventListeners();
         });
     }
+    // We need to add a gate to this method since we will be calling it asynchronously
+    // from different places (such as setShowAuthFlow), which means there's a chance for
+    // a race condition to happen where createInitProviderPromise is called multiple times
     initProvider() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnect;
@@ -246,7 +244,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 // the connection is established, but we need to wait for it to
                 // finish setting up the connection URI and making it available
                 // on the provider
-                yield new Promise((resolve) => setTimeout(resolve, 1000));
+                yield utils.sleep(1000);
                 if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.uri)) {
                     walletConnectorCore.logger.debug('No WC2 provider found, escaping and throwing error');
                     throw new utils.DynamicError('No provider found');
@@ -262,22 +260,40 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                     reject(new utils.DynamicError('No provider found'));
                     return;
                 }
-                ee.on('walletconnect_connection_failed', () => {
+                const onFail = () => {
                     const error = new utils.DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
                         WalletConnect.provider.uri = undefined;
+                        // this is needed for mobile to work when using universal links.
+                        // if the user cancels the connection, we need to re-initialize the provider
+                        // so that the async work is done ahead of time, before the user tries to connect again,
+                        // otherwise they will trigger the iOS bug where they are redirected to the app store
+                        this.init();
                     }
                     reject(error);
-                });
-                WalletConnect.provider.on('connect', ({ session }) => {
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const onConnect = ({ session }) => {
                     if (!session) {
                         reject(new utils.DynamicError('No session found'));
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
-                });
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const cleanupListeners = () => {
+                    var _a;
+                    ee.off('walletconnect_connection_failed', onFail);
+                    (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.off('connect', onConnect);
+                };
+                ee.on('walletconnect_connection_failed', onFail);
+                WalletConnect.provider.on('connect', onConnect);
             });
         });
     }

package/src/walletConnect/walletConnect.d.ts

@@ -1,7 +1,7 @@
 import type { SessionTypes } from '@walletconnect/types';
 import { Hex, WalletClient } from 'viem';
-import { Chain, FetchPublicAddressOpts, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
+import { Chain, DeepLinkVariant, FetchPublicAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 export type WalletConnectOpts = EthWalletConnectorOpts & {
     projectId?: string;
@@ -9,7 +9,7 @@ export type WalletConnectOpts = EthWalletConnectorOpts & {
     deepLinkPreference?: DeepLinkVariant;
     walletConnectPreferredChains?: `eip155:${number}`[];
 };
-export declare class WalletConnect extends EthWalletConnector {
+export declare class WalletConnect extends EthWalletConnector implements IWalletConnectConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
     name: string;
@@ -62,20 +62,20 @@ export declare class WalletConnect extends EthWalletConnector {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const TAbi extends import("viem").Abi | readonly unknown[], TChainOverride extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi, undefined, undefined, TChainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, undefined, undefined, chainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<undefined, undefined, TChainOverride_1>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
+        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<undefined, undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, undefined, TChainOverride, TAccountOverride, TParameterType>>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
-        sendRawTransaction: (args: import("node_modules/viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_1>) => Promise<`0x${string}`>;
         signMessage: (args: import("viem").SignMessageParameters<undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<undefined, undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<undefined, undefined, TChainOverride_2>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -286,7 +286,7 @@ export declare class WalletConnect extends EthWalletConnector {
         }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const TAbi_1 extends import("viem").Abi | readonly unknown[], TFunctionName extends string, TChainOverride_4 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_1, TFunctionName, undefined, undefined, TChainOverride_4>) => Promise<`0x${string}`>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, undefined, undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -300,7 +300,7 @@ export declare class WalletConnect extends EthWalletConnector {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<undefined, undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<undefined, undefined>>;
+        } & Partial<Pick<import("viem").PublicActions<import("viem").CustomTransport, undefined, undefined>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<undefined, undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<undefined, undefined>>;
     } | undefined;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     /**
@@ -329,5 +329,5 @@ export declare class WalletConnect extends EthWalletConnector {
     }): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
     private isMetaMask;
-    getSupportedNetworks(): Promise<string[] | undefined>;
+    getSupportedNetworks(): Promise<string[]>;
 }

package/src/walletConnect/walletConnect.js

@@ -2,9 +2,9 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import Provider from '@walletconnect/universal-provider';
 import EventEmitter from 'eventemitter3';
 import { createWalletClient, custom } from 'viem';
-import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { DynamicError, isMobile } from '@dynamic-labs/utils';
+import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { parseIntSafe } from '../utils/parseIntSafe.js';
 
@@ -44,11 +44,7 @@ class WalletConnect extends EthWalletConnector {
             .map((network) => `eip155:${network.chainId}`));
     }
     getMappedChainsByPreferredOrder() {
-        // adding Ethereum to avoid an error connecting if none of the evm networks are supported by the wallet
         const allChains = this.getMappedChains();
-        if (!allChains.includes('eip155:1')) {
-            allChains.push('eip155:1');
-        }
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
         return [...reorderedChains, ...remainingChains];
@@ -93,15 +89,17 @@ class WalletConnect extends EthWalletConnector {
     }
     createInitProviderPromise() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = yield Provider.init({
+            WalletConnect.provider = yield Provider.init({
                 logger: logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
                 projectId: this.projectId,
             });
-            WalletConnect.provider = provider;
             this.teardownEventListeners();
             this.setupEventListeners();
         });
     }
+    // We need to add a gate to this method since we will be calling it asynchronously
+    // from different places (such as setShowAuthFlow), which means there's a chance for
+    // a race condition to happen where createInitProviderPromise is called multiple times
     initProvider() {
         return __awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnect;
@@ -237,7 +235,7 @@ class WalletConnect extends EthWalletConnector {
                 // the connection is established, but we need to wait for it to
                 // finish setting up the connection URI and making it available
                 // on the provider
-                yield new Promise((resolve) => setTimeout(resolve, 1000));
+                yield sleep(1000);
                 if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.uri)) {
                     logger.debug('No WC2 provider found, escaping and throwing error');
                     throw new DynamicError('No provider found');
@@ -253,22 +251,40 @@ class WalletConnect extends EthWalletConnector {
                     reject(new DynamicError('No provider found'));
                     return;
                 }
-                ee.on('walletconnect_connection_failed', () => {
+                const onFail = () => {
                     const error = new DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
                         WalletConnect.provider.uri = undefined;
+                        // this is needed for mobile to work when using universal links.
+                        // if the user cancels the connection, we need to re-initialize the provider
+                        // so that the async work is done ahead of time, before the user tries to connect again,
+                        // otherwise they will trigger the iOS bug where they are redirected to the app store
+                        this.init();
                     }
                     reject(error);
-                });
-                WalletConnect.provider.on('connect', ({ session }) => {
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const onConnect = ({ session }) => {
                     if (!session) {
                         reject(new DynamicError('No session found'));
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
-                });
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const cleanupListeners = () => {
+                    var _a;
+                    ee.off('walletconnect_connection_failed', onFail);
+                    (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.off('connect', onConnect);
+                };
+                ee.on('walletconnect_connection_failed', onFail);
+                WalletConnect.provider.on('connect', onConnect);
             });
         });
     }