@dynamic-labs/ethereum 2.0.0-alpha.2 → 2.0.0-alpha.20

package/src/coinbase/coinbase.d.ts

@@ -1,4 +1,4 @@
-import { Chain, FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
+import { Chain, GetAddressOpts } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from '..';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 type CoinbaseOpts = EthWalletConnectorOpts & {
@@ -7,6 +7,7 @@ type CoinbaseOpts = EthWalletConnectorOpts & {
 };
 export declare class Coinbase extends EthWalletConnector {
     name: string;
+    overrideKey: string;
     supportedChains: Chain[];
     connectedChain: Chain;
     canConnectViaQrCode: boolean;
@@ -14,7 +15,7 @@ export declare class Coinbase extends EthWalletConnector {
     ethProviderHelper: EthProviderHelper | undefined;
     constructor({ appName, appLogoUrl, evmNetworks, ...props }: CoinbaseOpts);
     setupEventListeners(): void;
-    getWalletClient(): {
+    getWalletClient(chainId?: string): {
         account: import("viem").Account | undefined;
         batch?: {
             multicall?: 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,11 +528,12 @@ 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>;
+    getAddress(opts?: GetAddressOpts): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     endSession(): Promise<void>;
+    private setupCoinbaseProviderEventListeners;
 }
 export {};

package/src/coinbase/coinbase.js

@@ -1,22 +1,22 @@
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
 import { createWalletClient, custom } from 'viem';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import '../polyfills.js';
 import '@dynamic-labs/turnkey';
 import '@dynamic-labs/utils';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import '../walletConnect/walletConnectV2.js';
-import '@walletconnect/ethereum-provider';
-import '@dynamic-labs/wallet-connector-core';
-import '@walletconnect/client';
-import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import '../walletConnect/walletConnect.js';
+import { getCoinbaseProvider, getAddress, 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;
@@ -32,6 +32,10 @@ class Coinbase extends EthWalletConnector {
     }
     setupEventListeners() {
         var _a, _b, _c;
+        if (!this.isInstalledOnBrowser()) {
+            this.setupCoinbaseProviderEventListeners();
+            return;
+        }
         const provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider();
         if (!provider) {
             return;
@@ -41,10 +45,10 @@ class Coinbase extends EthWalletConnector {
             return;
         this.teardownEventListeners = setupResponse.tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
         if (this.isInstalledOnBrowser()) {
-            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return createWalletClient({
             transport: custom(getCoinbaseProvider({
@@ -56,13 +60,13 @@ class Coinbase extends EthWalletConnector {
         var _a;
         return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress(opts) {
+    getAddress(opts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
             }
-            return fetchPublicAddress(this.coinbaseProviderOpts, opts);
+            return getAddress(this.coinbaseProviderOpts, opts);
         });
     }
     signMessage(messageToSign) {
@@ -81,6 +85,23 @@ class Coinbase extends EthWalletConnector {
             killCoinbaseSession();
         });
     }
+    setupCoinbaseProviderEventListeners() {
+        const provider = getCoinbaseProvider({
+            opts: this.coinbaseProviderOpts,
+        });
+        if (!provider) {
+            return;
+        }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
+        provider.on('accountsChanged', handleAccountChange);
+        provider.on('chainChanged', handleChainChange);
+        provider.on('disconnect', handleDisconnect);
+        this.teardownEventListeners = () => {
+            provider.removeListener('accountsChanged', handleAccountChange);
+            provider.removeListener('chainChanged', handleChainChange);
+            provider.removeListener('disconnect', handleDisconnect);
+        };
+    }
 }
 
 export { Coinbase };

package/src/ethProviderHelper.cjs

@@ -4,8 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var viemUtils = require('@dynamic-labs/viem-utils');
 var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
@@ -75,29 +77,32 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return viem.createWalletClient({
+            account: this.account,
+            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
             transport: viem.custom(provider),
         });
     }
-    fetchPublicAddress() {
+    getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const client = this.findWalletClient();
             if (!client) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithProvider(client);
+            return this.getAddressWithProvider(client);
         });
     }
-    fetchPublicAddressWithProvider(client) {
+    getAddressWithProvider(client) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = viem.getAddress(lowercaseAddress);
+                this.account = accounts.toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -108,7 +113,7 @@ class EthProviderHelper {
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
+            const walletAddress = yield this.getAddress();
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }

package/src/ethProviderHelper.d.ts

@@ -4,6 +4,7 @@ import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ProviderFlag } from './types';
 export declare class EthProviderHelper {
     private wallet;
+    private account;
     constructor(wallet: WalletSchema);
     getInstalledProvider(): IEthereum | undefined;
     getEip6963Config(): {
@@ -27,9 +28,9 @@ export declare class EthProviderHelper {
     eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;
-    findWalletClient(): WalletClient | undefined;
-    fetchPublicAddress(): Promise<Hex | undefined>;
-    fetchPublicAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
+    findWalletClient(chainId?: string): WalletClient | undefined;
+    getAddress(): Promise<Hex | undefined>;
+    getAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     _setupEventListeners(walletConnector: WalletConnector): {
         tearDownEventListeners: () => void;

package/src/ethProviderHelper.js

@@ -1,7 +1,9 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { ProviderLookup, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
 import { getProvidersFromWindow } from '@dynamic-labs/utils';
+import { chainsMap } from '@dynamic-labs/viem-utils';
 import { Eip6963ProviderSingleton } from './eip6963Provider.js';
 
 class EthProviderHelper {
@@ -71,29 +73,32 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return createWalletClient({
+            account: this.account,
+            chain: chainId ? chainsMap[chainId] : undefined,
             transport: custom(provider),
         });
     }
-    fetchPublicAddress() {
+    getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.findWalletClient();
             if (!client) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithProvider(client);
+            return this.getAddressWithProvider(client);
         });
     }
-    fetchPublicAddressWithProvider(client) {
+    getAddressWithProvider(client) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = getAddress(lowercaseAddress);
+                this.account = toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -104,7 +109,7 @@ class EthProviderHelper {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
+            const walletAddress = yield this.getAddress();
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }

package/src/index.cjs

@@ -7,27 +7,21 @@ var turnkey = require('@dynamic-labs/turnkey');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
-require('./walletConnect/walletConnectV2.cjs');
-require('../_virtual/_tslib.cjs');
-require('@walletconnect/ethereum-provider');
-require('viem');
-require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-var EthWalletConnector = require('./EthWalletConnector.cjs');
-var constants = require('./constants.cjs');
-require('@walletconnect/client');
+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');
 
 const EthereumWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
-    ...turnkey.TurnkeyWalletConnectors(props),
+    ...turnkey.TurnkeyEVMWalletConnectors(props),
     coinbase.Coinbase,
-    fetchWalletConnectWallets.getWalletConnectConnector(props),
+    fetchWalletConnectWallets.getWalletConnectConnector(),
 ];
 
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
@@ -35,6 +29,6 @@ exports.ExodusEvm = ExodusEvm.ExodusEvm;
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
 exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
 exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
-exports.INFURA_ID = constants.INFURA_ID;
 exports.EthProviderHelper = ethProviderHelper.EthProviderHelper;
+exports.INFURA_ID = constants.INFURA_ID;
 exports.EthereumWalletConnectors = EthereumWalletConnectors;

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

@@ -1,30 +1,24 @@
 import './polyfills.js';
-import { TurnkeyWalletConnectors } from '@dynamic-labs/turnkey';
+import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/turnkey';
 export { PhantomEvm } from './injected/PhantomEvm.js';
 export { ExodusEvm } from './injected/ExodusEvm.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
 export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
-import './walletConnect/walletConnectV2.js';
-import '../_virtual/_tslib.js';
-import '@walletconnect/ethereum-provider';
-import 'viem';
-import '@dynamic-labs/wallet-connector-core';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-export { EthWalletConnector } from './EthWalletConnector.js';
-export { INFURA_ID } from './constants.js';
-import '@walletconnect/client';
+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';
 
 const EthereumWalletConnectors = (props) => [
     ...injectedWalletOverrides,
     ...fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets(props),
-    ...TurnkeyWalletConnectors(props),
+    ...TurnkeyEVMWalletConnectors(props),
     Coinbase,
-    getWalletConnectConnector(props),
+    getWalletConnectConnector(),
 ];
 
 export { EthereumWalletConnectors };

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/InjectedWalletBase.cjs

@@ -4,7 +4,6 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
-var walletConnectV2 = require('../walletConnect/walletConnectV2.cjs');
 var walletConnect = require('../walletConnect/walletConnect.cjs');
 
 class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
@@ -27,17 +26,10 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
         if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
             if (!this.wallet)
                 this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new walletConnectV2.WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+            return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }
@@ -51,23 +43,23 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;
         return ((_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress() {
+    getAddress() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            yield this.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/InjectedWalletBase.d.ts

@@ -14,9 +14,9 @@ declare abstract class InjectedWalletBase extends EthWalletConnector {
     getEthProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
     setupEventListeners(): void;
-    getWalletClient(): WalletClient | undefined;
+    getWalletClient(chainId?: string): WalletClient | undefined;
     isInstalledOnBrowser(): boolean;
-    fetchPublicAddress(): Promise<string | undefined>;
+    getAddress(): Promise<string | undefined>;
     connect(): Promise<void>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;

package/src/injected/InjectedWalletBase.js

@@ -2,7 +2,6 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { WalletConnectV2 } from '../walletConnect/walletConnectV2.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
 
 class InjectedWalletBase extends EthWalletConnector {
@@ -25,17 +24,10 @@ class InjectedWalletBase extends EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
         if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
             if (!this.wallet)
                 this.wallet = findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+            return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }
@@ -49,23 +41,23 @@ class InjectedWalletBase extends EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;
         return ((_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress() {
+    getAddress() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            yield this.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/PhantomEvm.cjs

@@ -11,15 +11,16 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
-    fetchPublicAddress() {
+    getAddress() {
         const _super = Object.create(null, {
-            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+            getAddress: { get: () => super.getAddress }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return _super.fetchPublicAddress.call(this);
+                return _super.getAddress.call(this);
             }
             if (utils.isMobile()) {
                 utils.handleMobileWalletRedirect({

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>;
+    getAddress(): Promise<string | undefined>;
 }