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

package/src/wallets/ethereum/BloctoEvm.cjs

@@ -0,0 +1,140 @@
+'use strict';
+
+var tslib = require('tslib');
+var BloctoSDK = require('@blocto/sdk');
+var ethers = require('ethers');
+var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
+var logger = require('../../utils/logger.cjs');
+var ethProvider = require('./ethProvider.cjs');
+var ethProviderHelper = require('./ethProviderHelper.cjs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var BloctoSDK__default = /*#__PURE__*/_interopDefaultLegacy(BloctoSDK);
+
+class BloctoEvm extends ethProvider.EthProvider {
+    constructor({ evmNetworks }) {
+        var _a, _b;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
+        super({ evmNetworks: bloctoSupportedNetworks });
+        this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
+        this.name = 'bloctoevm';
+        this.canConnectViaQrCode = false;
+        this.canConnectViaCustodialService = true;
+        this.isWalletConnect = false;
+        this.connectedChain = 'EVM';
+        this.supportedChains = ['EVM', 'ETH'];
+        this.ethProviderHelper = new ethProviderHelper.EthProviderHelper();
+        this.supportsNetworkSwitching = () => false;
+        this.chainId =
+            Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
+                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+    }
+    get key() {
+        return normalizeWalletName.normalizeWalletName(this.name);
+    }
+    getClient() {
+        if (!this.client) {
+            const network = this.evmNetworks.find((n) => n.chainId === this.chainId);
+            if (network) {
+                this.client = new BloctoSDK__default["default"]({
+                    ethereum: {
+                        chainId: `0x${this.chainId.toString(16)}`,
+                        rpc: network.rpcUrls[0],
+                    },
+                });
+            }
+            else {
+                logger.logger.error("Couldn't find a configured network for Blocto EVM");
+            }
+        }
+        return this.client;
+    }
+    getWeb3Provider() {
+        const client = this.getClient();
+        // If there are no accounts yet, we shouldn't wrap the provider in ethers
+        if (client && client.ethereum && client.ethereum.accounts.length > 0) {
+            return new ethers.ethers.providers.Web3Provider(client.ethereum);
+        }
+        else {
+            return undefined;
+        }
+    }
+    // We are calling the client directly and not via Web3Provider because if we will wrap it in Ethers,
+    // Ethers will be making retries on failure. This becomes an issue on the connect step.
+    // When Blocto's modal closes prior to receiving a response with the address on the connect step,
+    // then ethers would retry and the modal will open again.
+    fetchPublicAddress() {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const client = this.getClient();
+                if (client && client.ethereum) {
+                    const addresses = yield client.ethereum.request({
+                        method: 'eth_requestAccounts',
+                    });
+                    if (addresses.length > 0) {
+                        return addresses[0];
+                    }
+                }
+                return undefined;
+            }
+            catch (e) {
+                logger.logger.error(e);
+                return Promise.reject(e);
+            }
+        });
+    }
+    connect() {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.fetchPublicAddress();
+        });
+    }
+    isInstalledOnBrowser() {
+        return false;
+    }
+    proveOwnership(messageToSign) {
+        return this.signMessage(messageToSign);
+    }
+    signMessage(messageToSign) {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const signer = yield this.getSigner();
+                return yield (signer === null || signer === void 0 ? void 0 : signer.signMessage(messageToSign));
+            }
+            catch (e) {
+                if (e.message === 'User declined the signing request') {
+                    return Promise.reject({ code: '4001' });
+                }
+                else {
+                    return Promise.reject(e);
+                }
+            }
+        });
+    }
+    endSession() {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            const client = this.getClient();
+            localStorage.removeItem('sdk.session');
+            if (client && client.ethereum && client.ethereum.accounts.length > 0) {
+                yield client.ethereum.request({ method: 'wallet_disconnect' });
+            }
+        });
+    }
+    // *********************
+    // Unimplemented methods
+    // *********************
+    switchNetwork() {
+        return Promise.resolve();
+    }
+    setupEventListeners() {
+        return;
+    }
+    teardownEventListeners() {
+        return;
+    }
+}
+
+module.exports = BloctoEvm;

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

@@ -1,4 +1,4 @@
-import { WalletClient } from 'viem';
+import { ethers } from 'ethers';
 import { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from './evm-network';
 import { EthProvider } from './ethProvider';
@@ -18,11 +18,9 @@ declare class BloctoEvm extends EthProvider implements WalletConnector {
     constructor({ evmNetworks }: {
         evmNetworks: EvmNetwork[];
     });
-    providerResources: string[] | undefined;
-    switchNetworkOnlyFromWallet: boolean | undefined;
     get key(): string;
     private getClient;
-    getWeb3Provider(): WalletClient | undefined;
+    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     fetchPublicAddress(): Promise<string | undefined>;
     connect(): Promise<void>;
     isInstalledOnBrowser(): boolean;

package/src/wallets/ethereum/BloctoEvm.js

@@ -0,0 +1,134 @@
+import { __awaiter } from 'tslib';
+import BloctoSDK from '@blocto/sdk';
+import { ethers } from 'ethers';
+import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
+import { logger } from '../../utils/logger.js';
+import { EthProvider } from './ethProvider.js';
+import { EthProviderHelper } from './ethProviderHelper.js';
+
+class BloctoEvm extends EthProvider {
+    constructor({ evmNetworks }) {
+        var _a, _b;
+        // Taken from : https://docs.blocto.app/blocto-sdk/javascript-sdk/evm-sdk/provider
+        const BLOCTO_SUPPORTED_CHAIN_IDS = [1, 4, 56, 97, 137, 80001, 43114, 43113];
+        const bloctoSupportedNetworks = evmNetworks.filter((n) => BLOCTO_SUPPORTED_CHAIN_IDS.includes(n.chainId));
+        super({ evmNetworks: bloctoSupportedNetworks });
+        this.LOCAL_STORAGE_KEY = 'dynamic_blocto_evm_chain_id';
+        this.name = 'bloctoevm';
+        this.canConnectViaQrCode = false;
+        this.canConnectViaCustodialService = true;
+        this.isWalletConnect = false;
+        this.connectedChain = 'EVM';
+        this.supportedChains = ['EVM', 'ETH'];
+        this.ethProviderHelper = new EthProviderHelper();
+        this.supportsNetworkSwitching = () => false;
+        this.chainId =
+            Number(localStorage.getItem(this.LOCAL_STORAGE_KEY)) ||
+                ((_a = bloctoSupportedNetworks.find((n) => n.chainId === 137)) === null || _a === void 0 ? void 0 : _a.chainId) ||
+                ((_b = bloctoSupportedNetworks[0]) === null || _b === void 0 ? void 0 : _b.chainId);
+    }
+    get key() {
+        return normalizeWalletName(this.name);
+    }
+    getClient() {
+        if (!this.client) {
+            const network = this.evmNetworks.find((n) => n.chainId === this.chainId);
+            if (network) {
+                this.client = new BloctoSDK({
+                    ethereum: {
+                        chainId: `0x${this.chainId.toString(16)}`,
+                        rpc: network.rpcUrls[0],
+                    },
+                });
+            }
+            else {
+                logger.error("Couldn't find a configured network for Blocto EVM");
+            }
+        }
+        return this.client;
+    }
+    getWeb3Provider() {
+        const client = this.getClient();
+        // If there are no accounts yet, we shouldn't wrap the provider in ethers
+        if (client && client.ethereum && client.ethereum.accounts.length > 0) {
+            return new ethers.providers.Web3Provider(client.ethereum);
+        }
+        else {
+            return undefined;
+        }
+    }
+    // We are calling the client directly and not via Web3Provider because if we will wrap it in Ethers,
+    // Ethers will be making retries on failure. This becomes an issue on the connect step.
+    // When Blocto's modal closes prior to receiving a response with the address on the connect step,
+    // then ethers would retry and the modal will open again.
+    fetchPublicAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const client = this.getClient();
+                if (client && client.ethereum) {
+                    const addresses = yield client.ethereum.request({
+                        method: 'eth_requestAccounts',
+                    });
+                    if (addresses.length > 0) {
+                        return addresses[0];
+                    }
+                }
+                return undefined;
+            }
+            catch (e) {
+                logger.error(e);
+                return Promise.reject(e);
+            }
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.fetchPublicAddress();
+        });
+    }
+    isInstalledOnBrowser() {
+        return false;
+    }
+    proveOwnership(messageToSign) {
+        return this.signMessage(messageToSign);
+    }
+    signMessage(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const signer = yield this.getSigner();
+                return yield (signer === null || signer === void 0 ? void 0 : signer.signMessage(messageToSign));
+            }
+            catch (e) {
+                if (e.message === 'User declined the signing request') {
+                    return Promise.reject({ code: '4001' });
+                }
+                else {
+                    return Promise.reject(e);
+                }
+            }
+        });
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const client = this.getClient();
+            localStorage.removeItem('sdk.session');
+            if (client && client.ethereum && client.ethereum.accounts.length > 0) {
+                yield client.ethereum.request({ method: 'wallet_disconnect' });
+            }
+        });
+    }
+    // *********************
+    // Unimplemented methods
+    // *********************
+    switchNetwork() {
+        return Promise.resolve();
+    }
+    setupEventListeners() {
+        return;
+    }
+    teardownEventListeners() {
+        return;
+    }
+}
+
+export { BloctoEvm as default };

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var magicSdk = require('magic-sdk');
+var logger = require('../../../../utils/logger.cjs');
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -25,15 +26,21 @@ class MagicClientNetworkHandler {
         this._config = config;
         this._apiKey = apiKey;
         this.evmNetworks = evmNetworks;
-        this._networkId =
-            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
-                ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        if (this.lastUsedNetworkId) {
+            this._networkId = this.lastUsedNetworkId;
+        }
+        else {
+            this._networkId =
+                typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
+                    ? chainNameToChainIdMap[config.network]
+                    : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        }
     }
     selectNetwork(networkChainId) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function* () {
             this._networkId = networkChainId;
+            this.lastUsedNetworkId = networkChainId;
             (_a = this.onChainChanged) === null || _a === void 0 ? void 0 : _a.call(this, networkChainId);
         });
     }
@@ -91,6 +98,31 @@ class MagicClientNetworkHandler {
         var _a;
         return (_a = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId)) === null || _a === void 0 ? void 0 : _a.chainId;
     }
-}
+    get lastUsedNetworkId() {
+        const savedNetworkIdText = localStorage.getItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        if (!savedNetworkIdText)
+            return undefined;
+        try {
+            const networkId = parseInt(savedNetworkIdText);
+            if (isNaN(networkId)) {
+                return undefined;
+            }
+            return networkId;
+        }
+        catch (err) {
+            logger.logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedNetworkId(networkId) {
+        if (networkId === undefined) {
+            localStorage.removeItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        }
+        else {
+            localStorage.setItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey, networkId.toString());
+        }
+    }
+}
+MagicClientNetworkHandler.lastUsedNetworkIdStorageKey = 'magic-last-used-network-id';
 
 exports.MagicClientNetworkHandler = MagicClientNetworkHandler;

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

@@ -11,6 +11,7 @@ export declare abstract class MagicClientNetworkHandler {
     private _networkId;
     private _config;
     evmNetworks: EvmNetwork[];
+    static lastUsedNetworkIdStorageKey: string;
     constructor({ apiKey, evmNetworks, config }: MagicClientNetworkHandlerProps);
     abstract onChainChanged?(networkChainId: number): void;
     selectNetwork(networkChainId: number): Promise<void>;
@@ -21,4 +22,6 @@ export declare abstract class MagicClientNetworkHandler {
     private get configNetworkId();
     private _getRpcUrlByNetworkId;
     private _getChainIdByNetworkId;
+    get lastUsedNetworkId(): number | undefined;
+    set lastUsedNetworkId(networkId: number | undefined);
 }

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

@@ -1,5 +1,6 @@
 import { __awaiter } from 'tslib';
 import { Magic } from 'magic-sdk';
+import { logger } from '../../../../utils/logger.js';
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -21,15 +22,21 @@ class MagicClientNetworkHandler {
         this._config = config;
         this._apiKey = apiKey;
         this.evmNetworks = evmNetworks;
-        this._networkId =
-            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
-                ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        if (this.lastUsedNetworkId) {
+            this._networkId = this.lastUsedNetworkId;
+        }
+        else {
+            this._networkId =
+                typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
+                    ? chainNameToChainIdMap[config.network]
+                    : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+        }
     }
     selectNetwork(networkChainId) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this._networkId = networkChainId;
+            this.lastUsedNetworkId = networkChainId;
             (_a = this.onChainChanged) === null || _a === void 0 ? void 0 : _a.call(this, networkChainId);
         });
     }
@@ -87,6 +94,31 @@ class MagicClientNetworkHandler {
         var _a;
         return (_a = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId)) === null || _a === void 0 ? void 0 : _a.chainId;
     }
-}
+    get lastUsedNetworkId() {
+        const savedNetworkIdText = localStorage.getItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        if (!savedNetworkIdText)
+            return undefined;
+        try {
+            const networkId = parseInt(savedNetworkIdText);
+            if (isNaN(networkId)) {
+                return undefined;
+            }
+            return networkId;
+        }
+        catch (err) {
+            logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedNetworkId(networkId) {
+        if (networkId === undefined) {
+            localStorage.removeItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        }
+        else {
+            localStorage.setItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey, networkId.toString());
+        }
+    }
+}
+MagicClientNetworkHandler.lastUsedNetworkIdStorageKey = 'magic-last-used-network-id';
 
 export { MagicClientNetworkHandler };

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

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var viem = require('viem');
+var ethers = require('ethers');
+var errors = require('../../../../errors.cjs');
 var logger = require('../../../../utils/logger.cjs');
+var assignConfirmationScreenToProvider = require('../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.cjs');
 var CancellablePromise = require('../../../../utils/CancellablePromise/CancellablePromise.cjs');
 var MagicClientNetworkHandler = require('../MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 
@@ -82,10 +84,12 @@ class MagicWalletConnector extends MagicClientNetworkHandler.MagicClientNetworkH
     }
     getBalance() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const signer = yield this.getSigner();
             const provider = yield this.getWeb3Provider();
-            const [userAddress] = yield signer.getAddresses();
-            return viem.formatEther(yield provider.getBalance({ address: userAddress }));
+            if (!provider)
+                throw new errors.DynamicError('No provider');
+            const signer = provider.getSigner();
+            const userAddress = yield signer.getAddress();
+            return ethers.ethers.utils.formatEther(yield provider.getBalance(userAddress));
         });
     }
     getConnectedAccounts() {
@@ -109,37 +113,15 @@ class MagicWalletConnector extends MagicClientNetworkHandler.MagicClientNetworkH
     getSigner() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = yield this.getWeb3Provider();
-            return viem.createWalletClient({ transport: viem.custom(provider) });
+            return provider.getSigner();
         });
     }
     getWeb3Provider() {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const client = this.getClient();
-            const publicClient = viem.createPublicClient({
-                transport: viem.custom({
-                    request: (args) => tslib.__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: viem.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;
+            const provider = new ethers.ethers.providers.Web3Provider(client.rpcProvider);
+            assignConfirmationScreenToProvider.assignConfirmationScreenToProvider(provider, this._walletUiUtils);
+            return provider;
         });
     }
     isInstalledOnBrowser() {
@@ -158,11 +140,8 @@ class MagicWalletConnector extends MagicClientNetworkHandler.MagicClientNetworkH
     }
     signMessage(messageToSign) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            const signer = yield this.getSigner();
-            return signer.signMessage({
-                account: (yield this.fetchPublicAddress()),
-                message: messageToSign,
-            });
+            const provider = yield this.getWeb3Provider();
+            return provider.getSigner().signMessage(messageToSign);
         });
     }
     supportsNetworkSwitching() {

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

@@ -1,5 +1,5 @@
 import { LoginWithMagicLinkEvents, MagicUserMetadata, PromiEvent } from 'magic-sdk';
-import { PublicClient, WalletClient } from 'viem';
+import { ethers } from 'ethers';
 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 | PublicClient | undefined>;
-    getSigner(): Promise<WalletClient>;
-    getWeb3Provider(): Promise<PublicClient>;
+    getRpcProvider(): Promise<void | ethers.providers.JsonRpcProvider | undefined>;
+    getSigner(): Promise<ethers.providers.JsonRpcSigner | undefined>;
+    getWeb3Provider(): Promise<ethers.providers.Web3Provider>;
     isInstalledOnBrowser(): boolean;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     setupEventListeners(listeners: WalletEventListeners): void;

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

@@ -1,6 +1,8 @@
 import { __awaiter } from 'tslib';
-import { formatEther, createWalletClient, custom, createPublicClient, fromHex } from 'viem';
+import { ethers } from 'ethers';
+import { DynamicError } from '../../../../errors.js';
 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';
 
@@ -78,10 +80,12 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = yield this.getSigner();
             const provider = yield this.getWeb3Provider();
-            const [userAddress] = yield signer.getAddresses();
-            return formatEther(yield provider.getBalance({ address: userAddress }));
+            if (!provider)
+                throw new DynamicError('No provider');
+            const signer = provider.getSigner();
+            const userAddress = yield signer.getAddress();
+            return ethers.utils.formatEther(yield provider.getBalance(userAddress));
         });
     }
     getConnectedAccounts() {
@@ -105,37 +109,15 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = yield this.getWeb3Provider();
-            return createWalletClient({ transport: custom(provider) });
+            return provider.getSigner();
         });
     }
     getWeb3Provider() {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.getClient();
-            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;
+            const provider = new ethers.providers.Web3Provider(client.rpcProvider);
+            assignConfirmationScreenToProvider(provider, this._walletUiUtils);
+            return provider;
         });
     }
     isInstalledOnBrowser() {
@@ -154,11 +136,8 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = yield this.getSigner();
-            return signer.signMessage({
-                account: (yield this.fetchPublicAddress()),
-                message: messageToSign,
-            });
+            const provider = yield this.getWeb3Provider();
+            return provider.getSigner().signMessage(messageToSign);
         });
     }
     supportsNetworkSwitching() {

package/src/wallets/ethereum/coinbase.cjs

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