@dynamic-labs/multi-wallet 0.16.15 → 0.16.17-viem.0

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts

@@ -1,5 +1,5 @@
 import { LoginWithMagicLinkEvents, MagicUserMetadata, PromiEvent } from 'magic-sdk';
-import { ethers } from 'ethers';
+import { PublicClient, WalletClient } from 'viem';
 import { Chain, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletUiUtils } from '../../../../types';
 import { CancellablePromise } from '../../../../utils/CancellablePromise';
@@ -39,9 +39,9 @@ export declare abstract class MagicWalletConnector extends MagicClientNetworkHan
     getBalance(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
     getNetwork(): Promise<number | undefined>;
-    getRpcProvider(): Promise<void | ethers.providers.JsonRpcProvider | undefined>;
-    getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;
-    getWeb3Provider(): Promise<ethers.providers.Web3Provider>;
+    getRpcProvider(): Promise<void | PublicClient | undefined>;
+    getSigner(): Promise<WalletClient>;
+    getWeb3Provider(): Promise<PublicClient>;
     isInstalledOnBrowser(): boolean;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     setupEventListeners(listeners: WalletEventListeners): void;

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js

@@ -1,8 +1,6 @@
 import { __awaiter } from 'tslib';
-import { ethers } from 'ethers';
-import { DynamicError } from '../../../../errors.js';
+import { formatEther, createWalletClient, custom, createPublicClient, fromHex } from 'viem';
 import { logger } from '../../../../utils/logger.js';
-import { assignConfirmationScreenToProvider } from '../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js';
 import { CancellablePromise } from '../../../../utils/CancellablePromise/CancellablePromise.js';
 import { MagicClientNetworkHandler } from '../MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 
@@ -80,12 +78,10 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
+            const signer = yield this.getSigner();
             const provider = yield this.getWeb3Provider();
-            if (!provider)
-                throw new DynamicError('No provider');
-            const signer = provider.getSigner();
-            const userAddress = yield signer.getAddress();
-            return ethers.utils.formatEther(yield provider.getBalance(userAddress));
+            const [userAddress] = yield signer.getAddresses();
+            return formatEther(yield provider.getBalance({ address: userAddress }));
         });
     }
     getConnectedAccounts() {
@@ -109,15 +105,37 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = yield this.getWeb3Provider();
-            return provider.getSigner();
+            return createWalletClient({ transport: custom(provider) });
         });
     }
     getWeb3Provider() {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.getClient();
-            const provider = new ethers.providers.Web3Provider(client.rpcProvider);
-            assignConfirmationScreenToProvider(provider, this._walletUiUtils);
-            return provider;
+            const publicClient = createPublicClient({
+                transport: custom({
+                    request: (args) => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        if (args.method === 'personal_sign') {
+                            return this._walletUiUtils.signMessage({
+                                handler: () => client.rpcProvider.request(args),
+                                message: fromHex((_a = args.params) === null || _a === void 0 ? void 0 : _a[0], 'string'),
+                            });
+                        }
+                        else if (args.method === 'eth_sendTransaction') {
+                            return this._walletUiUtils.sendTransaction({
+                                handler: () => client.rpcProvider.request(args),
+                                transaction: (_b = args.params) === null || _b === void 0 ? void 0 : _b[0],
+                            });
+                        }
+                        else {
+                            return client.rpcProvider.request(args);
+                        }
+                    }),
+                }, {
+                    retryCount: 0,
+                }),
+            });
+            return publicClient;
         });
     }
     isInstalledOnBrowser() {
@@ -136,8 +154,11 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = yield this.getWeb3Provider();
-            return provider.getSigner().signMessage(messageToSign);
+            const signer = yield this.getSigner();
+            return signer.signMessage({
+                account: (yield this.fetchPublicAddress()),
+                message: messageToSign,
+            });
         });
     }
     supportsNetworkSwitching() {

package/src/wallets/ethereum/coinbase.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var tslib = require('tslib');
-var ethers = require('ethers');
+var viem = require('viem');
 var coinbase = require('../clients/coinbase/coinbase.cjs');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
@@ -27,18 +27,29 @@ class Coinbase extends ethProvider.EthProvider {
         return normalizeWalletName.normalizeWalletName(this.name);
     }
     setupEventListeners(listeners) {
-        return this.ethProviderHelper._setupEventListeners(listeners, this.getWeb3Provider());
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (!provider) {
+            return () => { };
+        }
+        return this.ethProviderHelper._setupEventListeners(listeners, this.name, viem.createPublicClient({
+            transport: viem.custom(provider),
+        }));
     }
     teardownEventListeners() {
         return this.ethProviderHelper._teardownEventListeners(this.name);
     }
     getWeb3Provider() {
-        if (this.isInstalledOnBrowser()) {
-            return this.ethProviderHelper.findProvider(this.name);
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (this.isInstalledOnBrowser() && provider) {
+            return viem.createWalletClient({
+                transport: viem.custom(provider),
+            });
         }
-        return new ethers.ethers.providers.Web3Provider(coinbase.getCoinbaseProvider({
-            opts: this.coinbaseProviderOpts,
-        }), 'any');
+        return viem.createWalletClient({
+            transport: viem.custom(coinbase.getCoinbaseProvider({
+                opts: this.coinbaseProviderOpts,
+            })),
+        });
     }
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);

package/src/wallets/ethereum/coinbase.d.ts

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers';
+import { WalletClient } from 'viem';
 import { Chain, FetchPublicAddressOpts, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
 import { EthProvider } from './ethProvider';
@@ -17,10 +17,12 @@ declare class Coinbase extends EthProvider implements WalletConnector {
         appName?: string;
         evmNetworks: EvmNetwork[];
     });
+    providerResources: string[] | undefined;
+    switchNetworkOnlyFromWallet: boolean | undefined;
     get key(): string;
     setupEventListeners(listeners: WalletEventListeners): () => void;
     teardownEventListeners(): void;
-    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
+    getWeb3Provider(): WalletClient;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;

package/src/wallets/ethereum/coinbase.js

@@ -1,5 +1,5 @@
 import { __awaiter } from 'tslib';
-import { ethers } from 'ethers';
+import { createPublicClient, custom, createWalletClient } from 'viem';
 import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from '../clients/coinbase/coinbase.js';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 import { EthProviderHelper } from './ethProviderHelper.js';
@@ -25,18 +25,29 @@ class Coinbase extends EthProvider {
         return normalizeWalletName(this.name);
     }
     setupEventListeners(listeners) {
-        return this.ethProviderHelper._setupEventListeners(listeners, this.getWeb3Provider());
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (!provider) {
+            return () => { };
+        }
+        return this.ethProviderHelper._setupEventListeners(listeners, this.name, createPublicClient({
+            transport: custom(provider),
+        }));
     }
     teardownEventListeners() {
         return this.ethProviderHelper._teardownEventListeners(this.name);
     }
     getWeb3Provider() {
-        if (this.isInstalledOnBrowser()) {
-            return this.ethProviderHelper.findProvider(this.name);
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (this.isInstalledOnBrowser() && provider) {
+            return createWalletClient({
+                transport: custom(provider),
+            });
         }
-        return new ethers.providers.Web3Provider(getCoinbaseProvider({
-            opts: this.coinbaseProviderOpts,
-        }), 'any');
+        return createWalletClient({
+            transport: custom(getCoinbaseProvider({
+                opts: this.coinbaseProviderOpts,
+            })),
+        });
     }
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);

package/src/wallets/ethereum/ethProvider.cjs

@@ -3,9 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var ethers = require('ethers');
+var viem = require('viem');
 var errors = require('../../errors.cjs');
 var rpcProviders = require('../../rpcProviders.cjs');
+var getOrMapViemChain = require('../../getOrMapViemChain.cjs');
 var evmNetwork = require('./evm-network.cjs');
 
 class EthProvider {
@@ -33,16 +34,16 @@ class EthProvider {
     }
     constructor({ evmNetworks }) {
         this.getBalance = () => tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
             // This is equivalent to getSigner().getAddress() but does not crash
             // if the signer is not available
             const [address] = yield this.getConnectedAccounts();
             if (!address)
                 return;
-            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
-            if (!result)
+            const client = yield this.getRpcProvider();
+            const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({ address: address }));
+            if (!result && result !== BigInt(0))
                 return;
-            return ethers.ethers.utils.formatEther(result);
+            return viem.formatEther(result);
         });
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -55,20 +56,16 @@ class EthProvider {
     }
     getNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.getWeb3Provider();
-            if (!this.supportsNetworkSwitching ||
-                !provider ||
-                !('getNetwork' in provider)) {
+            const walletClient = this.getWeb3Provider();
+            if (!this.supportsNetworkSwitching || !walletClient) {
                 return Promise.resolve(undefined);
             }
-            const network = yield provider.getNetwork();
-            return Promise.resolve(network === null || network === void 0 ? void 0 : network.chainId);
+            return walletClient.getChainId();
         });
     }
     getSigner() {
-        var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getSigner();
+            return this.getWeb3Provider();
         });
     }
     supportsNetworkSwitching() {
@@ -99,7 +96,7 @@ class EthProvider {
             const provider = this.getWeb3Provider();
             if (!provider)
                 return [];
-            return provider.send('eth_accounts', []);
+            return provider.getAddresses();
         });
     }
     providerSwitchNetwork({ network, provider, }) {
@@ -114,11 +111,7 @@ class EthProvider {
                 if (!this.supportsNetworkSwitching()) {
                     throw new errors.DynamicError('Network switching is not supported');
                 }
-                return yield provider.send('wallet_switchEthereumChain', [
-                    {
-                        chainId: `0x${chainId.toString(16)}`,
-                    },
-                ]);
+                return yield provider.switchChain(getOrMapViemChain.getOrMapViemChain(network));
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
@@ -142,17 +135,8 @@ class EthProvider {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
             try {
-                return yield provider.send('wallet_addEthereumChain', [
-                    {
-                        blockExplorerUrls,
-                        chainId: `0x${chainId.toString(16)}`,
-                        chainName,
-                        nativeCurrency,
-                        rpcUrls,
-                    },
-                ]);
+                return yield provider.addChain({ chain: getOrMapViemChain.getOrMapViemChain(network) });
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||

package/src/wallets/ethereum/ethProvider.d.ts

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers';
+import { PublicClient, WalletClient } from 'viem';
 import { EvmNetwork } from './evm-network';
 export type SwitchNetworkOps = {
     networkChainId?: number;
@@ -9,25 +9,25 @@ type EvmRpcMap = {
 };
 export declare abstract class EthProvider {
     evmNetworks: EvmNetwork[];
-    abstract getWeb3Provider(): ethers.providers.Web3Provider | undefined;
+    abstract getWeb3Provider(): WalletClient | undefined;
     getDeepLink(): string | undefined;
-    getRpcProvider(): Promise<ethers.providers.JsonRpcProvider | undefined>;
+    getRpcProvider(): Promise<PublicClient | undefined>;
     constructor({ evmNetworks }: {
         evmNetworks: EvmNetwork[];
     });
     getNetwork(): Promise<number | undefined>;
-    getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;
+    getSigner(): Promise<WalletClient | undefined>;
     getBalance: () => Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
-    getConnectedAccounts(): Promise<string[]>;
+    getConnectedAccounts(): Promise<`0x${string}`[]>;
     protected providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: ethers.providers.Web3Provider;
+        provider: WalletClient;
     }): Promise<void>;
     protected providerAddNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: ethers.providers.Web3Provider;
+        provider: WalletClient;
     }): Promise<void>;
     protected evmNetworkRpcMap: () => EvmRpcMap;
 }

package/src/wallets/ethereum/ethProvider.js

@@ -1,7 +1,8 @@
 import { __awaiter } from 'tslib';
-import { ethers } from 'ethers';
+import { formatEther } from 'viem';
 import { DynamicError } from '../../errors.js';
 import { getEvmDefaultRpcProvider, getEvmRpcProviderByChainId } from '../../rpcProviders.js';
+import { getOrMapViemChain } from '../../getOrMapViemChain.js';
 import { findEvmNetwork } from './evm-network.js';
 
 class EthProvider {
@@ -29,16 +30,16 @@ class EthProvider {
     }
     constructor({ evmNetworks }) {
         this.getBalance = () => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             // This is equivalent to getSigner().getAddress() but does not crash
             // if the signer is not available
             const [address] = yield this.getConnectedAccounts();
             if (!address)
                 return;
-            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
-            if (!result)
+            const client = yield this.getRpcProvider();
+            const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({ address: address }));
+            if (!result && result !== BigInt(0))
                 return;
-            return ethers.utils.formatEther(result);
+            return formatEther(result);
         });
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -51,20 +52,16 @@ class EthProvider {
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.getWeb3Provider();
-            if (!this.supportsNetworkSwitching ||
-                !provider ||
-                !('getNetwork' in provider)) {
+            const walletClient = this.getWeb3Provider();
+            if (!this.supportsNetworkSwitching || !walletClient) {
                 return Promise.resolve(undefined);
             }
-            const network = yield provider.getNetwork();
-            return Promise.resolve(network === null || network === void 0 ? void 0 : network.chainId);
+            return walletClient.getChainId();
         });
     }
     getSigner() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getSigner();
+            return this.getWeb3Provider();
         });
     }
     supportsNetworkSwitching() {
@@ -95,7 +92,7 @@ class EthProvider {
             const provider = this.getWeb3Provider();
             if (!provider)
                 return [];
-            return provider.send('eth_accounts', []);
+            return provider.getAddresses();
         });
     }
     providerSwitchNetwork({ network, provider, }) {
@@ -110,11 +107,7 @@ class EthProvider {
                 if (!this.supportsNetworkSwitching()) {
                     throw new DynamicError('Network switching is not supported');
                 }
-                return yield provider.send('wallet_switchEthereumChain', [
-                    {
-                        chainId: `0x${chainId.toString(16)}`,
-                    },
-                ]);
+                return yield provider.switchChain(getOrMapViemChain(network));
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
@@ -138,17 +131,8 @@ class EthProvider {
     providerAddNetwork({ network, provider, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { blockExplorerUrls, chainId, nativeCurrency, rpcUrls, chainName } = network;
             try {
-                return yield provider.send('wallet_addEthereumChain', [
-                    {
-                        blockExplorerUrls,
-                        chainId: `0x${chainId.toString(16)}`,
-                        chainName,
-                        nativeCurrency,
-                        rpcUrls,
-                    },
-                ]);
+                return yield provider.addChain({ chain: getOrMapViemChain(network) });
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||

package/src/wallets/ethereum/ethProviderHelper.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var ethers = require('ethers');
+var viem = require('viem');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ProviderLookup = require('../ProviderLookup.cjs');
 var isUnsupportedProviderError = require('../../utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
@@ -87,16 +87,10 @@ class EthProviderHelper {
         }
         return ethereumProviders;
     }
-    isInstalledHelper(walletName) {
-        return this.findProvider(walletName) !== undefined;
-    }
     findProvider(walletName) {
         var _a, _b;
         try {
-            const provider = (_b = (_a = this.providers)[normalizeWalletName.normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
-            return provider === undefined
-                ? undefined
-                : new ethers.ethers.providers.Web3Provider(provider, 'any'); // https://github.com/ethers-io/ethers.js/discussions/1480
+            return (_b = (_a = this.providers)[normalizeWalletName.normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
         }
         catch (err) {
             if (isUnsupportedProviderError.isUnsupportedProviderError(err)) {
@@ -107,20 +101,46 @@ class EthProviderHelper {
             return undefined;
         }
     }
+    isInstalledHelper(walletName) {
+        return this.findProvider(walletName) !== undefined;
+    }
+    findWalletClient(walletName) {
+        var _a, _b;
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const provider = (_b = (_a = this.providers)[normalizeWalletName.normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
+                if (provider) {
+                    const [account] = yield provider.request({
+                        method: 'eth_requestAccounts',
+                    });
+                    return viem.createWalletClient({ account, transport: viem.custom(provider) });
+                }
+                return undefined;
+            }
+            catch (err) {
+                if (isUnsupportedProviderError.isUnsupportedProviderError(err)) {
+                    logger.logger.error(`ETH Provider is not supported ${err.value}`, err);
+                    return;
+                }
+                logger.logger.error(`Could not find provider for ${walletName}`, err);
+                return undefined;
+            }
+        });
+    }
     fetchPublicAddressWithName(name) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider(name);
-            if (!provider) {
+            const walletClient = yield this.findWalletClient(name);
+            if (!walletClient) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithProvider(provider);
+            return this.fetchPublicAddressWithWalletClient(walletClient);
         });
     }
-    fetchPublicAddressWithProvider(provider) {
+    fetchPublicAddressWithWalletClient(walletClient) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             try {
-                const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
-                const publicAddress = ethers.utils.getAddress(lowercaseAddress);
+                const [lowercaseAddress] = yield walletClient.requestAddresses();
+                const publicAddress = viem.getAddress(lowercaseAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -135,22 +155,24 @@ class EthProviderHelper {
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }
-            const provider = this.findProvider(name);
-            if (!provider) {
+            const walletClient = yield this.findWalletClient(name);
+            if (!walletClient) {
                 return Promise.resolve(undefined);
             }
-            const signer = provider.getSigner();
-            const signedMessage = yield signer.signMessage(messageToSign);
+            const signedMessage = yield walletClient.signMessage({
+                account: walletAddress,
+                message: messageToSign,
+            });
             return signedMessage;
         });
     }
-    _setupEventListeners(listeners, web3Provider) {
-        if (!web3Provider) {
+    _setupEventListeners(listeners, walletName, publicClient) {
+        const provider = this.findProvider(walletName);
+        if (!provider) {
             return () => {
                 // nothing to teardown
             };
         }
-        const externalProvider = web3Provider.provider;
         this.handleAccountChange = (accounts) => tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (accounts.length === 0) {
@@ -161,8 +183,8 @@ class EthProviderHelper {
         });
         this.handleChainChange = () => tslib.__awaiter(this, void 0, void 0, function* () {
             var _c;
-            const network = yield web3Provider.getNetwork();
-            yield ((_c = listeners.onChainChange) === null || _c === void 0 ? void 0 : _c.call(listeners, network.chainId.toString()));
+            const chainId = yield publicClient.getChainId();
+            yield ((_c = listeners.onChainChange) === null || _c === void 0 ? void 0 : _c.call(listeners, chainId.toString()));
         });
         this.handleDisconnect = (error) => tslib.__awaiter(this, void 0, void 0, function* () {
             var _d;
@@ -171,25 +193,21 @@ class EthProviderHelper {
             }
             yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
         });
-        externalProvider.on('accountsChanged', this.handleAccountChange);
-        externalProvider.on('chainChanged', this.handleChainChange);
-        externalProvider.on('disconnect', this.handleDisconnect);
+        provider.on('accountsChanged', this.handleAccountChange);
+        provider.on('chainChanged', this.handleChainChange);
+        provider.on('disconnect', this.handleDisconnect);
         return () => { };
     }
     _teardownEventListeners(name) {
-        const web3Provider = this.findProvider(name);
-        if (!web3Provider || !(web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.provider)) {
+        const provider = this.findProvider(name);
+        if (!provider) {
             return;
         }
-        const externalProvider = web3Provider.provider;
-        if (this.handleAccountChange) {
-            externalProvider.removeListener('accountsChanged', this.handleAccountChange);
-        }
         if (this.handleChainChange) {
-            externalProvider.removeListener('chainChanged', this.handleChainChange);
+            provider.removeListener('chainChanged', this.handleChainChange);
         }
         if (this.handleDisconnect) {
-            externalProvider.removeListener('disconnect', this.handleDisconnect);
+            provider.removeListener('disconnect', this.handleDisconnect);
         }
     }
 }

package/src/wallets/ethereum/ethProviderHelper.d.ts

@@ -1,7 +1,6 @@
-import { ethers } from 'ethers';
+import { PublicClient, WalletClient } from 'viem';
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { ProviderCondition, IEthereum } from '../window';
-type Provider = () => ethers.providers.ExternalProvider | undefined;
 type AccountChangeEventHandler = (accounts: string[]) => Promise<void>;
 type ChainChangeEventHandler = (chainId: string | number) => Promise<void>;
 type DisconnectEventHandler = (error?: {
@@ -11,30 +10,31 @@ export declare class EthProviderHelper {
     handleAccountChange: AccountChangeEventHandler | undefined;
     handleChainChange: ChainChangeEventHandler | undefined;
     handleDisconnect: DisconnectEventHandler | undefined;
-    MetamaskProvider: Provider;
-    BraveProvider: Provider;
-    DawnProvider: Provider;
-    FrameProvider: Provider;
-    CoinbaseProvider: Provider;
-    OperaProvider: Provider;
-    GameStopProvider: Provider;
-    ExodusProvider: Provider;
-    BloctoProvider: Provider;
-    TrustWalletProvider: Provider;
-    PhantomProvider: Provider;
-    ZerionProvider: Provider;
-    UnknownInjectedProvider: Provider;
+    MetamaskProvider: () => IEthereum | undefined;
+    BraveProvider: () => IEthereum | undefined;
+    DawnProvider: () => IEthereum | undefined;
+    FrameProvider: () => IEthereum | undefined;
+    CoinbaseProvider: () => IEthereum | undefined;
+    OperaProvider: () => IEthereum | undefined;
+    GameStopProvider: () => IEthereum | undefined;
+    ExodusProvider: () => IEthereum | undefined;
+    BloctoProvider: () => IEthereum | undefined;
+    TrustWalletProvider: () => IEthereum | undefined;
+    PhantomProvider: () => IEthereum | undefined;
+    ZerionProvider: () => IEthereum | undefined;
+    UnknownInjectedProvider: () => IEthereum | undefined;
     providers: {
-        [wallet: string]: Provider;
+        [wallet: string]: () => IEthereum | undefined;
     };
     installedProviderLookup(providerFlags: Array<ProviderCondition>): IEthereum | undefined;
     allInstalledProviders(): IEthereum[];
+    findProvider(walletName: string): IEthereum | undefined;
     isInstalledHelper(walletName: string): boolean;
-    findProvider(walletName: string): ethers.providers.Web3Provider | undefined;
-    fetchPublicAddressWithName(name: string): Promise<string | undefined>;
-    fetchPublicAddressWithProvider(provider: ethers.providers.Web3Provider): Promise<string | undefined>;
+    findWalletClient(walletName: string): Promise<WalletClient | undefined>;
+    fetchPublicAddressWithName(name: string): Promise<`0x${string}` | undefined>;
+    fetchPublicAddressWithWalletClient(walletClient: WalletClient): Promise<`0x${string}` | undefined>;
     signMessageWithName(messageToSign: string, name: string): Promise<string | undefined>;
-    _setupEventListeners(listeners: WalletEventListeners, web3Provider?: ethers.providers.Web3Provider): () => void;
+    _setupEventListeners(listeners: WalletEventListeners, walletName: string, publicClient: PublicClient): () => void;
     _teardownEventListeners(name: string): void;
 }
 export {};