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

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

@@ -1,4 +1,4 @@
-import { WalletClient } from 'viem';
+import { ethers } from 'ethers';
 import { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
 import { EthProvider } from './ethProvider';
@@ -17,16 +17,14 @@ declare class Fortmatic extends EthProvider implements WalletConnector {
         apiKey: string;
         evmNetworks: EvmNetwork[];
     });
-    providerResources: string[] | undefined;
-    switchNetworkOnlyFromWallet: boolean | undefined;
     get key(): string;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     getFortmaticProvider(): import("fortmatic/dist/cjs/src/core/fm-provider").FmProvider;
-    getWeb3Provider(): WalletClient;
+    getWeb3Provider(): ethers.providers.Web3Provider;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
-    fetchPublicAddress(): Promise<`0x${string}` | undefined>;
+    fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     endSession(): Promise<void>;

package/src/wallets/ethereum/fortmatic.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
+import { ethers } from 'ethers';
 import FortmaticClient from 'fortmatic';
-import { createWalletClient, custom } from 'viem';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 import { DynamicError } from '../../errors.js';
 import { logger } from '../../utils/logger.js';
@@ -33,9 +33,8 @@ class Fortmatic extends EthProvider {
         return fm.getProvider();
     }
     getWeb3Provider() {
-        return createWalletClient({
-            transport: custom(this.getFortmaticProvider()),
-        });
+        const provider = new ethers.providers.Web3Provider(this.getFortmaticProvider());
+        return provider;
     }
     isInstalledOnBrowser() {
         return false;
@@ -63,17 +62,10 @@ class Fortmatic extends EthProvider {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = yield this.getWeb3Provider();
-            const account = yield this.fetchPublicAddress();
-            if (account) {
-                const signedMessage = yield signer.signMessage({
-                    account,
-                    message: messageToSign,
-                });
-                logger.debug('signedMessage:', signedMessage);
-                return signedMessage;
-            }
-            return undefined;
+            const signer = this.getWeb3Provider().getSigner();
+            const signedMessage = yield signer.signMessage(messageToSign);
+            logger.debug('signedMessage:', signedMessage);
+            return signedMessage;
         });
     }
     proveOwnership(messageToSign) {

package/src/wallets/ethereum/meta-mask.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var tslib = require('tslib');
-var viem = require('viem');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
 var ethProvider = require('./ethProvider.cjs');
@@ -21,23 +20,13 @@ class MetaMask 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 (!provider) {
-            return;
-        }
-        return viem.createWalletClient({
-            transport: viem.custom(provider),
-        });
+        return this.ethProviderHelper.findProvider(this.name);
     }
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);

package/src/wallets/ethereum/meta-mask.d.ts

@@ -1,11 +1,9 @@
-import { WalletClient } from 'viem';
+import { ethers } from 'ethers';
 import { Chain, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EthProviderHelper } from './ethProviderHelper';
 import { EthProvider } from './ethProvider';
 import { EvmNetwork } from './evm-network';
 declare class MetaMask extends EthProvider implements WalletConnector {
-    providerResources: string[] | undefined;
-    switchNetworkOnlyFromWallet: boolean | undefined;
     name: string;
     supportedChains: Chain[];
     connectedChain: Chain;
@@ -17,7 +15,7 @@ declare class MetaMask extends EthProvider implements WalletConnector {
     get key(): string;
     setupEventListeners(listeners: WalletEventListeners): () => void;
     teardownEventListeners(): void;
-    getWeb3Provider(): WalletClient | undefined;
+    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
     fetchPublicAddress(): Promise<string | undefined>;
@@ -26,7 +24,7 @@ declare class MetaMask extends EthProvider implements WalletConnector {
     endSession(): Promise<void>;
     providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: WalletClient;
+        provider: ethers.providers.Web3Provider;
     }): Promise<void>;
 }
 export default MetaMask;

package/src/wallets/ethereum/meta-mask.js

@@ -1,5 +1,4 @@
 import { __awaiter } from 'tslib';
-import { createPublicClient, custom, createWalletClient } from 'viem';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 import { EthProviderHelper } from './ethProviderHelper.js';
 import { EthProvider } from './ethProvider.js';
@@ -19,23 +18,13 @@ class MetaMask 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 (!provider) {
-            return;
-        }
-        return createWalletClient({
-            transport: custom(provider),
-        });
+        return this.ethProviderHelper.findProvider(this.name);
     }
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);

package/src/wallets/walletConnect/walletConnect.cjs

@@ -2,7 +2,7 @@
 
 var tslib = require('tslib');
 var WalletConnectProvider = require('@walletconnect/ethereum-provider');
-var viem = require('viem');
+var ethers = require('ethers');
 var walletBook = require('@dynamic-labs/wallet-book');
 var constants = require('../constants.cjs');
 var ethProvider = require('../ethereum/ethProvider.cjs');
@@ -58,13 +58,11 @@ class WalletConnect extends ethProvider.EthProvider {
     getWeb3Provider() {
         const client = this.getClient();
         return client
-            ? viem.createWalletClient({
-                transport: viem.custom(new WalletConnectProvider__default["default"]({
-                    connector: client,
-                    infuraId: constants.infuraId,
-                    rpc: this.evmNetworkRpcMap(),
-                })),
-            })
+            ? new ethers.ethers.providers.Web3Provider(new WalletConnectProvider__default["default"]({
+                connector: client,
+                infuraId: constants.infuraId,
+                rpc: this.evmNetworkRpcMap(),
+            }), 'any')
             : undefined;
     }
     isInstalledOnBrowser() {

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

@@ -1,5 +1,5 @@
 import Client from '@walletconnect/client';
-import { WalletClient } from 'viem';
+import { ethers } from 'ethers';
 import { Chain, FetchPublicAddressOpts, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EthProvider } from '../ethereum/ethProvider';
 import { EvmNetwork } from '../ethereum/evm-network';
@@ -22,7 +22,7 @@ declare class WalletConnect extends EthProvider implements WalletConnector {
     supportsNetworkSwitching(): boolean;
     setupEventListeners(listeners: WalletEventListeners): () => void;
     teardownEventListeners(): void;
-    getWeb3Provider(): WalletClient | undefined;
+    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
@@ -32,8 +32,8 @@ declare class WalletConnect extends EthProvider implements WalletConnector {
     endSession(): Promise<void>;
     providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: WalletClient;
+        provider: ethers.providers.Web3Provider;
     }): Promise<void>;
-    getConnectedAccounts(): Promise<`0x${string}`[]>;
+    getConnectedAccounts(): Promise<string[]>;
 }
 export default WalletConnect;

package/src/wallets/walletConnect/walletConnect.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import WalletConnectProvider from '@walletconnect/ethereum-provider';
-import { createWalletClient, custom } from 'viem';
+import { ethers } from 'ethers';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { infuraId } from '../constants.js';
 import { EthProvider } from '../ethereum/ethProvider.js';
@@ -52,13 +52,11 @@ class WalletConnect extends EthProvider {
     getWeb3Provider() {
         const client = this.getClient();
         return client
-            ? createWalletClient({
-                transport: custom(new WalletConnectProvider({
-                    connector: client,
-                    infuraId,
-                    rpc: this.evmNetworkRpcMap(),
-                })),
-            })
+            ? new ethers.providers.Web3Provider(new WalletConnectProvider({
+                connector: client,
+                infuraId,
+                rpc: this.evmNetworkRpcMap(),
+            }), 'any')
             : undefined;
     }
     isInstalledOnBrowser() {

package/src/wallets/walletConnect/walletConnectV2.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var Provider = require('@walletconnect/universal-provider');
-var viem = require('viem');
+var ethers = require('ethers');
 var walletBook = require('@dynamic-labs/wallet-book');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ethProvider = require('../ethereum/ethProvider.cjs');
@@ -141,9 +141,7 @@ class WalletConnectV2 extends ethProvider.EthProvider {
         if (!provider) {
             throw new Error('No provider found');
         }
-        return viem.createWalletClient({
-            transport: viem.custom(provider),
-        });
+        return new ethers.ethers.providers.Web3Provider(provider, 'any');
     }
     isInstalledOnBrowser() {
         return false;
@@ -221,10 +219,10 @@ class WalletConnectV2 extends ethProvider.EthProvider {
             // eslint-disable-next-line prefer-destructuring
             const address = this.session.namespaces.eip155.accounts[0].split(':')[2];
             const web3Provider = this.getWeb3Provider();
-            return web3Provider.signMessage({
-                account: address,
-                message: encoding.utf8ToHex(messageToSign, true),
-            });
+            return web3Provider.send('personal_sign', [
+                encoding.utf8ToHex(messageToSign, true),
+                address,
+            ]);
         });
     }
     proveOwnership(messageToSign) {
@@ -275,9 +273,7 @@ class WalletConnectV2 extends ethProvider.EthProvider {
             if (!this.session) {
                 return [];
             }
-            return [
-                this.session.namespaces.eip155.accounts[0].split(':')[2],
-            ];
+            return [this.session.namespaces.eip155.accounts[0].split(':')[2]];
         });
     }
 }

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

@@ -1,6 +1,6 @@
 import Provider, { UniversalProviderOpts } from '@walletconnect/universal-provider';
+import { ethers } from 'ethers';
 import type { SessionTypes } from '@walletconnect/types';
-import { WalletClient } from 'viem';
 import { WalletConnector, Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '../ethereum/evm-network';
 import { EthProvider } from '../ethereum/ethProvider';
@@ -24,7 +24,7 @@ declare class WalletConnectV2 extends EthProvider implements WalletConnector {
     setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
     getDeepLink(): string | undefined;
-    getWeb3Provider(): WalletClient;
+    getWeb3Provider(): ethers.providers.Web3Provider;
     isInstalledOnBrowser(): boolean;
     connect(): Promise<void>;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
@@ -33,8 +33,8 @@ declare class WalletConnectV2 extends EthProvider implements WalletConnector {
     endSession(): Promise<void>;
     providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
-        provider: WalletClient;
+        provider: ethers.providers.Web3Provider;
     }): Promise<void>;
-    getConnectedAccounts(): Promise<`0x${string}`[]>;
+    getConnectedAccounts(): Promise<string[]>;
 }
 export default WalletConnectV2;

package/src/wallets/walletConnect/walletConnectV2.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import Provider from '@walletconnect/universal-provider';
-import { createWalletClient, custom } from 'viem';
+import { ethers } from 'ethers';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { normalizeWalletName } from '../../utils/normalizeWalletName/normalizeWalletName.js';
 import { EthProvider } from '../ethereum/ethProvider.js';
@@ -133,9 +133,7 @@ class WalletConnectV2 extends EthProvider {
         if (!provider) {
             throw new Error('No provider found');
         }
-        return createWalletClient({
-            transport: custom(provider),
-        });
+        return new ethers.providers.Web3Provider(provider, 'any');
     }
     isInstalledOnBrowser() {
         return false;
@@ -213,10 +211,10 @@ class WalletConnectV2 extends EthProvider {
             // eslint-disable-next-line prefer-destructuring
             const address = this.session.namespaces.eip155.accounts[0].split(':')[2];
             const web3Provider = this.getWeb3Provider();
-            return web3Provider.signMessage({
-                account: address,
-                message: utf8ToHex(messageToSign, true),
-            });
+            return web3Provider.send('personal_sign', [
+                utf8ToHex(messageToSign, true),
+                address,
+            ]);
         });
     }
     proveOwnership(messageToSign) {
@@ -267,9 +265,7 @@ class WalletConnectV2 extends EthProvider {
             if (!this.session) {
                 return [];
             }
-            return [
-                this.session.namespaces.eip155.accounts[0].split(':')[2],
-            ];
+            return [this.session.namespaces.eip155.accounts[0].split(':')[2]];
         });
     }
 }

package/src/wallets/window.d.ts

@@ -56,12 +56,10 @@ export interface IEthereum {
     isPhantom: boolean;
     isTrustWallet: boolean;
     isZerion: boolean;
-    on: (event: string, listener: (...args: Array<any>) => unknown) => void;
     providers: object[];
-    removeListener: (event: string, listener: (...args: Array<any>) => unknown) => void;
     request: <T extends string>(params: {
         method: T;
-    } | object) => Promise<T extends 'eth_requestAccounts' ? [`0x${string}`] : object>;
+    } | object) => Promise<T extends 'eth_requestAccounts' ? [string] : object>;
 }
 export interface ISolana {
     connect: () => Promise<void | object>;

package/src/getOrMapViemChain.cjs

@@ -1,77 +0,0 @@
-'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

@@ -1,11 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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 };