@dynamic-labs/ethereum 1.3.0 → 1.4.0

package/src/walletConnect/walletConnect.js

@@ -1,147 +1,17 @@
-import { __rest, __awaiter } from '../../_virtual/_tslib.js';
-import WalletConnectProvider from '@walletconnect/ethereum-provider';
-import { createWalletClient, custom } from 'viem';
-import { getDeepLink } from '@dynamic-labs/wallet-connector-core';
-import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { isMobile, DynamicError } from '@dynamic-labs/utils';
+import { __rest } from '../../_virtual/_tslib.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { INFURA_ID } from '../constants.js';
-import { initClient, setupWalletConnectEventListeners, teardownWalletConnectEventListeners, fetchWalletConnectEVMPublicAddress, signWalletConnectPersonalMessage, killWalletConnectSession } from './client/client.js';
 
 class WalletConnect extends EthWalletConnector {
     constructor(_a) {
-        var { walletConnectV1Bridge, walletName } = _a, props = __rest(_a, ["walletConnectV1Bridge", "walletName"]);
+        var { walletName } = _a, props = __rest(_a, ["walletName"]);
         super(props);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.bridge = 'https://bridge.walletconnect.org';
-        this.canConnectViaQrCode = true;
-        this.isWalletConnect = true;
-        this.switchNetworkOnlyFromWallet = false;
         this.name = walletName;
-        if (walletConnectV1Bridge) {
-            this.bridge = walletConnectV1Bridge;
-        }
-        this.deepLinkPreference = props.deepLinkPreference || 'native';
-    }
-    getClient() {
-        if (this.client) {
-            return this.client;
-        }
-        this.client = initClient(this.key, this.bridge, this.clientOptions);
-        return this.client;
-    }
-    supportsNetworkSwitching() {
-        if (this.connectedChain === 'EVM') {
-            return true;
-        }
-        else {
-            const client = this.getClient();
-            return Boolean(client === null || client === void 0 ? void 0 : client.chainId);
-        }
-    }
-    setupEventListeners() {
-        setupWalletConnectEventListeners(this, this.getClient());
-    }
-    teardownEventListeners() {
-        teardownWalletConnectEventListeners(this.getClient());
     }
     getWalletClient() {
-        const client = this.getClient();
-        return client
-            ? createWalletClient({
-                transport: custom(new WalletConnectProvider({
-                    connector: client,
-                    infuraId: INFURA_ID,
-                    rpc: this.evmNetworkRpcMap(),
-                })),
-            })
-            : undefined;
-    }
-    fetchPublicAddress(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return fetchWalletConnectEVMPublicAddress(getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
-                    var _a, _b;
-                    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
-                    this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
-                    if ((_b = payload.params[0].accounts) === null || _b === void 0 ? void 0 : _b.length) {
-                        this.emit('accountChange', {
-                            accounts: payload.params[0].accounts,
-                        });
-                    }
-                } }));
-        });
-    }
-    getDeepLink() {
-        var _a;
-        const wallet = getWalletBookWallet(this.walletBook, this.key);
-        if (!isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
-            return undefined;
-        }
-        return getDeepLink({
-            metadata: wallet,
-            mode: 'regular',
-            preference: this.deepLinkPreference,
-            uri: this.getClient().uri,
-        });
-    }
-    signMessage(messageToSign) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return signWalletConnectPersonalMessage(messageToSign, getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, 
-            // don't call getPublicClient until we really need to
-            () => __awaiter(this, void 0, void 0, function* () { return this.getPublicClient(); }));
-        });
-    }
-    endSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            killWalletConnectSession(this.getClient());
-        });
-    }
-    providerSwitchNetwork({ network, provider, }) {
-        const _super = Object.create(null, {
-            providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const client = this.getClient();
-            const currentNetworkId = yield this.getNetwork();
-            if (currentNetworkId && currentNetworkId === network.chainId) {
-                return;
-            }
-            if (this.switchNetworkOnlyFromWallet !== undefined &&
-                this.switchNetworkOnlyFromWallet) {
-                throw new DynamicError('Network switching is only supported through the wallet');
-            }
-            if (!this.supportsNetworkSwitching()) {
-                throw new DynamicError('Network switching not supported');
-            }
-            if (!client) {
-                throw new DynamicError('Client not found');
-            }
-            if (isMobile()) {
-                const deepLink = getDeepLink({
-                    metadata: getWalletBookWallet(this.walletBook, this.key),
-                    mode: 'regular',
-                    preference: this.deepLinkPreference,
-                    uri: client.uri,
-                });
-                window.location.href = deepLink;
-            }
-            return _super.providerSwitchNetwork.call(this, { network, provider });
-        });
-    }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const client = this.getClient();
-            if (!client.connected)
-                return [];
-            return client.accounts;
-        });
-    }
-    getSession() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            return (_a = this.client) === null || _a === void 0 ? void 0 : _a.session;
-        });
+        return undefined;
     }
 }
 

package/src/walletConnect/walletConnectV2.cjs

@@ -3,18 +3,20 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
-var Provider = require('@walletconnect/universal-provider');
+var EthereumProvider = require('@walletconnect/ethereum-provider');
 var EventEmitter = require('eventemitter3');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
+var viemUtils = require('@dynamic-labs/viem-utils');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var parseIntSafe = require('../utils/parseIntSafe.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var Provider__default = /*#__PURE__*/_interopDefaultLegacy(Provider);
+var EthereumProvider__default = /*#__PURE__*/_interopDefaultLegacy(EthereumProvider);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
 const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
@@ -35,6 +37,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         // When trying to switch network for MetaMask, the switch promise gets stuck
         // if the switch got trigged once already, so we need to keep track of that
         this._hasSwitchedNetwork = false;
+        this.sessionEventHandler = () => { };
+        this.sessionDeleteHandler = () => { };
         this.name = opts.walletName;
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
@@ -60,7 +64,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         }
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
-        return [...reorderedChains, ...remainingChains];
+        return [...reorderedChains, ...remainingChains].map((chain) => Number(chain.split(':')[1]));
     }
     initConnection() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -69,44 +73,51 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 throw new utils.DynamicError('No provider found (init connection)');
             }
             // this means there is already a connection in progress, so don't call connect again
-            if (provider === null || provider === void 0 ? void 0 : provider.uri) {
+            if (provider === null || provider === void 0 ? void 0 : provider.signer.uri) {
                 return;
             }
-            const optionalNamespaces = {
-                eip155: {
-                    chains: this.getMappedChainsByPreferredOrder(),
-                    events: ['chainChanged', 'accountsChanged'],
-                    methods: [
-                        'eth_chainId',
-                        'eth_signTypedData',
-                        'eth_signTransaction',
-                        'eth_sign',
-                        'personal_sign',
-                        'eth_sendTransaction',
-                        'eth_signTypedData_v4',
-                        'wallet_switchEthereumChain',
-                        'wallet_addEthereumChain',
-                    ],
-                    rpcMap: this.evmNetworkRpcMap(),
-                },
-            };
-            provider
-                .connect({
-                optionalNamespaces,
-            })
-                .catch((e) => {
+            provider.connect().catch((e) => {
                 walletConnectorCore.logger.error(e);
                 ee.emit('walletconnect_connection_failed', e);
             });
         });
     }
-    createInitProviderPromise() {
+    createProvider() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = yield Provider__default["default"].init({
-                logger: walletConnectorCore.logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
+            return EthereumProvider__default["default"].init({
+                events: ['chainChanged', 'accountsChanged'],
+                methods: [],
+                optionalChains: this.getMappedChainsByPreferredOrder(),
+                optionalMethods: [
+                    'eth_chainId',
+                    'eth_signTypedData',
+                    'eth_signTransaction',
+                    'eth_sign',
+                    'personal_sign',
+                    'eth_sendTransaction',
+                    'eth_signTypedData_v4',
+                    'wallet_switchEthereumChain',
+                    'wallet_addEthereumChain',
+                ],
                 projectId: this.projectId,
+                rpcMap: this.evmNetworkRpcMap(),
+                showQrModal: false,
+            });
+        });
+    }
+    getWalletClientFromInitializedProvider() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const walletConnect = this.createProvider();
+            const walletClient = viem.createWalletClient({
+                account: this.activeAccount ? accounts.toAccount(this.activeAccount) : undefined,
+                transport: viem.custom(yield walletConnect),
             });
-            WalletConnectV2.provider = provider;
+            return walletClient;
+        });
+    }
+    createInitProviderPromise() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            WalletConnectV2.provider = yield this.createProvider();
             this.teardownEventListeners();
             this.setupEventListeners();
         });
@@ -182,7 +193,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!WalletConnectV2.provider) {
             return;
         }
-        WalletConnectV2.provider.client.on('session_event', ({ params }) => {
+        this.sessionEventHandler = ({ params, }) => {
             walletConnectorCore.logger.debug('session_event was called', { params });
             if (!params || !params.event) {
                 walletConnectorCore.logger.debug('session_event was called without params or params.event');
@@ -191,12 +202,17 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             const { name, data } = params.event;
             if (name === 'chainChanged') {
                 const chainId = parseIntSafe.parseIntSafe(data);
+                if (chainId === this.currentChainId) {
+                    walletConnectorCore.logger.debug(`ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
+                    return;
+                }
                 if (chainId === undefined) {
                     walletConnectorCore.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
                 this.currentChainId = chainId;
                 this.emit('chainChange', { chain: String(chainId) });
+                this.hasSwitchedNetwork = true;
                 // When a user switches network from their wallet, we need the provider to change network
                 // such that any future calls to `getNetwork` will return the correct network
                 this.switchNetwork({ networkChainId: chainId });
@@ -210,24 +226,28 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 const account = data[0].split(':')[2];
                 this.setActiveAccount(account);
             }
-        });
-        WalletConnectV2.provider.client.on('session_delete', () => _tslib.__awaiter(this, void 0, void 0, function* () {
+        };
+        WalletConnectV2.provider.on('session_event', this.sessionEventHandler);
+        this.sessionDeleteHandler = () => _tslib.__awaiter(this, void 0, void 0, function* () {
             this.endSession();
             this.emit('disconnect');
-        }));
+        });
+        WalletConnectV2.provider.on('session_delete', this.sessionDeleteHandler);
     }
     teardownEventListeners() {
         if (!WalletConnectV2.provider) {
             return;
         }
-        WalletConnectV2.provider.client.removeAllListeners('session_event');
-        WalletConnectV2.provider.client.removeAllListeners('session_delete');
+        WalletConnectV2.provider.off('session_event', this.sessionEventHandler);
+        WalletConnectV2.provider.off('session_delete', this.sessionDeleteHandler);
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         if (!WalletConnectV2.provider) {
             return;
         }
         return viem.createWalletClient({
+            account: this.activeAccount ? accounts.toAccount(this.activeAccount) : undefined,
+            chain: viemUtils.chainsMap[chainId !== null && chainId !== void 0 ? chainId : String(this.currentChainId)],
             transport: viem.custom(WalletConnectV2.provider),
         });
     }
@@ -237,7 +257,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (this.activeAccount) {
                 return this.activeAccount;
             }
-            if (!WalletConnectV2.provider || !((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri)) {
+            if (!WalletConnectV2.provider || !((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.signer.uri)) {
                 walletConnectorCore.logger.debug('No WC2 provider found, re-initializing...');
                 yield this.endSession();
                 yield this.init();
@@ -247,13 +267,13 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 // finish setting up the connection URI and making it available
                 // on the provider
                 yield new Promise((resolve) => setTimeout(resolve, 1000));
-                if (!WalletConnectV2.provider || !((_b = WalletConnectV2.provider) === null || _b === void 0 ? void 0 : _b.uri)) {
+                if (!WalletConnectV2.provider || !((_b = WalletConnectV2.provider) === null || _b === void 0 ? void 0 : _b.signer.uri)) {
                     walletConnectorCore.logger.debug('No WC2 provider found, escaping and throwing error');
                     throw new utils.DynamicError('No provider found');
                 }
             }
             const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
-            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
+            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnectV2.provider.signer.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             }, this.deepLinkPreference);
@@ -266,7 +286,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     const error = new utils.DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnectV2.provider) {
-                        WalletConnectV2.provider.uri = undefined;
+                        WalletConnectV2.provider.signer.uri = undefined;
                         // this is needed for mobile to work when using universal links.
                         // if the user cancels the connection, we need to re-initialize the provider
                         // so that the async work is done ahead of time, before the user tries to connect again,
@@ -275,13 +295,19 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     }
                     reject(error);
                 });
-                WalletConnectV2.provider.on('connect', ({ session }) => {
+                WalletConnectV2.provider.on('connect', () => {
+                    var _a;
+                    const session = (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session;
                     if (!session) {
                         reject(new utils.DynamicError('No session found'));
+                        return;
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
-                    resolve(this.activeAccount);
+                    this.getNetwork().then((chainId) => {
+                        this.currentChainId = chainId;
+                        resolve(this.activeAccount);
+                    });
                 });
             });
         });
@@ -299,10 +325,12 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
      */
     waitForSignMessage(signMessageFn, messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const raceConditionPromise = new Promise((resolve) => {
+            const raceConditionPromise = new Promise((resolve, reject) => {
                 // Create listener for chain change event
                 this.on('chainChange', () => resolve({ success: false }));
-                signMessageFn(messageToSign).then((result) => resolve({ signedMessage: result, success: true }));
+                signMessageFn(messageToSign)
+                    .then((result) => resolve({ signedMessage: result, success: true }))
+                    .catch(reject);
             });
             const signedMessageResult = yield raceConditionPromise;
             if (signedMessageResult.success === false) {
@@ -321,7 +349,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             metadata,
             mode: 'regular',
             preference: this.deepLinkPreference,
-            uri: (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri,
+            uri: (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.signer.uri,
         });
         if (!deepLink) {
             return;
@@ -335,10 +363,6 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (!this.session) {
                 throw new utils.DynamicError('no session');
             }
-            const web3Provider = this.getWalletClient();
-            if (!web3Provider) {
-                throw new utils.DynamicError('No WalletConnect provider found to handle signing');
-            }
             const deepLink = this.getDeepLink();
             if (utils.isMobile() && deepLink) {
                 window.location.href = deepLink;
@@ -348,7 +372,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 if (!activeAccount) {
                     return;
                 }
-                return web3Provider.signMessage({
+                const walletClient = yield this.getWalletClientFromInitializedProvider();
+                return walletClient.signMessage({
                     account: activeAccount,
                     message: messageToSign,
                 });
@@ -407,11 +432,17 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             return _super.getNetwork.call(this);
         });
     }
-    providerSwitchNetwork({ network, provider, }) {
+    providerSwitchNetwork({ network, }) {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const supportedNetworks = yield this.getSupportedNetworks();
+            if (!(supportedNetworks === null || supportedNetworks === void 0 ? void 0 : supportedNetworks.includes(network.chainId.toString()))) {
+                const error = new utils.DynamicError('Network switching is not available at this time. The user should manually switch network in their wallet');
+                error.code = 'network_switching_only_available_in_wallet';
+                throw error;
+            }
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
                 return;
@@ -422,10 +453,14 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (!this.supportsNetworkSwitching()) {
                 throw new utils.DynamicError('Network switching not supported');
             }
-            if (!provider) {
-                throw new utils.DynamicError('Provider not found');
+            const walletClient = yield this.getWalletClientFromInitializedProvider();
+            if (this.isMetaMask()) {
+                const deepLink = this.getDeepLink();
+                if (deepLink) {
+                    window.location.href = deepLink;
+                }
             }
-            yield _super.providerSwitchNetwork.call(this, { network, provider });
+            yield _super.providerSwitchNetwork.call(this, { network, provider: walletClient });
             this.currentChainId = network.chainId;
             this.hasSwitchedNetwork = true;
             this.emit('chainChange', { chain: String(network.chainId) });
@@ -451,13 +486,14 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     getSupportedNetworks() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            // MM allows you to switch to any network the first time, even if it's not enabled in MM
-            // so we should consider all networks as supported if network switching hasn't been triggered yet
-            if (this.isMetaMask() && !this.hasSwitchedNetwork) {
-                return this.evmNetworks.map((network) => network.chainId.toString());
-            }
             yield this.initProvider();
             this.refreshSession();
+            if (this.isMetaMask()) {
+                if (this.hasSwitchedNetwork) {
+                    return [String(this.currentChainId)];
+                }
+                return this.evmNetworks.map((network) => network.chainId.toString());
+            }
             if (!this.session) {
                 return [];
             }

package/src/walletConnect/walletConnectV2.d.ts

@@ -1,5 +1,5 @@
 import type { SessionTypes } from '@walletconnect/types';
-import { Hex, WalletClient } from 'viem';
+import { Hex } from 'viem';
 import { Chain, FetchPublicAddressOpts, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
@@ -29,6 +29,8 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private getMappedChains;
     private getMappedChainsByPreferredOrder;
     private initConnection;
+    private createProvider;
+    private getWalletClientFromInitializedProvider;
     private createInitProviderPromise;
     private initProvider;
     private refreshSession;
@@ -42,10 +44,12 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private set hasSwitchedNetwork(value);
     private get hasSwitchedNetwork();
     supportsNetworkSwitching(): boolean;
+    private sessionEventHandler;
+    private sessionDeleteHandler;
     setupEventListeners(): void;
     teardownEventListeners(): void;
-    getWalletClient(): {
-        account: undefined;
+    getWalletClient(chainId?: string): {
+        account: import("viem").JsonRpcAccount | undefined;
         batch?: {
             multicall?: boolean | {
                 batchSize?: number | undefined;
@@ -53,7 +57,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
             } | undefined;
         } | undefined;
         cacheTime: number;
-        chain: undefined;
+        chain: import("viem").Chain;
         key: string;
         name: string;
         pollingInterval: number;
@@ -62,20 +66,20 @@ export declare class WalletConnectV2 extends EthWalletConnector {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const TAbi extends import("viem").Abi | readonly unknown[], TChainOverride extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi, undefined, undefined, TChainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const TAbi extends import("viem").Abi | readonly unknown[], TChainOverride extends import("viem").Chain | undefined = undefined>(args: import("viem").DeployContractParameters<TAbi, import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<undefined, undefined, TChainOverride_1>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
+        prepareTransactionRequest: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_1>) => Promise<import("viem").PrepareTransactionRequestReturnType>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
         sendRawTransaction: (args: import("node_modules/viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_2>) => Promise<`0x${string}`>;
-        signMessage: (args: import("viem").SignMessageParameters<undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<undefined, undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        signMessage: (args: import("viem").SignMessageParameters<import("viem").JsonRpcAccount | undefined>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("node_modules/viem/_types/actions/wallet/signTransaction").SignTransactionParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -283,10 +287,10 @@ export declare class WalletConnectV2 extends EthWalletConnector {
             uint256?: undefined;
         } | {
             [key: string]: unknown;
-        }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, undefined>) => Promise<`0x${string}`>;
+        }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, import("viem").JsonRpcAccount | undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const TAbi_1 extends import("viem").Abi | readonly unknown[], TFunctionName extends string, TChainOverride_4 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_1, TFunctionName, undefined, undefined, TChainOverride_4>) => Promise<`0x${string}`>;
+        writeContract: <const TAbi_1 extends import("viem").Abi | readonly unknown[], TFunctionName extends string, TChainOverride_4 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<TAbi_1, TFunctionName, import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_4>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -300,7 +304,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<undefined, undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, undefined, undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<undefined, undefined>>;
+        } & Partial<Pick<import("viem").PublicActions, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, import("viem").Chain, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain, import("viem").JsonRpcAccount | undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, import("viem").Chain, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain, import("viem").JsonRpcAccount | undefined>>;
     } | undefined;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     /**
@@ -323,9 +327,8 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private setSession;
     endSession(): Promise<void>;
     getNetwork(): Promise<number | undefined>;
-    providerSwitchNetwork({ network, provider, }: {
+    providerSwitchNetwork({ network, }: {
         network: EvmNetwork;
-        provider: WalletClient;
     }): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
     private isMetaMask;