@dynamic-labs/multi-wallet 0.16.12-viem.1 → 0.16.13

package/src/wallets/ethereum/coinbase.js

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

package/src/wallets/ethereum/ethProvider.cjs

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var viem = require('viem');
+var ethers = require('ethers');
 var errors = require('../../errors.cjs');
 var rpcProviders = require('../../rpcProviders.cjs');
-var getOrMapViemChain = require('../../getOrMapViemChain.cjs');
 var evmNetwork = require('./evm-network.cjs');
 
 class EthProvider {
@@ -34,16 +33,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 client = yield this.getRpcProvider();
-            const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({ address: address }));
-            if (!result && result !== BigInt(0))
+            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
+            if (!result)
                 return;
-            return viem.formatEther(result);
+            return ethers.ethers.utils.formatEther(result);
         });
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -56,16 +55,20 @@ class EthProvider {
     }
     getNetwork() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletClient = this.getWeb3Provider();
-            if (!this.supportsNetworkSwitching || !walletClient) {
+            const provider = this.getWeb3Provider();
+            if (!this.supportsNetworkSwitching ||
+                !provider ||
+                !('getNetwork' in provider)) {
                 return Promise.resolve(undefined);
             }
-            return walletClient.getChainId();
+            const network = yield provider.getNetwork();
+            return Promise.resolve(network === null || network === void 0 ? void 0 : network.chainId);
         });
     }
     getSigner() {
+        var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.getWeb3Provider();
+            return (_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getSigner();
         });
     }
     supportsNetworkSwitching() {
@@ -96,7 +99,7 @@ class EthProvider {
             const provider = this.getWeb3Provider();
             if (!provider)
                 return [];
-            return provider.getAddresses();
+            return provider.send('eth_accounts', []);
         });
     }
     providerSwitchNetwork({ network, provider, }) {
@@ -111,7 +114,11 @@ class EthProvider {
                 if (!this.supportsNetworkSwitching()) {
                     throw new errors.DynamicError('Network switching is not supported');
                 }
-                return yield provider.switchChain(getOrMapViemChain.getOrMapViemChain(network));
+                return yield provider.send('wallet_switchEthereumChain', [
+                    {
+                        chainId: `0x${chainId.toString(16)}`,
+                    },
+                ]);
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
@@ -135,8 +142,17 @@ 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.addChain({ chain: getOrMapViemChain.getOrMapViemChain(network) });
+                return yield provider.send('wallet_addEthereumChain', [
+                    {
+                        blockExplorerUrls,
+                        chainId: `0x${chainId.toString(16)}`,
+                        chainName,
+                        nativeCurrency,
+                        rpcUrls,
+                    },
+                ]);
             }
             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 { PublicClient, WalletClient } from 'viem';
+import { ethers } from 'ethers';
 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(): WalletClient | undefined;
+    abstract getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     getDeepLink(): string | undefined;
-    getRpcProvider(): Promise<PublicClient | undefined>;
+    getRpcProvider(): Promise<ethers.providers.JsonRpcProvider | undefined>;
     constructor({ evmNetworks }: {
         evmNetworks: EvmNetwork[];
     });
     getNetwork(): Promise<number | undefined>;
-    getSigner(): Promise<WalletClient | undefined>;
+    getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;
     getBalance: () => Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
-    getConnectedAccounts(): Promise<`0x${string}`[]>;
+    getConnectedAccounts(): Promise<string[]>;
     protected providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: WalletClient;
+        provider: ethers.providers.Web3Provider;
     }): Promise<void>;
     protected providerAddNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: WalletClient;
+        provider: ethers.providers.Web3Provider;
     }): Promise<void>;
     protected evmNetworkRpcMap: () => EvmRpcMap;
 }

package/src/wallets/ethereum/ethProvider.js

@@ -1,8 +1,7 @@
 import { __awaiter } from 'tslib';
-import { formatEther } from 'viem';
+import { ethers } from 'ethers';
 import { DynamicError } from '../../errors.js';
 import { getEvmDefaultRpcProvider, getEvmRpcProviderByChainId } from '../../rpcProviders.js';
-import { getOrMapViemChain } from '../../getOrMapViemChain.js';
 import { findEvmNetwork } from './evm-network.js';
 
 class EthProvider {
@@ -30,16 +29,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 client = yield this.getRpcProvider();
-            const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({ address: address }));
-            if (!result && result !== BigInt(0))
+            const result = yield ((_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getBalance(address));
+            if (!result)
                 return;
-            return formatEther(result);
+            return ethers.utils.formatEther(result);
         });
         this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
             var _a;
@@ -52,16 +51,20 @@ class EthProvider {
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            const walletClient = this.getWeb3Provider();
-            if (!this.supportsNetworkSwitching || !walletClient) {
+            const provider = this.getWeb3Provider();
+            if (!this.supportsNetworkSwitching ||
+                !provider ||
+                !('getNetwork' in provider)) {
                 return Promise.resolve(undefined);
             }
-            return walletClient.getChainId();
+            const network = yield provider.getNetwork();
+            return Promise.resolve(network === null || network === void 0 ? void 0 : network.chainId);
         });
     }
     getSigner() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getWeb3Provider();
+            return (_a = this.getWeb3Provider()) === null || _a === void 0 ? void 0 : _a.getSigner();
         });
     }
     supportsNetworkSwitching() {
@@ -92,7 +95,7 @@ class EthProvider {
             const provider = this.getWeb3Provider();
             if (!provider)
                 return [];
-            return provider.getAddresses();
+            return provider.send('eth_accounts', []);
         });
     }
     providerSwitchNetwork({ network, provider, }) {
@@ -107,7 +110,11 @@ class EthProvider {
                 if (!this.supportsNetworkSwitching()) {
                     throw new DynamicError('Network switching is not supported');
                 }
-                return yield provider.switchChain(getOrMapViemChain(network));
+                return yield provider.send('wallet_switchEthereumChain', [
+                    {
+                        chainId: `0x${chainId.toString(16)}`,
+                    },
+                ]);
             }
             catch (error) {
                 if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
@@ -131,8 +138,17 @@ 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.addChain({ chain: getOrMapViemChain(network) });
+                return yield provider.send('wallet_addEthereumChain', [
+                    {
+                        blockExplorerUrls,
+                        chainId: `0x${chainId.toString(16)}`,
+                        chainName,
+                        nativeCurrency,
+                        rpcUrls,
+                    },
+                ]);
             }
             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 viem = require('viem');
+var ethers = require('ethers');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ProviderLookup = require('../ProviderLookup.cjs');
 var isUnsupportedProviderError = require('../../utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
@@ -87,10 +87,16 @@ class EthProviderHelper {
         }
         return ethereumProviders;
     }
+    isInstalledHelper(walletName) {
+        return this.findProvider(walletName) !== undefined;
+    }
     findProvider(walletName) {
         var _a, _b;
         try {
-            return (_b = (_a = this.providers)[normalizeWalletName.normalizeWalletName(walletName)]) === null || _b === void 0 ? void 0 : _b.call(_a);
+            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
         }
         catch (err) {
             if (isUnsupportedProviderError.isUnsupportedProviderError(err)) {
@@ -101,46 +107,20 @@ 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 walletClient = yield this.findWalletClient(name);
-            if (!walletClient) {
+            const provider = this.findProvider(name);
+            if (!provider) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithWalletClient(walletClient);
+            return this.fetchPublicAddressWithProvider(provider);
         });
     }
-    fetchPublicAddressWithWalletClient(walletClient) {
+    fetchPublicAddressWithProvider(provider) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             try {
-                const [lowercaseAddress] = yield walletClient.requestAddresses();
-                const publicAddress = viem.getAddress(lowercaseAddress);
+                const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
+                const publicAddress = ethers.utils.getAddress(lowercaseAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -155,24 +135,22 @@ class EthProviderHelper {
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }
-            const walletClient = yield this.findWalletClient(name);
-            if (!walletClient) {
+            const provider = this.findProvider(name);
+            if (!provider) {
                 return Promise.resolve(undefined);
             }
-            const signedMessage = yield walletClient.signMessage({
-                account: walletAddress,
-                message: messageToSign,
-            });
+            const signer = provider.getSigner();
+            const signedMessage = yield signer.signMessage(messageToSign);
             return signedMessage;
         });
     }
-    _setupEventListeners(listeners, walletName, publicClient) {
-        const provider = this.findProvider(walletName);
-        if (!provider) {
+    _setupEventListeners(listeners, web3Provider) {
+        if (!web3Provider) {
             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) {
@@ -183,8 +161,8 @@ class EthProviderHelper {
         });
         this.handleChainChange = () => tslib.__awaiter(this, void 0, void 0, function* () {
             var _c;
-            const chainId = yield publicClient.getChainId();
-            yield ((_c = listeners.onChainChange) === null || _c === void 0 ? void 0 : _c.call(listeners, chainId.toString()));
+            const network = yield web3Provider.getNetwork();
+            yield ((_c = listeners.onChainChange) === null || _c === void 0 ? void 0 : _c.call(listeners, network.chainId.toString()));
         });
         this.handleDisconnect = (error) => tslib.__awaiter(this, void 0, void 0, function* () {
             var _d;
@@ -193,21 +171,25 @@ class EthProviderHelper {
             }
             yield ((_d = listeners.onDisconnect) === null || _d === void 0 ? void 0 : _d.call(listeners));
         });
-        provider.on('accountsChanged', this.handleAccountChange);
-        provider.on('chainChanged', this.handleChainChange);
-        provider.on('disconnect', this.handleDisconnect);
+        externalProvider.on('accountsChanged', this.handleAccountChange);
+        externalProvider.on('chainChanged', this.handleChainChange);
+        externalProvider.on('disconnect', this.handleDisconnect);
         return () => { };
     }
     _teardownEventListeners(name) {
-        const provider = this.findProvider(name);
-        if (!provider) {
+        const web3Provider = this.findProvider(name);
+        if (!web3Provider || !(web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.provider)) {
             return;
         }
+        const externalProvider = web3Provider.provider;
+        if (this.handleAccountChange) {
+            externalProvider.removeListener('accountsChanged', this.handleAccountChange);
+        }
         if (this.handleChainChange) {
-            provider.removeListener('chainChanged', this.handleChainChange);
+            externalProvider.removeListener('chainChanged', this.handleChainChange);
         }
         if (this.handleDisconnect) {
-            provider.removeListener('disconnect', this.handleDisconnect);
+            externalProvider.removeListener('disconnect', this.handleDisconnect);
         }
     }
 }

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

@@ -1,6 +1,7 @@
-import { PublicClient, WalletClient } from 'viem';
+import { ethers } from 'ethers';
 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?: {
@@ -10,31 +11,30 @@ export declare class EthProviderHelper {
     handleAccountChange: AccountChangeEventHandler | undefined;
     handleChainChange: ChainChangeEventHandler | undefined;
     handleDisconnect: DisconnectEventHandler | undefined;
-    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;
+    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;
     providers: {
-        [wallet: string]: () => IEthereum | undefined;
+        [wallet: string]: Provider;
     };
     installedProviderLookup(providerFlags: Array<ProviderCondition>): IEthereum | undefined;
     allInstalledProviders(): IEthereum[];
-    findProvider(walletName: string): IEthereum | undefined;
     isInstalledHelper(walletName: string): boolean;
-    findWalletClient(walletName: string): Promise<WalletClient | undefined>;
-    fetchPublicAddressWithName(name: string): Promise<`0x${string}` | undefined>;
-    fetchPublicAddressWithWalletClient(walletClient: WalletClient): Promise<`0x${string}` | undefined>;
+    findProvider(walletName: string): ethers.providers.Web3Provider | undefined;
+    fetchPublicAddressWithName(name: string): Promise<string | undefined>;
+    fetchPublicAddressWithProvider(provider: ethers.providers.Web3Provider): Promise<string | undefined>;
     signMessageWithName(messageToSign: string, name: string): Promise<string | undefined>;
-    _setupEventListeners(listeners: WalletEventListeners, walletName: string, publicClient: PublicClient): () => void;
+    _setupEventListeners(listeners: WalletEventListeners, web3Provider?: ethers.providers.Web3Provider): () => void;
     _teardownEventListeners(name: string): void;
 }
 export {};

package/src/wallets/ethereum/ethProviderHelper.js

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