@dynamic-labs/ethereum 2.0.0-alpha.3 → 2.0.0-alpha.31

package/src/EthWalletConnector.js

@@ -1,8 +1,8 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { createPublicClient, http, formatEther } from 'viem';
+import { formatEther } from 'viem';
+import { toAccount } from 'viem/accounts';
 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-providers';
+import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, getOrMapViemChain } from '@dynamic-labs/utils';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
 
 class EthWalletConnector extends WalletConnectorBase {
@@ -34,25 +34,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* () {
@@ -145,10 +127,14 @@ class EthWalletConnector extends WalletConnectorBase {
             const provider = this.getWalletClient();
             if (!provider)
                 return [];
-            return retryableFn(provider.getAddresses, {
+            const addresses = yield retryableFn(provider.getAddresses, {
                 fallbackValue: [],
                 timeoutMs: 300,
             });
+            if (addresses.length) {
+                this.setActiveAccount(addresses[0]);
+            }
+            return addresses;
         });
     }
     providerSwitchNetwork({ network, provider, }) {
@@ -202,6 +188,12 @@ class EthWalletConnector extends WalletConnectorBase {
             }
         });
     }
+    setActiveAccount(account) {
+        this.activeAccount = account ? toAccount(account) : undefined;
+    }
+    getActiveAccount() {
+        return this.activeAccount;
+    }
 }
 
 export { EthWalletConnector };

package/src/coinbase/client/client.cjs

@@ -10,11 +10,15 @@ var constants = require('../../constants.cjs');
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${constants.INFURA_ID}`;
 const chainId = 1;
+// storing a reference to the coinbase sdk so that we can call getQrUrl on it when we need a fresh qr code
+let coinbaseSdk;
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
 let coinbaseProvider;
-const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
+const getCoinbaseClient = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
     var _a, _b;
     if (!coinbaseProvider) {
-        const coinbaseWalletSDK = new walletSdk.CoinbaseWalletSDK({
+        coinbaseSdk = new walletSdk.CoinbaseWalletSDK({
             appLogoUrl,
             appName,
             enableMobileWalletLink: true,
@@ -25,21 +29,17 @@ const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [
         const rpcUrl = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) ||
             ((_b = network === null || network === void 0 ? void 0 : network.rpcUrls) === null || _b === void 0 ? void 0 : _b[0]) ||
             jsonRpcUrl;
-        coinbaseProvider = coinbaseWalletSDK.makeWeb3Provider(rpcUrl, chainId);
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider(rpcUrl, chainId);
     }
-    return coinbaseProvider;
+    return { provider: coinbaseProvider, sdk: coinbaseSdk };
 };
 const killCoinbaseSession = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     yield (coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.close());
-    coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.disconnect();
-    // We needed to remove the provider, because after a disconnect the initial settings that
-    // were set in the SDK reset, and they need to be initialized again.
-    coinbaseProvider = undefined;
 });
-const fetchPublicAddress = (coinbaseProviderOpts, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getAddress = (coinbaseProviderOpts, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
-    const { qrUrl } = provider;
+    const { provider, sdk } = getCoinbaseClient({ opts: coinbaseProviderOpts });
+    const qrUrl = sdk.getQrUrl();
     if (!qrUrl) {
         throw new utils.DynamicError('no qr url available');
     }
@@ -50,7 +50,7 @@ const fetchPublicAddress = (coinbaseProviderOpts, opts) => _tslib.__awaiter(void
     return address;
 });
 const signMessage = (coinbaseProviderOpts, messageToSign) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
+    const { provider } = getCoinbaseClient({ opts: coinbaseProviderOpts });
     const [address] = yield provider.request({
         method: 'eth_requestAccounts',
     });
@@ -66,7 +66,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => _tslib.__awaiter(vo
     }
 });
 
-exports.fetchPublicAddress = fetchPublicAddress;
-exports.getCoinbaseProvider = getCoinbaseProvider;
+exports.getAddress = getAddress;
+exports.getCoinbaseClient = getCoinbaseClient;
 exports.killCoinbaseSession = killCoinbaseSession;
 exports.signMessage = signMessage;

package/src/coinbase/client/client.d.ts

@@ -1,6 +1,7 @@
-import { FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
-import { GetCoinbaseProvider, GetCoinbaseProviderOpts } from './types';
-export declare const getCoinbaseProvider: GetCoinbaseProvider;
+import { GetAddressOpts } from '@dynamic-labs/wallet-connector-core';
+import { GetCoinbaseClient, GetCoinbaseProviderOpts } from './types';
+export declare const clearClientVariables: () => void;
+export declare const getCoinbaseClient: GetCoinbaseClient;
 export declare const killCoinbaseSession: () => Promise<void>;
-export declare const fetchPublicAddress: (coinbaseProviderOpts: GetCoinbaseProviderOpts, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+export declare const getAddress: (coinbaseProviderOpts: GetCoinbaseProviderOpts, opts?: GetAddressOpts) => Promise<string | undefined>;
 export declare const signMessage: (coinbaseProviderOpts: GetCoinbaseProviderOpts, messageToSign: string) => Promise<string | undefined>;

package/src/coinbase/client/client.js

@@ -6,11 +6,15 @@ import { INFURA_ID } from '../../constants.js';
 
 const jsonRpcUrl = `https://mainnet.infura.io/v3/${INFURA_ID}`;
 const chainId = 1;
+// storing a reference to the coinbase sdk so that we can call getQrUrl on it when we need a fresh qr code
+let coinbaseSdk;
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
 let coinbaseProvider;
-const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
+const getCoinbaseClient = ({ opts: { appLogoUrl, appName = '', evmNetworks = [] } = {}, }) => {
     var _a, _b;
     if (!coinbaseProvider) {
-        const coinbaseWalletSDK = new CoinbaseWalletSDK({
+        coinbaseSdk = new CoinbaseWalletSDK({
             appLogoUrl,
             appName,
             enableMobileWalletLink: true,
@@ -21,21 +25,17 @@ const getCoinbaseProvider = ({ opts: { appLogoUrl, appName = '', evmNetworks = [
         const rpcUrl = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) ||
             ((_b = network === null || network === void 0 ? void 0 : network.rpcUrls) === null || _b === void 0 ? void 0 : _b[0]) ||
             jsonRpcUrl;
-        coinbaseProvider = coinbaseWalletSDK.makeWeb3Provider(rpcUrl, chainId);
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider(rpcUrl, chainId);
     }
-    return coinbaseProvider;
+    return { provider: coinbaseProvider, sdk: coinbaseSdk };
 };
 const killCoinbaseSession = () => __awaiter(void 0, void 0, void 0, function* () {
     yield (coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.close());
-    coinbaseProvider === null || coinbaseProvider === void 0 ? void 0 : coinbaseProvider.disconnect();
-    // We needed to remove the provider, because after a disconnect the initial settings that
-    // were set in the SDK reset, and they need to be initialized again.
-    coinbaseProvider = undefined;
 });
-const fetchPublicAddress = (coinbaseProviderOpts, opts) => __awaiter(void 0, void 0, void 0, function* () {
+const getAddress = (coinbaseProviderOpts, opts) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
-    const { qrUrl } = provider;
+    const { provider, sdk } = getCoinbaseClient({ opts: coinbaseProviderOpts });
+    const qrUrl = sdk.getQrUrl();
     if (!qrUrl) {
         throw new DynamicError('no qr url available');
     }
@@ -46,7 +46,7 @@ const fetchPublicAddress = (coinbaseProviderOpts, opts) => __awaiter(void 0, voi
     return address;
 });
 const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, void 0, void 0, function* () {
-    const provider = getCoinbaseProvider({ opts: coinbaseProviderOpts });
+    const { provider } = getCoinbaseClient({ opts: coinbaseProviderOpts });
     const [address] = yield provider.request({
         method: 'eth_requestAccounts',
     });
@@ -62,4 +62,4 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, v
     }
 });
 
-export { fetchPublicAddress, getCoinbaseProvider, killCoinbaseSession, signMessage };
+export { getAddress, getCoinbaseClient, killCoinbaseSession, signMessage };

package/src/coinbase/client/types.d.ts

@@ -1,4 +1,4 @@
-import { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
+import CoinbaseWalletSDK, { CoinbaseWalletProvider } from '@coinbase/wallet-sdk';
 import { GenericNetwork } from '@dynamic-labs/types';
 export type GetCoinbaseProviderOpts = {
     appLogoUrl?: string;
@@ -8,7 +8,10 @@ export type GetCoinbaseProviderOpts = {
 export type CoinbaseProviderHandlerOpts = {
     onDisconnect(): Promise<void>;
 };
-export type GetCoinbaseProvider = (args: {
+export type GetCoinbaseClient = (args: {
     handlers?: CoinbaseProviderHandlerOpts;
     opts?: GetCoinbaseProviderOpts;
-}) => CoinbaseWalletProvider;
+}) => {
+    provider: CoinbaseWalletProvider;
+    sdk: CoinbaseWalletSDK;
+};

package/src/coinbase/coinbase.cjs

@@ -5,15 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../_virtual/_tslib.cjs');
 var viem = require('viem');
 var walletBook = require('@dynamic-labs/wallet-book');
-require('../polyfills.cjs');
-require('@dynamic-labs/turnkey');
-require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
-require('../walletConnect/walletConnectV2.cjs');
-require('@walletconnect/ethereum-provider');
-require('@dynamic-labs/wallet-connector-core');
-require('@walletconnect/client');
 var client = require('./client/client.cjs');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
@@ -21,6 +15,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         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;
@@ -32,10 +27,14 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
         if (!wallet)
             return;
-        this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(wallet);
+        this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(wallet, this);
     }
     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;
@@ -45,28 +44,28 @@ class Coinbase extends EthWalletConnector.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 viem.createWalletClient({
-            transport: viem.custom(client.getCoinbaseProvider({
+            transport: viem.custom(client.getCoinbaseClient({
                 opts: this.coinbaseProviderOpts,
-            })),
+            }).provider),
         });
     }
     isInstalledOnBrowser() {
         var _a;
         return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress(opts) {
+    getAddress(opts) {
         var _a;
         return _tslib.__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 client.fetchPublicAddress(this.coinbaseProviderOpts, opts);
+            return client.getAddress(this.coinbaseProviderOpts, opts);
         });
     }
     signMessage(messageToSign) {
@@ -85,6 +84,23 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
             client.killCoinbaseSession();
         });
     }
+    setupCoinbaseProviderEventListeners() {
+        const { provider } = client.getCoinbaseClient({
+            opts: this.coinbaseProviderOpts,
+        });
+        if (!provider) {
+            return;
+        }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.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);
+        };
+    }
 }
 
 exports.Coinbase = Coinbase;

package/src/coinbase/coinbase.d.ts

@@ -1,5 +1,5 @@
-import { Chain, FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
-import { EthProviderHelper } from '..';
+import { Chain, GetAddressOpts } from '@dynamic-labs/wallet-connector-core';
+import { EthProviderHelper } from '../ethProviderHelper';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 type CoinbaseOpts = EthWalletConnectorOpts & {
     appLogoUrl?: string;
@@ -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,17 @@
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
 import { createWalletClient, custom } from 'viem';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import '../polyfills.js';
-import '@dynamic-labs/turnkey';
-import '@dynamic-labs/utils';
+import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 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 { getCoinbaseClient, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
 
 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;
@@ -28,10 +23,14 @@ class Coinbase extends EthWalletConnector {
         const wallet = findWalletBookWallet(this.walletBook, this.key);
         if (!wallet)
             return;
-        this.ethProviderHelper = new EthProviderHelper(wallet);
+        this.ethProviderHelper = new EthProviderHelper(wallet, this);
     }
     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,28 +40,28 @@ 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({
+            transport: custom(getCoinbaseClient({
                 opts: this.coinbaseProviderOpts,
-            })),
+            }).provider),
         });
     }
     isInstalledOnBrowser() {
         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 +80,23 @@ class Coinbase extends EthWalletConnector {
             killCoinbaseSession();
         });
     }
+    setupCoinbaseProviderEventListeners() {
+        const { provider } = getCoinbaseClient({
+            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

@@ -6,11 +6,13 @@ 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 viemUtils = require('@dynamic-labs/viem-utils');
 var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
-    constructor(wallet) {
+    constructor(wallet, connector) {
         this.wallet = wallet;
+        this.connector = connector;
     }
     getInstalledProvider() {
         const eip6963Config = this.getEip6963Config();
@@ -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.connector.getActiveAccount(),
+            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.connector.setActiveAccount(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);
             }