@dynamic-labs/ethereum 2.0.0-alpha.9 → 2.0.1

package/src/EthWalletConnector.js

@@ -1,13 +1,15 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { formatEther } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, getOrMapViemChain } from '@dynamic-labs/utils';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
+import { getNameservice } from './utils/getNameservice.js';
 
 class EthWalletConnector extends WalletConnectorBase {
     getPublicClient() {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
@@ -62,19 +64,7 @@ class EthWalletConnector extends WalletConnectorBase {
             if (!address || !rpcProvider) {
                 return;
             }
-            const ensName = yield rpcProvider.getEnsName({
-                address: address,
-            });
-            const ensAvatar = ensName
-                ? yield rpcProvider.getEnsAvatar({
-                    name: ensName,
-                })
-                : undefined;
-            const ensData = {
-                avatar: ensAvatar !== null && ensAvatar !== void 0 ? ensAvatar : undefined,
-                name: ensName !== null && ensName !== void 0 ? ensName : undefined,
-            };
-            return ensData;
+            return getNameservice({ address, rpcProvider });
         });
     }
     getSigner() {
@@ -101,8 +91,8 @@ class EthWalletConnector extends WalletConnectorBase {
     supportsNetworkSwitching() {
         return true;
     }
-    switchNetwork({ networkName, networkChainId, }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    switchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ networkName, networkChainId, }) {
             const network = findEvmNetwork({
                 chainId: networkChainId,
                 name: networkName,
@@ -126,15 +116,19 @@ 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, }) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
+    providerSwitchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
+            var _b, _c, _d, _e;
             const { chainId } = network;
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === chainId) {
@@ -149,14 +143,14 @@ class EthWalletConnector extends WalletConnectorBase {
             catch (error) {
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message
                 if (error.code === 4902 ||
-                    ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('Unrecognized chain')) ||
+                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('Unrecognized chain')) ||
                     // https://github.com/MetaMask/metamask-mobile/issues/3312#issuecomment-1065923294
-                    ((_c = (_b = error.data) === null || _b === void 0 ? void 0 : _b.orginalError) === null || _c === void 0 ? void 0 : _c.code) === 4902) {
+                    ((_d = (_c = error.data) === null || _c === void 0 ? void 0 : _c.orginalError) === null || _d === void 0 ? void 0 : _d.code) === 4902) {
                     // error code indicates the chain has not been added yet
                     // https://docs.metamask.io/guide/rpc-api.html#usage-with-wallet-switchethereumchain
                     return this.providerAddNetwork({ network, provider });
                 }
-                else if (((_d = error.message) === null || _d === void 0 ? void 0 : _d.includes('rejected')) ||
+                else if (((_e = error.message) === null || _e === void 0 ? void 0 : _e.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new DynamicError("User rejected the wallet's request to switch network");
                 }
@@ -166,14 +160,14 @@ class EthWalletConnector extends WalletConnectorBase {
             }
         });
     }
-    providerAddNetwork({ network, provider, }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    providerAddNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
+            var _b;
             try {
                 return yield provider.addChain({ chain: getOrMapViemChain(network) });
             }
             catch (error) {
-                if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
+                if (((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new DynamicError("User rejected the wallet's request to add network");
                 }
@@ -183,6 +177,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,14 +5,10 @@ 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/walletConnect.cjs');
 var client = require('./client/client.cjs');
-require('@dynamic-labs/rpc-provider-ethereum');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
     constructor(_a) {
@@ -31,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;
@@ -44,33 +44,33 @@ 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) {
-        var _a;
+    getAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             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) {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.isInstalledOnBrowser()) {
                 return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
             }
@@ -84,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;
@@ -15,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 | {
@@ -531,8 +531,9 @@ export declare class Coinbase extends EthWalletConnector {
         } & 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,14 +1,10 @@
 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/walletConnect.js';
-import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from './client/client.js';
-import '@dynamic-labs/rpc-provider-ethereum';
+import { getCoinbaseClient, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
 
 class Coinbase extends EthWalletConnector {
     constructor(_a) {
@@ -27,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;
@@ -40,33 +40,33 @@ 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) {
-        var _a;
+    getAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             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) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.isInstalledOnBrowser()) {
                 return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
             }
@@ -80,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);
             }

package/src/ethProviderHelper.d.ts

@@ -2,9 +2,11 @@ import { Hex, WalletClient } from 'viem';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ProviderFlag } from './types';
+import { EthWalletConnector } from '.';
 export declare class EthProviderHelper {
     private wallet;
-    constructor(wallet: WalletSchema);
+    private connector;
+    constructor(wallet: WalletSchema, connector: EthWalletConnector);
     getInstalledProvider(): IEthereum | undefined;
     getEip6963Config(): {
         rdns: string;
@@ -27,9 +29,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

@@ -2,11 +2,13 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
 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 {
-    constructor(wallet) {
+    constructor(wallet, connector) {
         this.wallet = wallet;
+        this.connector = connector;
     }
     getInstalledProvider() {
         const eip6963Config = this.getEip6963Config();
@@ -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.connector.getActiveAccount(),
+            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.connector.setActiveAccount(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);
             }