@dynamic-labs/ethereum 1.0.0-alpha.0 → 1.0.0-alpha.10

package/src/ethProviderHelper.cjs

@@ -7,12 +7,20 @@ var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var eventListenerHandlers = require('./utils/eventListenerHandlers.cjs');
+var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
     constructor(wallet) {
         this.wallet = wallet;
     }
     getInstalledProvider() {
+        const eip6963Config = this.getEip6963Config();
+        if (eip6963Config) {
+            const eip6963Provider = this.eip6963ProviderLookup(eip6963Config.rdns);
+            if (eip6963Provider) {
+                return eip6963Provider;
+            }
+        }
         const config = this.getInjectedConfig();
         if (!config ||
             !config.extensionLocators ||
@@ -20,6 +28,11 @@ class EthProviderHelper {
             return undefined;
         return this.installedProviderLookup(config.extensionLocators);
     }
+    getEip6963Config() {
+        if (!this.wallet || !this.wallet.eip6963Config)
+            return;
+        return this.wallet.eip6963Config;
+    }
     getInjectedConfig() {
         if (!this.wallet || !this.wallet.injectedConfig)
             return;
@@ -52,6 +65,11 @@ class EthProviderHelper {
         const allInstalledProviders = this.installedProviders();
         return walletConnectorCore.ProviderLookup(allInstalledProviders, providerFlags);
     }
+    eip6963ProviderLookup(rdns) {
+        var _a;
+        const { providers } = eip6963Provider.Eip6963ProviderSingleton.get();
+        return (_a = providers.find((provider) => provider.info.rdns === rdns)) === null || _a === void 0 ? void 0 : _a.provider;
+    }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
     }

package/src/ethProviderHelper.d.ts

@@ -6,6 +6,9 @@ export declare class EthProviderHelper {
     private wallet;
     constructor(wallet: WalletSchema);
     getInstalledProvider(): IEthereum | undefined;
+    getEip6963Config(): {
+        rdns: string;
+    } | undefined;
     getInjectedConfig(): {
         chain: string;
         extensionLocators: {
@@ -16,6 +19,7 @@ export declare class EthProviderHelper {
     } | undefined;
     installedProviders(): IEthereum[];
     installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): IEthereum | undefined;
+    eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;
     findWalletClient(): WalletClient | undefined;

package/src/ethProviderHelper.js

@@ -3,12 +3,20 @@ import { createWalletClient, custom, getAddress } from 'viem';
 import { ProviderLookup, logger } from '@dynamic-labs/wallet-connector-core';
 import { getProvidersFromWindow } from '@dynamic-labs/utils';
 import { eventListenerHandlers } from './utils/eventListenerHandlers.js';
+import { Eip6963ProviderSingleton } from './eip6963Provider.js';
 
 class EthProviderHelper {
     constructor(wallet) {
         this.wallet = wallet;
     }
     getInstalledProvider() {
+        const eip6963Config = this.getEip6963Config();
+        if (eip6963Config) {
+            const eip6963Provider = this.eip6963ProviderLookup(eip6963Config.rdns);
+            if (eip6963Provider) {
+                return eip6963Provider;
+            }
+        }
         const config = this.getInjectedConfig();
         if (!config ||
             !config.extensionLocators ||
@@ -16,6 +24,11 @@ class EthProviderHelper {
             return undefined;
         return this.installedProviderLookup(config.extensionLocators);
     }
+    getEip6963Config() {
+        if (!this.wallet || !this.wallet.eip6963Config)
+            return;
+        return this.wallet.eip6963Config;
+    }
     getInjectedConfig() {
         if (!this.wallet || !this.wallet.injectedConfig)
             return;
@@ -48,6 +61,11 @@ class EthProviderHelper {
         const allInstalledProviders = this.installedProviders();
         return ProviderLookup(allInstalledProviders, providerFlags);
     }
+    eip6963ProviderLookup(rdns) {
+        var _a;
+        const { providers } = Eip6963ProviderSingleton.get();
+        return (_a = providers.find((provider) => provider.info.rdns === rdns)) === null || _a === void 0 ? void 0 : _a.provider;
+    }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
     }

package/src/walletConnect/walletConnect.cjs

@@ -69,9 +69,14 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
     fetchPublicAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             return client.fetchWalletConnectEVMPublicAddress(walletBook.getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
-                    var _a;
+                    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,
+                        });
+                    }
                 } }));
         });
     }

package/src/walletConnect/walletConnect.js

@@ -61,9 +61,14 @@ class WalletConnect extends EthWalletConnector {
     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;
+                    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,
+                        });
+                    }
                 } }));
         });
     }

package/src/walletConnect/walletConnectV2.cjs

@@ -19,9 +19,12 @@ var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
 const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
+const swicthedNetworkKey = (walletName) => `dynamic-wc2-switched-network-${walletName}`;
+const currentChainKey = (walletName) => `dynamic-wc2-current-chain-${walletName}`;
 const ee = new EventEmitter__default["default"]();
 class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     constructor(opts) {
+        var _a;
         super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
@@ -29,6 +32,9 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
         this.preferredChains = [];
+        // 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.name = opts.walletName;
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
@@ -36,40 +42,17 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!this.preferredChains.includes('eip155:1')) {
             this.preferredChains.push('eip155:1');
         }
+        this.hasSwitchedNetwork =
+            (_a = Boolean(localStorage.getItem(this.swicthedNetworkKey))) !== null && _a !== void 0 ? _a : false;
+        const lsCurrentChain = localStorage.getItem(this.currentChainKey);
+        this.currentChainId = lsCurrentChain
+            ? parseIntSafe.parseIntSafe(lsCurrentChain)
+            : undefined;
     }
-    defaultChainId() {
-        const preferredNetwork = this.preferredChains.find((chain) => this.supportedChain(chain));
-        if (preferredNetwork) {
-            return preferredNetwork;
-        }
-        else if (this.findSupportedChains().length) {
-            return this.findSupportedChains()[0];
-        }
-        else {
-            return 'eip155:1';
-        }
-    }
-    findSupportedChains() {
-        var _a;
-        try {
-            const wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
-            const supportedChains = (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.filter((network) => { var _a; return (_a = wallet === null || wallet === void 0 ? void 0 : wallet.chains) === null || _a === void 0 ? void 0 : _a.includes(`eip155:${network.chainId}`); }).map((network) => `eip155:${network.chainId}`);
-            return supportedChains;
-        }
-        catch (_b) {
-            // pass
-        }
-        return [];
-    }
-    supportedChain(chainId) {
-        var _a;
-        return (_a = this.findSupportedChains().filter((chain) => [`eip155:${chainId}`, chainId].includes(chain))) === null || _a === void 0 ? void 0 : _a[0];
-    }
-    optionalChains() {
+    getMappedChains() {
         return (this.evmNetworks
-            // Filters out mainnet which is required and palm that crashes Trust Wallet
-            .filter((network) => network.chainId !== 11297108109 &&
-            `eip155:${network.chainId}` !== this.defaultChainId())
+            // Filters out palm that crashes Trust Wallet
+            .filter((network) => network.chainId !== 11297108109)
             .map((network) => `eip155:${network.chainId}`));
     }
     initConnection() {
@@ -82,34 +65,26 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (provider === null || provider === void 0 ? void 0 : provider.uri) {
                 return;
             }
-            let optionalNamespaces = {};
-            if (this.optionalChains().length) {
-                optionalNamespaces = {
-                    eip155: {
-                        chains: this.optionalChains(),
-                        events: [],
-                        methods: [
-                            'eth_signTypedData',
-                            'eth_signTransaction',
-                            'eth_sign',
-                            'personal_sign',
-                            'eth_sendTransaction',
-                            'eth_signTypedData_v4',
-                        ],
-                        rpcMap: this.evmNetworkRpcMap(),
-                    },
-                };
-            }
+            const optionalNamespaces = {
+                eip155: {
+                    chains: this.getMappedChains(),
+                    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({
-                namespaces: {
-                    eip155: {
-                        chains: [this.defaultChainId()],
-                        events: ['chainChanged', 'accountsChanged'],
-                        methods: ['personal_sign', 'eth_sendTransaction'],
-                        rpcMap: this.evmNetworkRpcMap(),
-                    },
-                },
                 optionalNamespaces,
             })
                 .catch((e) => {
@@ -125,6 +100,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 projectId: this.projectId,
             });
             WalletConnectV2.provider = provider;
+            this.teardownEventListeners();
+            this.setupEventListeners();
         });
     }
     initProvider() {
@@ -161,6 +138,36 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     get activeAccountKey() {
         return activeAccountKey(this.key);
     }
+    get swicthedNetworkKey() {
+        return swicthedNetworkKey(this.key);
+    }
+    get currentChainKey() {
+        return currentChainKey(this.key);
+    }
+    set currentChainId(value) {
+        this._currentChainId = value;
+        if (value) {
+            localStorage.setItem(this.currentChainKey, value.toString());
+        }
+        else {
+            localStorage.removeItem(this.currentChainKey);
+        }
+    }
+    get currentChainId() {
+        return this._currentChainId;
+    }
+    set hasSwitchedNetwork(value) {
+        this._hasSwitchedNetwork = value;
+        if (value) {
+            localStorage.setItem(this.swicthedNetworkKey, value.toString());
+        }
+        else {
+            localStorage.removeItem(this.swicthedNetworkKey);
+        }
+    }
+    get hasSwitchedNetwork() {
+        return this._hasSwitchedNetwork;
+    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -169,6 +176,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             return;
         }
         WalletConnectV2.provider.client.on('session_event', ({ 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');
                 return;
@@ -180,6 +188,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     walletConnectorCore.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
+                this.currentChainId = chainId;
                 this.emit('chainChange', { chain: String(chainId) });
                 // 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
@@ -193,7 +202,6 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 // eslint-disable-next-line prefer-destructuring
                 const account = data[0].split(':')[2];
                 this.setActiveAccount(account);
-                this.emit('accountChange', { accounts: [account] });
             }
         });
         WalletConnectV2.provider.client.on('session_delete', () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -348,6 +356,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     setActiveAccount(account) {
         localStorage.setItem(this.activeAccountKey, account);
         this.activeAccount = account;
+        this.emit('accountChange', { accounts: [account] });
     }
     setSession(session) {
         localStorage.setItem(this.sessionTopicKey, session.topic);
@@ -358,6 +367,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             this.clearActiveAccount();
             this.clearSession();
+            this.hasSwitchedNetwork = false;
+            this.currentChainId = undefined;
             if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session)) {
                 return;
             }
@@ -377,6 +388,9 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             getNetwork: { get: () => super.getNetwork }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (this.currentChainId) {
+                return this.currentChainId;
+            }
             yield this.initProvider();
             return _super.getNetwork.call(this);
         });
@@ -400,6 +414,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 throw new utils.DynamicError('Provider not found');
             }
             yield _super.providerSwitchNetwork.call(this, { network, provider });
+            this.currentChainId = network.chainId;
+            this.hasSwitchedNetwork = true;
             this.emit('chainChange', { chain: String(network.chainId) });
         });
     }
@@ -417,7 +433,11 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         });
     }
     getSupportedNetworks() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.hasSwitchedNetwork) {
+                return undefined;
+            }
             yield this.initProvider();
             this.refreshSession();
             if (!this.session) {
@@ -431,7 +451,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     chains.push(key.split(':')[1]);
                 }
             });
-            this.session.namespaces.eip155.accounts.forEach((account) => chains.push(account.split(':')[1]));
+            (_a = this.session.namespaces.eip155) === null || _a === void 0 ? void 0 : _a.accounts.forEach((account) => chains.push(account.split(':')[1]));
             return chains.length ? chains : undefined;
         });
     }

package/src/walletConnect/walletConnectV2.d.ts

@@ -23,11 +23,10 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private projectId?;
     private deepLinkPreference;
     private preferredChains;
+    private _currentChainId;
+    private _hasSwitchedNetwork;
     constructor(opts: WalletConnectorV2Opts);
-    private defaultChainId;
-    private findSupportedChains;
-    private supportedChain;
-    private optionalChains;
+    private getMappedChains;
     private initConnection;
     private createInitProviderPromise;
     private initProvider;
@@ -35,6 +34,12 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     init(): Promise<void>;
     get sessionTopicKey(): string;
     get activeAccountKey(): string;
+    get swicthedNetworkKey(): string;
+    get currentChainKey(): string;
+    private set currentChainId(value);
+    private get currentChainId();
+    private set hasSwitchedNetwork(value);
+    private get hasSwitchedNetwork();
     supportsNetworkSwitching(): boolean;
     setupEventListeners(): void;
     teardownEventListeners(): void;
@@ -56,20 +61,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>(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, undefined, 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>(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<undefined, 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("viem/_types/actions/wallet/sendRawTransaction").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SendTransactionParameters<undefined, undefined, TChainOverride_2>) => 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>(args: import("viem/_types/actions/wallet/signTransaction").SignTransactionParameters<undefined, undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem/_types/actions/wallet/signTransaction").SignTransactionParameters<undefined, undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -280,7 +285,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
         }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, 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>(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, undefined, undefined, TChainOverride_4>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -294,7 +299,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        }>(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, 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>>;
     } | undefined;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     /**