@dynamic-labs/ethereum 0.17.10 → 0.17.12

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [0.17.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.11...v0.17.12) (2023-06-26)
+
+
+### Bug Fixes
+
+* more wc2 improvements ([#2484](https://github.com/dynamic-labs/DynamicAuth/issues/2484)) ([482ed5d](https://github.com/dynamic-labs/DynamicAuth/commit/482ed5d699985ff4a96f4af2ce2a3f7565a6cc1f))
+
+### [0.17.11](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.10...v0.17.11) (2023-06-26)
+
+
+### Bug Fixes
+
+* multiple improvements for WC2 ([#2465](https://github.com/dynamic-labs/DynamicAuth/issues/2465)) ([7d5d7bd](https://github.com/dynamic-labs/DynamicAuth/commit/7d5d7bdcf2dd01ef3810e2fddd46d56a40effa95)), closes [#2458](https://github.com/dynamic-labs/DynamicAuth/issues/2458)
+
 ### [0.17.10](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.9...v0.17.10) (2023-06-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "0.17.10",
+  "version": "0.17.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -28,14 +28,15 @@
   "dependencies": {
     "@walletconnect/client": "1.8.0",
     "@walletconnect/ethereum-provider": "1.8.0",
-    "@walletconnect/universal-provider": "2.8.0",
+    "@walletconnect/universal-provider": "2.8.3",
     "ethers": "5.7.2",
+    "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-providers": "0.17.10",
-    "@dynamic-labs/types": "0.17.10",
-    "@dynamic-labs/utils": "0.17.10",
-    "@dynamic-labs/wallet-book": "0.17.10",
-    "@dynamic-labs/wallet-connector-core": "0.17.10"
+    "@dynamic-labs/rpc-providers": "0.17.12",
+    "@dynamic-labs/types": "0.17.12",
+    "@dynamic-labs/utils": "0.17.12",
+    "@dynamic-labs/wallet-book": "0.17.12",
+    "@dynamic-labs/wallet-connector-core": "0.17.12"
   },
   "peerDependencies": {}
 }

package/src/index.cjs

@@ -4,13 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
 var index = require('./injected/index.cjs');
-require('@walletconnect/universal-provider');
+require('./walletConnect/walletConnectV2.cjs');
+require('@walletconnect/ethereum-provider');
 require('ethers');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 var EthWalletConnector = require('./EthWalletConnector.cjs');
-require('@walletconnect/ethereum-provider');
 var constants = require('./constants.cjs');
 require('@walletconnect/client');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');

package/src/index.js

@@ -1,13 +1,13 @@
 import './polyfills.js';
 import { injectedWallets } from './injected/index.js';
 export { injectedWallets } from './injected/index.js';
-import '@walletconnect/universal-provider';
+import './walletConnect/walletConnectV2.js';
+import '@walletconnect/ethereum-provider';
 import 'ethers';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 export { EthWalletConnector } from './EthWalletConnector.js';
-import '@walletconnect/ethereum-provider';
 export { INFURA_ID } from './constants.js';
 import '@walletconnect/client';
 import { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';

package/src/utils/isString.d.ts

@@ -0,0 +1 @@
+export declare const isString: (value: unknown) => value is string;

package/src/utils/last.d.ts

@@ -0,0 +1 @@
+export declare const last: <T = unknown>(array: T[]) => T | undefined;

package/src/utils/parseIntSafe.cjs

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+
+const parseIntSafe = (value, radix = 10) => {
+    try {
+        const int = parseInt(String(value), radix);
+        if (isNaN(int)) {
+            walletConnectorCore.logger.error(`Error parsing ${value}`);
+            return undefined;
+        }
+        return int;
+    }
+    catch (e) {
+        walletConnectorCore.logger.error(`Error parsing ${value} to int: ${e}`);
+    }
+    return undefined;
+};
+
+exports.parseIntSafe = parseIntSafe;

package/src/utils/parseIntSafe.d.ts

@@ -0,0 +1 @@
+export declare const parseIntSafe: (value: string | number, radix?: number) => number | undefined;

package/src/utils/parseIntSafe.js

@@ -0,0 +1,18 @@
+import { logger } from '@dynamic-labs/wallet-connector-core';
+
+const parseIntSafe = (value, radix = 10) => {
+    try {
+        const int = parseInt(String(value), radix);
+        if (isNaN(int)) {
+            logger.error(`Error parsing ${value}`);
+            return undefined;
+        }
+        return int;
+    }
+    catch (e) {
+        logger.error(`Error parsing ${value} to int: ${e}`);
+    }
+    return undefined;
+};
+
+export { parseIntSafe };

package/src/walletConnect/walletConnectV2.cjs

@@ -5,21 +5,27 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../_virtual/_tslib.cjs');
 var Provider = require('@walletconnect/universal-provider');
 var ethers = require('ethers');
+var EventEmitter = require('eventemitter3');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/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 EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
+const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
+const ee = new EventEmitter__default["default"]();
 class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     constructor(opts) {
         super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
+        this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
         this.name = opts.walletName;
@@ -35,24 +41,39 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (provider === null || provider === void 0 ? void 0 : provider.uri) {
                 return;
             }
-            yield provider.connect({
+            const defaultChain = 1;
+            provider
+                .connect({
                 namespaces: {
+                    eip155: {
+                        chains: [`eip155:${defaultChain}`],
+                        events: ['chainChanged', 'accountsChanged'],
+                        methods: ['personal_sign', 'eth_sendTransaction'],
+                        rpcMap: this.evmNetworkRpcMap(),
+                    },
+                },
+                optionalNamespaces: {
                     eip155: {
                         chains: this.evmNetworks
-                            // filtering out Palm for now since it causes Trust to crash
-                            .filter((network) => network.chainId !== 11297108109)
+                            // Filters out mainnet which is required and palm that crashes Trust Wallet
+                            .filter((network) => network.chainId !== 11297108109 &&
+                            network.chainId !== defaultChain)
                             .map((network) => `eip155:${network.chainId}`),
-                        events: ['chainChanged', 'accountsChanged'],
+                        events: [],
                         methods: [
-                            'eth_sendTransaction',
+                            'eth_signTypedData',
                             'eth_signTransaction',
                             'eth_sign',
                             'personal_sign',
-                            'eth_signTypedData',
+                            'eth_sendTransaction',
                         ],
                         rpcMap: this.evmNetworkRpcMap(),
                     },
                 },
+            })
+                .catch((e) => {
+                walletConnectorCore.logger.error(e);
+                ee.emit('walletconnect_connection_failed');
             });
         });
     }
@@ -68,11 +89,13 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         });
     }
     refreshSession() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if ((_b = (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.topic) {
             if (localStorage.getItem(this.sessionTopicKey) ===
                 ((_d = (_c = WalletConnectV2.provider) === null || _c === void 0 ? void 0 : _c.session) === null || _d === void 0 ? void 0 : _d.topic)) {
                 this.session = WalletConnectV2.provider.session;
+                this.activeAccount =
+                    (_e = localStorage.getItem(this.activeAccountKey)) !== null && _e !== void 0 ? _e : undefined;
             }
         }
     }
@@ -80,11 +103,15 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.initProvider();
             yield this.initConnection();
+            this.isInitialized = true;
         });
     }
     get sessionTopicKey() {
         return sessionTopicKey(this.key);
     }
+    get activeAccountKey() {
+        return activeAccountKey(this.key);
+    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -100,18 +127,22 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             }
             const { name, data } = params.event;
             if (name === 'chainChanged') {
-                if (typeof data !== 'string') {
+                const chainId = parseIntSafe.parseIntSafe(data);
+                if (chainId === undefined) {
                     walletConnectorCore.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
-                (_a = listeners.onChainChange) === null || _a === void 0 ? void 0 : _a.call(listeners, data);
+                (_a = listeners.onChainChange) === null || _a === void 0 ? void 0 : _a.call(listeners, String(chainId));
             }
             else if (name === 'accountsChanged') {
-                if (typeof data !== 'string' || !Array.isArray(data)) {
+                if (!Array.isArray(data)) {
                     walletConnectorCore.logger.debug(`received unexpected data for accountsChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
-                (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, data);
+                // eslint-disable-next-line prefer-destructuring
+                const account = data[0].split(':')[2];
+                this.setActiveAccount(account);
+                (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [account]);
             }
         });
         WalletConnectV2.provider.client.on('session_delete', () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -148,15 +179,25 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         return new ethers.ethers.providers.Web3Provider(WalletConnectV2.provider, 'any');
     }
     fetchPublicAddress(opts) {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.session) {
-                return this.session.namespaces.eip155.accounts[0].split(':')[2];
+            if (this.activeAccount) {
+                return this.activeAccount;
             }
-            if (!WalletConnectV2.provider) {
-                throw new utils.DynamicError('No provider found');
-            }
-            if (!WalletConnectV2.provider.uri) {
-                throw new utils.DynamicError('No uri found');
+            if (!WalletConnectV2.provider || !((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri)) {
+                walletConnectorCore.logger.debug('No WC2 provider found, re-initializing...');
+                yield this.endSession();
+                yield this.init();
+                // sleep 1 s to wait for connect call to finish
+                // the connect call isn't await-ed because it only resolves once
+                // the connection is established, but we need to wait for it to
+                // 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)) {
+                    walletConnectorCore.logger.debug('No WC2 provider found, escaping and throwing error');
+                    throw new utils.DynamicError('No provider found');
+                }
             }
             const metadata = walletBook.getWalletBookWallet(this.name);
             walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
@@ -168,13 +209,21 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                     reject(new utils.DynamicError('No provider found'));
                     return;
                 }
+                ee.on('walletconnect_connection_failed', () => {
+                    const error = new utils.DynamicError('Connection rejected. Please try again.');
+                    error.code = 'connection_rejected';
+                    if (WalletConnectV2.provider) {
+                        WalletConnectV2.provider.uri = undefined;
+                    }
+                    reject(error);
+                });
                 WalletConnectV2.provider.on('connect', ({ session }) => {
                     if (!session) {
                         reject(new utils.DynamicError('No session found'));
                     }
-                    this.session = session;
-                    localStorage.setItem(this.sessionTopicKey, session.topic);
-                    resolve(this.session.namespaces.eip155.accounts[0].split(':')[2]);
+                    this.setSession(session);
+                    this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
+                    resolve(this.activeAccount);
                 });
             });
         });
@@ -194,34 +243,69 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 const deepLink = walletConnectorCore.getDeepLink({ metadata, mode: 'regular' });
                 window.location.href = deepLink;
             }
-            // eslint-disable-next-line prefer-destructuring
-            const address = this.session.namespaces.eip155.accounts[0].split(':')[2];
             const web3Provider = this.getWeb3Provider();
-            return web3Provider.send('personal_sign', [
+            const response = web3Provider.send('personal_sign', [
                 walletConnectorCore.utf8ToHex(messageToSign, true),
-                address,
+                this.activeAccount,
             ]);
+            try {
+                // A terrible hack to get MM to sign the message when it is on the wrong chain
+                // Since MM supports only one chain at a time, it just hangs when we call
+                // to sign, and it is not on Mainnet. For some magical reason,
+                // when we attempt to call again it just works.
+                if (this.key === 'metamask') {
+                    yield this.promiseWithTimeout(7000, response);
+                }
+            }
+            catch (e) {
+                walletConnectorCore.logger.debug('metmask failed to sign message');
+                throw e;
+            }
+            return response;
         });
     }
+    clearActiveAccount() {
+        localStorage.removeItem(this.activeAccountKey);
+        this.activeAccount = undefined;
+    }
+    clearSession() {
+        localStorage.removeItem(this.sessionTopicKey);
+        this.session = undefined;
+    }
+    setActiveAccount(account) {
+        localStorage.setItem(this.activeAccountKey, account);
+        this.activeAccount = account;
+    }
+    setSession(session) {
+        localStorage.setItem(this.sessionTopicKey, session.topic);
+        this.session = session;
+    }
     endSession() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!this.session) {
-                return;
-            }
-            if (!WalletConnectV2.provider) {
+            this.clearActiveAccount();
+            this.clearSession();
+            if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session)) {
                 return;
             }
             try {
                 yield WalletConnectV2.provider.disconnect();
                 WalletConnectV2.provider.uri = undefined;
-                localStorage.removeItem(this.sessionTopicKey);
-                this.session = undefined;
             }
             catch (e) {
                 walletConnectorCore.logger.debug(e);
             }
         });
     }
+    getNetwork() {
+        const _super = Object.create(null, {
+            getNetwork: { get: () => super.getNetwork }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            return _super.getNetwork.call(this);
+        });
+    }
     providerSwitchNetwork({ network, provider, }) {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
@@ -244,14 +328,46 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         });
     }
     getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            this.refreshSession();
+            this.isInitialized = true;
+            if (!this.activeAccount) {
+                return [];
+            }
+            return [this.activeAccount];
+        });
+    }
+    getSupportedNetworks() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.initProvider();
             this.refreshSession();
             if (!this.session) {
                 return [];
             }
-            return [this.session.namespaces.eip155.accounts[0].split(':')[2]];
+            const chains = [];
+            // Some wallet (i.e ZenGo) use namespaces.account to list supported chains
+            // while others use keys within the namespaces object
+            Object.keys(this.session.namespaces).forEach((key) => {
+                if (key.startsWith('eip155:')) {
+                    chains.push(key.split(':')[1]);
+                }
+            });
+            this.session.namespaces.eip155.accounts.forEach((account) => chains.push(account.split(':')[1]));
+            return chains.length ? chains : undefined;
+        });
+    }
+    // a HACK for MM to sign message when the selected chain is not mainnet
+    promiseWithTimeout(ms, promise) {
+        // Create a promise that rejects in <ms> milliseconds
+        const timeout = new Promise((_, reject) => {
+            const id = setTimeout(() => {
+                clearTimeout(id);
+                reject(new utils.DynamicError(undefined, 'metamask_timeout'));
+            }, ms);
         });
+        // Returns a race between our timeout and the passed in promise
+        return Promise.race([promise, timeout]);
     }
 }
 

package/src/walletConnect/walletConnectV2.d.ts

@@ -12,6 +12,8 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     connectedChain: Chain;
     name: string;
     session: SessionTypes.Struct | undefined;
+    activeAccount: string | undefined;
+    isInitialized: boolean;
     canConnectViaQrCode: boolean;
     isWalletConnect: boolean;
     private static provider;
@@ -22,6 +24,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     private refreshSession;
     init(): Promise<void>;
     get sessionTopicKey(): string;
+    get activeAccountKey(): string;
     supportsNetworkSwitching(): boolean;
     setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
@@ -29,10 +32,17 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     getWeb3Provider(): ethers.providers.Web3Provider;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
+    private clearActiveAccount;
+    private clearSession;
+    private setActiveAccount;
+    private setSession;
     endSession(): Promise<void>;
+    getNetwork(): Promise<number | undefined>;
     providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
         provider: ethers.providers.Web3Provider;
     }): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
+    getSupportedNetworks(): Promise<string[] | undefined>;
+    private promiseWithTimeout;
 }

package/src/walletConnect/walletConnectV2.js

@@ -1,17 +1,22 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import Provider from '@walletconnect/universal-provider';
 import { ethers } from 'ethers';
+import EventEmitter from 'eventemitter3';
 import { logger, getDeepLink, performPlatformSpecificConnectionMethod, utf8ToHex } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { DynamicError, isMobile } from '@dynamic-labs/utils';
 import { EthWalletConnector } from '../EthWalletConnector.js';
+import { parseIntSafe } from '../utils/parseIntSafe.js';
 
+const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
+const ee = new EventEmitter();
 class WalletConnectV2 extends EthWalletConnector {
     constructor(opts) {
         super(opts);
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
+        this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
         this.name = opts.walletName;
@@ -27,24 +32,39 @@ class WalletConnectV2 extends EthWalletConnector {
             if (provider === null || provider === void 0 ? void 0 : provider.uri) {
                 return;
             }
-            yield provider.connect({
+            const defaultChain = 1;
+            provider
+                .connect({
                 namespaces: {
+                    eip155: {
+                        chains: [`eip155:${defaultChain}`],
+                        events: ['chainChanged', 'accountsChanged'],
+                        methods: ['personal_sign', 'eth_sendTransaction'],
+                        rpcMap: this.evmNetworkRpcMap(),
+                    },
+                },
+                optionalNamespaces: {
                     eip155: {
                         chains: this.evmNetworks
-                            // filtering out Palm for now since it causes Trust to crash
-                            .filter((network) => network.chainId !== 11297108109)
+                            // Filters out mainnet which is required and palm that crashes Trust Wallet
+                            .filter((network) => network.chainId !== 11297108109 &&
+                            network.chainId !== defaultChain)
                             .map((network) => `eip155:${network.chainId}`),
-                        events: ['chainChanged', 'accountsChanged'],
+                        events: [],
                         methods: [
-                            'eth_sendTransaction',
+                            'eth_signTypedData',
                             'eth_signTransaction',
                             'eth_sign',
                             'personal_sign',
-                            'eth_signTypedData',
+                            'eth_sendTransaction',
                         ],
                         rpcMap: this.evmNetworkRpcMap(),
                     },
                 },
+            })
+                .catch((e) => {
+                logger.error(e);
+                ee.emit('walletconnect_connection_failed');
             });
         });
     }
@@ -60,11 +80,13 @@ class WalletConnectV2 extends EthWalletConnector {
         });
     }
     refreshSession() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if ((_b = (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.topic) {
             if (localStorage.getItem(this.sessionTopicKey) ===
                 ((_d = (_c = WalletConnectV2.provider) === null || _c === void 0 ? void 0 : _c.session) === null || _d === void 0 ? void 0 : _d.topic)) {
                 this.session = WalletConnectV2.provider.session;
+                this.activeAccount =
+                    (_e = localStorage.getItem(this.activeAccountKey)) !== null && _e !== void 0 ? _e : undefined;
             }
         }
     }
@@ -72,11 +94,15 @@ class WalletConnectV2 extends EthWalletConnector {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.initProvider();
             yield this.initConnection();
+            this.isInitialized = true;
         });
     }
     get sessionTopicKey() {
         return sessionTopicKey(this.key);
     }
+    get activeAccountKey() {
+        return activeAccountKey(this.key);
+    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -92,18 +118,22 @@ class WalletConnectV2 extends EthWalletConnector {
             }
             const { name, data } = params.event;
             if (name === 'chainChanged') {
-                if (typeof data !== 'string') {
+                const chainId = parseIntSafe(data);
+                if (chainId === undefined) {
                     logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
-                (_a = listeners.onChainChange) === null || _a === void 0 ? void 0 : _a.call(listeners, data);
+                (_a = listeners.onChainChange) === null || _a === void 0 ? void 0 : _a.call(listeners, String(chainId));
             }
             else if (name === 'accountsChanged') {
-                if (typeof data !== 'string' || !Array.isArray(data)) {
+                if (!Array.isArray(data)) {
                     logger.debug(`received unexpected data for accountsChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
-                (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, data);
+                // eslint-disable-next-line prefer-destructuring
+                const account = data[0].split(':')[2];
+                this.setActiveAccount(account);
+                (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [account]);
             }
         });
         WalletConnectV2.provider.client.on('session_delete', () => __awaiter(this, void 0, void 0, function* () {
@@ -140,15 +170,25 @@ class WalletConnectV2 extends EthWalletConnector {
         return new ethers.providers.Web3Provider(WalletConnectV2.provider, 'any');
     }
     fetchPublicAddress(opts) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.session) {
-                return this.session.namespaces.eip155.accounts[0].split(':')[2];
+            if (this.activeAccount) {
+                return this.activeAccount;
             }
-            if (!WalletConnectV2.provider) {
-                throw new DynamicError('No provider found');
-            }
-            if (!WalletConnectV2.provider.uri) {
-                throw new DynamicError('No uri found');
+            if (!WalletConnectV2.provider || !((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri)) {
+                logger.debug('No WC2 provider found, re-initializing...');
+                yield this.endSession();
+                yield this.init();
+                // sleep 1 s to wait for connect call to finish
+                // the connect call isn't await-ed because it only resolves once
+                // the connection is established, but we need to wait for it to
+                // 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)) {
+                    logger.debug('No WC2 provider found, escaping and throwing error');
+                    throw new DynamicError('No provider found');
+                }
             }
             const metadata = getWalletBookWallet(this.name);
             performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
@@ -160,13 +200,21 @@ class WalletConnectV2 extends EthWalletConnector {
                     reject(new DynamicError('No provider found'));
                     return;
                 }
+                ee.on('walletconnect_connection_failed', () => {
+                    const error = new DynamicError('Connection rejected. Please try again.');
+                    error.code = 'connection_rejected';
+                    if (WalletConnectV2.provider) {
+                        WalletConnectV2.provider.uri = undefined;
+                    }
+                    reject(error);
+                });
                 WalletConnectV2.provider.on('connect', ({ session }) => {
                     if (!session) {
                         reject(new DynamicError('No session found'));
                     }
-                    this.session = session;
-                    localStorage.setItem(this.sessionTopicKey, session.topic);
-                    resolve(this.session.namespaces.eip155.accounts[0].split(':')[2]);
+                    this.setSession(session);
+                    this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
+                    resolve(this.activeAccount);
                 });
             });
         });
@@ -186,34 +234,69 @@ class WalletConnectV2 extends EthWalletConnector {
                 const deepLink = getDeepLink({ metadata, mode: 'regular' });
                 window.location.href = deepLink;
             }
-            // eslint-disable-next-line prefer-destructuring
-            const address = this.session.namespaces.eip155.accounts[0].split(':')[2];
             const web3Provider = this.getWeb3Provider();
-            return web3Provider.send('personal_sign', [
+            const response = web3Provider.send('personal_sign', [
                 utf8ToHex(messageToSign, true),
-                address,
+                this.activeAccount,
             ]);
+            try {
+                // A terrible hack to get MM to sign the message when it is on the wrong chain
+                // Since MM supports only one chain at a time, it just hangs when we call
+                // to sign, and it is not on Mainnet. For some magical reason,
+                // when we attempt to call again it just works.
+                if (this.key === 'metamask') {
+                    yield this.promiseWithTimeout(7000, response);
+                }
+            }
+            catch (e) {
+                logger.debug('metmask failed to sign message');
+                throw e;
+            }
+            return response;
         });
     }
+    clearActiveAccount() {
+        localStorage.removeItem(this.activeAccountKey);
+        this.activeAccount = undefined;
+    }
+    clearSession() {
+        localStorage.removeItem(this.sessionTopicKey);
+        this.session = undefined;
+    }
+    setActiveAccount(account) {
+        localStorage.setItem(this.activeAccountKey, account);
+        this.activeAccount = account;
+    }
+    setSession(session) {
+        localStorage.setItem(this.sessionTopicKey, session.topic);
+        this.session = session;
+    }
     endSession() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.session) {
-                return;
-            }
-            if (!WalletConnectV2.provider) {
+            this.clearActiveAccount();
+            this.clearSession();
+            if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.session)) {
                 return;
             }
             try {
                 yield WalletConnectV2.provider.disconnect();
                 WalletConnectV2.provider.uri = undefined;
-                localStorage.removeItem(this.sessionTopicKey);
-                this.session = undefined;
             }
             catch (e) {
                 logger.debug(e);
             }
         });
     }
+    getNetwork() {
+        const _super = Object.create(null, {
+            getNetwork: { get: () => super.getNetwork }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            return _super.getNetwork.call(this);
+        });
+    }
     providerSwitchNetwork({ network, provider, }) {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
@@ -236,14 +319,46 @@ class WalletConnectV2 extends EthWalletConnector {
         });
     }
     getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            this.refreshSession();
+            this.isInitialized = true;
+            if (!this.activeAccount) {
+                return [];
+            }
+            return [this.activeAccount];
+        });
+    }
+    getSupportedNetworks() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.initProvider();
             this.refreshSession();
             if (!this.session) {
                 return [];
             }
-            return [this.session.namespaces.eip155.accounts[0].split(':')[2]];
+            const chains = [];
+            // Some wallet (i.e ZenGo) use namespaces.account to list supported chains
+            // while others use keys within the namespaces object
+            Object.keys(this.session.namespaces).forEach((key) => {
+                if (key.startsWith('eip155:')) {
+                    chains.push(key.split(':')[1]);
+                }
+            });
+            this.session.namespaces.eip155.accounts.forEach((account) => chains.push(account.split(':')[1]));
+            return chains.length ? chains : undefined;
+        });
+    }
+    // a HACK for MM to sign message when the selected chain is not mainnet
+    promiseWithTimeout(ms, promise) {
+        // Create a promise that rejects in <ms> milliseconds
+        const timeout = new Promise((_, reject) => {
+            const id = setTimeout(() => {
+                clearTimeout(id);
+                reject(new DynamicError(undefined, 'metamask_timeout'));
+            }, ms);
         });
+        // Returns a race between our timeout and the passed in promise
+        return Promise.race([promise, timeout]);
     }
 }