@dynamic-labs/ethereum 3.9.6 → 3.9.7

package/src/walletConnect/walletConnect.js

@@ -41,10 +41,7 @@ class WalletConnect extends EthereumWalletConnector {
             : undefined;
     }
     getMappedChains() {
-        return (this.evmNetworks
-            // Filters out palm that crashes Trust Wallet
-            .filter((network) => network.chainId !== 11297108109)
-            .map((network) => `eip155:${network.chainId}`));
+        return this.evmNetworks.map((network) => `eip155:${network.chainId}`);
     }
     getMappedChainsByPreferredOrder() {
         const allChains = this.getMappedChains();
@@ -91,15 +88,19 @@ class WalletConnect extends EthereumWalletConnector {
             });
         });
     }
-    getWalletClientFromInitializedProvider() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const walletConnect = this.createProvider();
-            const walletClient = createWalletClient({
-                account: this.getActiveAccount(),
-                transport: custom(yield walletConnect),
-            });
-            return walletClient;
+    getWalletClient(chainId) {
+        const walletConnect = this.createProvider();
+        const walletClient = createWalletClient({
+            account: this.getActiveAccount(),
+            chain: chainsMap[chainId !== null && chainId !== void 0 ? chainId : String(this.currentChainId)],
+            transport: custom({
+                request: (args) => __awaiter(this, void 0, void 0, function* () {
+                    const provider = yield walletConnect;
+                    return provider.request(args);
+                }),
+            }),
         });
+        return walletClient;
     }
     createInitProviderPromise() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -123,14 +124,23 @@ class WalletConnect extends EthereumWalletConnector {
         });
     }
     refreshSession() {
-        var _a, _b, _c, _d, _e;
-        if ((_b = (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.topic) {
-            if (localStorage.getItem(this.sessionTopicKey) ===
-                ((_d = (_c = WalletConnect.provider) === null || _c === void 0 ? void 0 : _c.session) === null || _d === void 0 ? void 0 : _d.topic)) {
-                this.session = WalletConnect.provider.session;
-                this.setActiveAccount(((_e = localStorage.getItem(this.activeAccountKey)) !== null && _e !== void 0 ? _e : undefined));
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            if ((_b = (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.topic) {
+                if (localStorage.getItem(this.sessionTopicKey) ===
+                    ((_d = (_c = WalletConnect.provider) === null || _c === void 0 ? void 0 : _c.session) === null || _d === void 0 ? void 0 : _d.topic)) {
+                    this.session = WalletConnect.provider.session;
+                    this.setActiveAccount(((_e = localStorage.getItem(this.activeAccountKey)) !== null && _e !== void 0 ? _e : undefined));
+                }
             }
-        }
+            const walletClient = this.getWalletClient();
+            const walletChainId = yield walletClient.getChainId();
+            logger.debug('checking selected chain in refreshSession', this.name, walletChainId, this.currentChainId);
+            if (this.currentChainId && this.currentChainId !== walletChainId) {
+                logger.debug('switching to selected chain', this.currentChainId);
+                yield walletClient.switchChain({ id: this.currentChainId });
+            }
+        });
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -230,16 +240,6 @@ class WalletConnect extends EthereumWalletConnector {
         WalletConnect.provider.off('session_event', this.sessionEventHandler);
         WalletConnect.provider.off('session_delete', this.sessionDeleteHandler);
     }
-    getWalletClient(chainId) {
-        if (!WalletConnect.provider) {
-            return;
-        }
-        return createWalletClient({
-            account: this.getActiveAccount(),
-            chain: chainsMap[chainId !== null && chainId !== void 0 ? chainId : String(this.currentChainId)],
-            transport: custom(WalletConnect.provider),
-        });
-    }
     getAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -376,7 +376,7 @@ class WalletConnect extends EthereumWalletConnector {
                 if (!activeAccount) {
                     return;
                 }
-                const walletClient = yield this.getWalletClientFromInitializedProvider();
+                const walletClient = yield this.getWalletClient();
                 return walletClient.signMessage({
                     account: activeAccount,
                     message: messageToSign,
@@ -457,7 +457,7 @@ class WalletConnect extends EthereumWalletConnector {
             if (!this.supportsNetworkSwitching()) {
                 throw new DynamicError('Network switching not supported');
             }
-            const walletClient = yield this.getWalletClientFromInitializedProvider();
+            const walletClient = yield this.getWalletClient();
             if (this.isMetaMask()) {
                 const deepLink = this.getDeepLink();
                 if (deepLink) {
@@ -474,7 +474,7 @@ class WalletConnect extends EthereumWalletConnector {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInitialized === false) {
                 yield this.initProvider();
-                this.refreshSession();
+                yield this.refreshSession();
                 this.isInitialized = true;
             }
             const activeAccount = this.getActiveAccount();
@@ -492,7 +492,7 @@ class WalletConnect extends EthereumWalletConnector {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             yield this.initProvider();
-            this.refreshSession();
+            yield this.refreshSession();
             if (this.isMetaMask()) {
                 if (this.hasSwitchedNetwork) {
                     return [String(this.currentChainId)];