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

package/src/walletConnect/walletConnectV2.js

@@ -10,9 +10,12 @@ import { parseIntSafe } from '../utils/parseIntSafe.js';
 
 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();
 class WalletConnectV2 extends EthWalletConnector {
     constructor(opts) {
+        var _a;
         super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
@@ -20,6 +23,9 @@ class WalletConnectV2 extends 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';
@@ -27,40 +33,17 @@ class WalletConnectV2 extends 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(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 = 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() {
@@ -73,34 +56,26 @@ class WalletConnectV2 extends 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) => {
@@ -116,6 +91,8 @@ class WalletConnectV2 extends EthWalletConnector {
                 projectId: this.projectId,
             });
             WalletConnectV2.provider = provider;
+            this.teardownEventListeners();
+            this.setupEventListeners();
         });
     }
     initProvider() {
@@ -152,6 +129,36 @@ class WalletConnectV2 extends 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;
     }
@@ -160,6 +167,7 @@ class WalletConnectV2 extends EthWalletConnector {
             return;
         }
         WalletConnectV2.provider.client.on('session_event', ({ params }) => {
+            logger.debug('session_event was called', { params });
             if (!params || !params.event) {
                 logger.debug('session_event was called without params or params.event');
                 return;
@@ -171,6 +179,7 @@ class WalletConnectV2 extends EthWalletConnector {
                     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
@@ -184,7 +193,6 @@ class WalletConnectV2 extends 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', () => __awaiter(this, void 0, void 0, function* () {
@@ -339,6 +347,7 @@ class WalletConnectV2 extends EthWalletConnector {
     setActiveAccount(account) {
         localStorage.setItem(this.activeAccountKey, account);
         this.activeAccount = account;
+        this.emit('accountChange', { accounts: [account] });
     }
     setSession(session) {
         localStorage.setItem(this.sessionTopicKey, session.topic);
@@ -349,6 +358,8 @@ class WalletConnectV2 extends EthWalletConnector {
         return __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;
             }
@@ -368,6 +379,9 @@ class WalletConnectV2 extends EthWalletConnector {
             getNetwork: { get: () => super.getNetwork }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.currentChainId) {
+                return this.currentChainId;
+            }
             yield this.initProvider();
             return _super.getNetwork.call(this);
         });
@@ -391,6 +405,8 @@ class WalletConnectV2 extends EthWalletConnector {
                 throw new 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) });
         });
     }
@@ -408,7 +424,11 @@ class WalletConnectV2 extends EthWalletConnector {
         });
     }
     getSupportedNetworks() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.hasSwitchedNetwork) {
+                return undefined;
+            }
             yield this.initProvider();
             this.refreshSession();
             if (!this.session) {
@@ -422,7 +442,7 @@ class WalletConnectV2 extends 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;
         });
     }