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

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [0.16.17-viem.0](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.16...v0.16.17-viem.0) (2023-05-12)
+
+
+### Features
+
+* replace ethers with viem ([995baa0](https://github.com/dynamic-labs/DynamicAuth/commit/995baa05fe13681e24388c55a6639779a88d78df))
+
 ### [0.16.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.15...v0.16.16) (2023-05-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/multi-wallet",
-  "version": "0.16.16",
+  "version": "0.16.17-viem.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -12,7 +12,7 @@
     "@dynamic-labs/sdk-api": "0.0.174",
     "@dynamic-labs/wallet-book": "^0.0.14",
     "starknet": "^3.19.0",
-    "ethers": "^5.7.2",
+    "viem": "^0.3.22",
     "@randlabs/myalgo-connect": "^1.4.2",
     "@solana/web3.js": "^1.70.1",
     "@coinbase/wallet-sdk": "^3.6.4",
@@ -28,8 +28,8 @@
     "magic-sdk": "^16.0.1",
     "@keplr-wallet/provider": "0.11.56",
     "@keplr-wallet/types": "^0.11.51",
-    "@dynamic-labs/logger": "0.16.16",
-    "@dynamic-labs/wallet-connector-core": "0.16.16"
+    "@dynamic-labs/logger": "0.16.17-viem.0",
+    "@dynamic-labs/wallet-connector-core": "0.16.17-viem.0"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.2.1"

package/src/getOrMapViemChain.cjs

@@ -0,0 +1,77 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var chains = require('viem/chains');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var chains__namespace = /*#__PURE__*/_interopNamespace(chains);
+
+// eslint-disable-next-line import/no-namespace
+/**
+ * Gets the chain object for the given chain id.
+ * @param chainId - Chain id of the target EVM chain.
+ * @returns Viem's chain object.
+ */
+const getChain = (chainId) => {
+    for (const chain of Object.values(chains__namespace)) {
+        if ('id' in chain) {
+            if (chain.id === chainId) {
+                return chain;
+            }
+        }
+    }
+    throw new Error(`Chain with id ${chainId} not found`);
+};
+const mapChain = (network) => {
+    var _a;
+    return ({
+        blockExplorers: ((_a = network.blockExplorerUrls) === null || _a === void 0 ? void 0 : _a[0])
+            ? {
+                default: {
+                    name: network.blockExplorerUrls[0],
+                    url: network.blockExplorerUrls[0],
+                },
+            }
+            : undefined,
+        id: network.chainId,
+        name: network.vanityName || network.chainName,
+        nativeCurrency: network.nativeCurrency,
+        network: network.chainName,
+        rpcUrls: {
+            default: { http: network.rpcUrls },
+            public: { http: network.rpcUrls },
+        },
+    });
+};
+const getOrMapViemChain = (network) => {
+    let chain;
+    try {
+        chain = getChain(network.chainId);
+    }
+    catch (_a) {
+        chain = mapChain(network);
+    }
+    return chain;
+};
+
+exports.getChain = getChain;
+exports.getOrMapViemChain = getOrMapViemChain;
+exports.mapChain = mapChain;

package/src/getOrMapViemChain.d.ts

@@ -0,0 +1,11 @@
+import { Chain } from 'viem';
+import * as chains from 'viem/chains';
+import { EvmNetwork } from './wallets/ethereum/evm-network';
+/**
+ * Gets the chain object for the given chain id.
+ * @param chainId - Chain id of the target EVM chain.
+ * @returns Viem's chain object.
+ */
+export declare const getChain: (chainId: number) => chains.Chain;
+export declare const mapChain: (network: EvmNetwork) => Chain;
+export declare const getOrMapViemChain: (network: EvmNetwork) => Chain;

package/src/getOrMapViemChain.js

@@ -0,0 +1,51 @@
+import * as chains from 'viem/chains';
+
+// eslint-disable-next-line import/no-namespace
+/**
+ * Gets the chain object for the given chain id.
+ * @param chainId - Chain id of the target EVM chain.
+ * @returns Viem's chain object.
+ */
+const getChain = (chainId) => {
+    for (const chain of Object.values(chains)) {
+        if ('id' in chain) {
+            if (chain.id === chainId) {
+                return chain;
+            }
+        }
+    }
+    throw new Error(`Chain with id ${chainId} not found`);
+};
+const mapChain = (network) => {
+    var _a;
+    return ({
+        blockExplorers: ((_a = network.blockExplorerUrls) === null || _a === void 0 ? void 0 : _a[0])
+            ? {
+                default: {
+                    name: network.blockExplorerUrls[0],
+                    url: network.blockExplorerUrls[0],
+                },
+            }
+            : undefined,
+        id: network.chainId,
+        name: network.vanityName || network.chainName,
+        nativeCurrency: network.nativeCurrency,
+        network: network.chainName,
+        rpcUrls: {
+            default: { http: network.rpcUrls },
+            public: { http: network.rpcUrls },
+        },
+    });
+};
+const getOrMapViemChain = (network) => {
+    let chain;
+    try {
+        chain = getChain(network.chainId);
+    }
+    catch (_a) {
+        chain = mapChain(network);
+    }
+    return chain;
+};
+
+export { getChain, getOrMapViemChain, mapChain };

package/src/multi-wallet.cjs

@@ -24,7 +24,6 @@ var ExodusSol = require('./wallets/solana/injected/ExodusSol.cjs');
 var BloctoInjected = require('./wallets/ethereum/injected/BloctoInjected.cjs');
 var argentx = require('./wallets/starknet/argentx.cjs');
 var braavos = require('./wallets/starknet/braavos.cjs');
-var BloctoEvm = require('./wallets/ethereum/BloctoEvm.cjs');
 var phantomLedger = require('./wallets/solana/phantom-ledger.cjs');
 var CoinbaseSolana = require('./wallets/solana/CoinbaseSolana.cjs');
 var Frame = require('./wallets/ethereum/injected/Frame.cjs');
@@ -34,7 +33,7 @@ var getWalletConnectConnector = require('./wallets/getWalletConnectConnector.cjs
 var initializeWalletProviders = require('./wallets/initializeWalletProviders.cjs');
 var Dawn = require('./wallets/ethereum/injected/Dawn.cjs');
 var PhantomEvm = require('./wallets/ethereum/injected/PhantomEvm.cjs');
-require('ethers');
+require('viem');
 require('./utils/logger.cjs');
 require('./wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 var EmailOTPMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs');
@@ -113,7 +112,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
         new slope({ solNetworks: solanaNetworkConfigs }),
         new dapper({ appLogoUrl, appName }),
         new blocto({ appLogoUrl, appName }),
-        new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
+        // new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
         new BloctoInjected({ evmNetworks: evmNetworkConfigs }),
         getWalletConnectConnector.getWalletConnectConnector({
             evmNetworks: evmNetworkConfigs,

package/src/multi-wallet.js

@@ -20,7 +20,6 @@ import ExodusSol from './wallets/solana/injected/ExodusSol.js';
 import BloctoInjected from './wallets/ethereum/injected/BloctoInjected.js';
 import ArgentX from './wallets/starknet/argentx.js';
 import Braavos from './wallets/starknet/braavos.js';
-import BloctoEvm from './wallets/ethereum/BloctoEvm.js';
 import PhantomLedger from './wallets/solana/phantom-ledger.js';
 export { walletName as phantomLedgerWalletName } from './wallets/solana/phantom-ledger.js';
 import CoinbaseSolana from './wallets/solana/CoinbaseSolana.js';
@@ -31,7 +30,7 @@ import { getWalletConnectConnector } from './wallets/getWalletConnectConnector.j
 import { initializeWalletProviders } from './wallets/initializeWalletProviders.js';
 import Dawn from './wallets/ethereum/injected/Dawn.js';
 import PhantomEvm from './wallets/ethereum/injected/PhantomEvm.js';
-import 'ethers';
+import 'viem';
 import './utils/logger.js';
 import './wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 import { EmailOTPMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js';
@@ -110,7 +109,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
         new Slope({ solNetworks: solanaNetworkConfigs }),
         new Dapper({ appLogoUrl, appName }),
         new Blocto({ appLogoUrl, appName }),
-        new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
+        // new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
         new BloctoInjected({ evmNetworks: evmNetworkConfigs }),
         getWalletConnectConnector({
             evmNetworks: evmNetworkConfigs,

package/src/rpcProviders.cjs

@@ -2,8 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var viem = require('viem');
 var web3_js = require('@solana/web3.js');
-var ethers = require('ethers');
+var getOrMapViemChain = require('./getOrMapViemChain.cjs');
 
 const getRpcProviders = (configurations) => {
     const rpcProviders = {};
@@ -11,7 +12,10 @@ const getRpcProviders = (configurations) => {
         rpcProviders.evm = configurations.evm.map((network) => {
             var _a;
             const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new ethers.ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
+            const provider = viem.createPublicClient({
+                chain: getOrMapViemChain.getOrMapViemChain(network),
+                transport: viem.http(rpcUrl),
+            });
             return {
                 chainId: network.chainId,
                 chainName: network.chainName,

package/src/rpcProviders.js

@@ -1,5 +1,6 @@
+import { createPublicClient, http } from 'viem';
 import { Connection } from '@solana/web3.js';
-import { ethers } from 'ethers';
+import { getOrMapViemChain } from './getOrMapViemChain.js';
 
 const getRpcProviders = (configurations) => {
     const rpcProviders = {};
@@ -7,7 +8,10 @@ const getRpcProviders = (configurations) => {
         rpcProviders.evm = configurations.evm.map((network) => {
             var _a;
             const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = new ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
+            const provider = createPublicClient({
+                chain: getOrMapViemChain(network),
+                transport: http(rpcUrl),
+            });
             return {
                 chainId: network.chainId,
                 chainName: network.chainName,

package/src/types.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from '@solana/web3.js';
-import { ethers } from 'ethers';
+import { PublicClient, TransactionReceipt, TransactionRequest } from 'viem';
 import type { NetworkConfiguration } from '@dynamic-labs/sdk-api';
 import { WalletConnector, Chain } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from './wallets/ethereum/evm-network';
@@ -10,7 +10,7 @@ export type VendorCredentials = {
 export type EvmRpcProvider = {
     chainId: number;
     chainName: string;
-    provider: ethers.providers.JsonRpcProvider;
+    provider: PublicClient;
 };
 export type SolanaRpcProvider = {
     chainId?: number;
@@ -40,16 +40,23 @@ export type GetSupportedWalletsOpts = {
     walletUiUtils?: WalletUiUtils;
 };
 export type GetSupportedWallets = (opts?: GetSupportedWalletsOpts) => Promise<WalletConnector[]>;
+export type Deferrable<T> = {
+    [K in keyof T]: T[K] | Promise<T[K]>;
+};
+interface ArrayLike<T> {
+    readonly [n: number]: T;
+    readonly length: number;
+}
+export type Bytes = ArrayLike<number>;
 export type WalletUiUtils = {
     enableInternalSign: () => void;
     sendTransaction: (props: {
-        handler: (transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>) => Promise<ethers.providers.TransactionResponse>;
-        provider: ethers.providers.Web3Provider;
-        transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
-    }) => Promise<ethers.providers.TransactionResponse>;
+        handler: (transaction: TransactionRequest) => Promise<TransactionReceipt>;
+        transaction: TransactionRequest;
+    }) => Promise<TransactionReceipt>;
     signMessage: (props: {
-        handler: (message: string | ethers.utils.Bytes) => Promise<string>;
-        message: string | ethers.utils.Bytes;
+        handler: () => Promise<string>;
+        message: string | Bytes;
     }) => Promise<string>;
 };
 export type ChainInfo = {
@@ -62,3 +69,4 @@ export type ChainWihtIcon = {
     icon?: string;
     name: string | undefined;
 };
+export {};

package/src/utils/message.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utils = require('ethers/lib/utils');
+var viem = require('viem');
 var logger = require('./logger.cjs');
 var getChainInfo = require('./getChainInfo/getChainInfo.cjs');
 
@@ -44,7 +44,7 @@ const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, public
 const getEip55Address = (publicKey, chainId) => {
     try {
         if (chainId) {
-            return utils.getAddress(publicKey);
+            return viem.getAddress(publicKey);
         }
     }
     catch (err) {

package/src/utils/message.js

@@ -1,4 +1,4 @@
-import { getAddress } from 'ethers/lib/utils.js';
+import { getAddress } from 'viem';
 import { logger } from './logger.js';
 import { getChainInfo } from './getChainInfo/getChainInfo.js';
 

package/src/wallets/algorand/myalgo.d.ts

@@ -1,5 +1,4 @@
 import { Connection } from '@solana/web3.js';
-import { ethers } from 'ethers';
 import { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { IMyAlgoSigner } from './myalgoSigner';
 declare class MyAlgo implements WalletConnector {
@@ -26,7 +25,7 @@ declare class MyAlgo implements WalletConnector {
     isInstalledOnBrowser(): boolean;
     supportsNetworkSwitching(): boolean;
     switchNetwork(): Promise<void>;
-    getWeb3Provider(): void | ethers.providers.Web3Provider | Connection | undefined;
+    getWeb3Provider(): void | Connection | undefined;
     getRpcProvider(): Promise<void>;
     setupEventListeners(): void;
     teardownEventListeners(): void;

package/src/wallets/clients/coinbase/coinbase.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var walletSdk = require('@coinbase/wallet-sdk');
-var utils = require('ethers/lib/utils');
+var viem = require('viem');
 var errors = require('../../../errors.cjs');
 var constants = require('../../constants.cjs');
 
@@ -58,7 +58,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => tslib.__awaiter(voi
     try {
         return yield provider.request({
             method: 'personal_sign',
-            params: [utils.hexlify(utils.toUtf8Bytes(messageToSign)), address.toLowerCase()],
+            params: [viem.toHex(viem.toBytes(messageToSign)), address.toLowerCase()],
         });
     }
     catch (err) {

package/src/wallets/clients/coinbase/coinbase.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import { CoinbaseWalletSDK } from '@coinbase/wallet-sdk';
-import { hexlify, toUtf8Bytes } from 'ethers/lib/utils.js';
+import { toHex, toBytes } from 'viem';
 import { DynamicError } from '../../../errors.js';
 import { infuraId } from '../../constants.js';
 
@@ -54,7 +54,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, v
     try {
         return yield provider.request({
             method: 'personal_sign',
-            params: [hexlify(toUtf8Bytes(messageToSign)), address.toLowerCase()],
+            params: [toHex(toBytes(messageToSign)), address.toLowerCase()],
         });
     }
     catch (err) {

package/src/wallets/clients/walletConnect/walletConnect.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var Client = require('@walletconnect/client');
-var ethers = require('ethers');
+var viem = require('viem');
 var isMobile = require('../../../utils/isMobile.cjs');
 var isSameAddress = require('../../../utils/isSameAddress/isSameAddress.cjs');
 var logger = require('../../../utils/logger.cjs');
@@ -213,8 +213,7 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
         if (!rpcProvider) {
             return;
         }
-        const contract = new ethers.Contract(accountPublicAddress, IS_VALID_SIGNATURE_ABI, yield rpcProvider());
-        const safeTransactionPromise = waitForSafeTransaction(signature, messageToSign, contract);
+        const safeTransactionPromise = waitForSafeTransaction(accountPublicAddress, signature, messageToSign, yield rpcProvider());
         const timeoutPromise = new Promise((resolve) => {
             setTimeout(resolve, 120000);
         });
@@ -226,13 +225,18 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
 // the transaction is recorded first on the blockchain
 // redcoast verify WILL fail if it attempts to verify the signature
 // that has not yet been properly processed!
-const waitForSafeTransaction = (signature, messageToSign, contract) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const waitForSafeTransaction = (address, signature, messageToSign, client) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     // wait for safe wallet to finish txn on the blockchain contract
     for (let i = 0; i < 120; i++) {
         try {
             // this will result in an exception if the transaction is still not ready
             // we need to catch it below
-            const result = yield contract.isValidSignature(ethers.ethers.utils.hashMessage(messageToSign), signature);
+            const result = yield (client === null || client === void 0 ? void 0 : client.readContract({
+                abi: IS_VALID_SIGNATURE_ABI,
+                address: address,
+                args: [viem.hashMessage(messageToSign), signature],
+                functionName: 'isValidSignature',
+            }));
             if (result === MAGIC_VALUE)
                 return;
         }

package/src/wallets/clients/walletConnect/walletConnect.d.ts

@@ -1,5 +1,5 @@
 import Client from '@walletconnect/client';
-import { ethers } from 'ethers';
+import { PublicClient } from 'viem';
 import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { KeplrWalletConnectV1 } from '../../cosmos/wcClient';
@@ -20,4 +20,4 @@ export declare const createSession: (client: Client) => Promise<PayloadParams>;
 export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
 export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;
 export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
-export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;
+export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<PublicClient | undefined>) => Promise<string | undefined>;

package/src/wallets/clients/walletConnect/walletConnect.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import Client from '@walletconnect/client';
-import { Contract, ethers } from 'ethers';
+import { hashMessage } from 'viem';
 import { isMobile, isIOS } from '../../../utils/isMobile.js';
 import { isSameAddress } from '../../../utils/isSameAddress/isSameAddress.js';
 import { logger } from '../../../utils/logger.js';
@@ -205,8 +205,7 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
         if (!rpcProvider) {
             return;
         }
-        const contract = new Contract(accountPublicAddress, IS_VALID_SIGNATURE_ABI, yield rpcProvider());
-        const safeTransactionPromise = waitForSafeTransaction(signature, messageToSign, contract);
+        const safeTransactionPromise = waitForSafeTransaction(accountPublicAddress, signature, messageToSign, yield rpcProvider());
         const timeoutPromise = new Promise((resolve) => {
             setTimeout(resolve, 120000);
         });
@@ -218,13 +217,18 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
 // the transaction is recorded first on the blockchain
 // redcoast verify WILL fail if it attempts to verify the signature
 // that has not yet been properly processed!
-const waitForSafeTransaction = (signature, messageToSign, contract) => __awaiter(void 0, void 0, void 0, function* () {
+const waitForSafeTransaction = (address, signature, messageToSign, client) => __awaiter(void 0, void 0, void 0, function* () {
     // wait for safe wallet to finish txn on the blockchain contract
     for (let i = 0; i < 120; i++) {
         try {
             // this will result in an exception if the transaction is still not ready
             // we need to catch it below
-            const result = yield contract.isValidSignature(ethers.utils.hashMessage(messageToSign), signature);
+            const result = yield (client === null || client === void 0 ? void 0 : client.readContract({
+                abi: IS_VALID_SIGNATURE_ABI,
+                address: address,
+                args: [hashMessage(messageToSign), signature],
+                functionName: 'isValidSignature',
+            }));
             if (result === MAGIC_VALUE)
                 return;
         }

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

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

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

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