@dynamic-labs/ethereum 0.17.0-RC.9 → 0.17.0

package/src/injected/index.js

@@ -22,6 +22,7 @@ import { UnknownInjectedWallet } from './UnknownInjectedWallet.js';
 export { UnknownInjectedWallet } from './UnknownInjectedWallet.js';
 import { Zerion } from './Zerion.js';
 export { Zerion } from './Zerion.js';
+import { Superb } from './Superb.js';
 
 const injectedWallets = [
     BloctoInjected,
@@ -36,6 +37,7 @@ const injectedWallets = [
     Trust,
     UnknownInjectedWallet,
     Zerion,
+    Superb,
 ];
 
 export { injectedWallets };

package/src/polyfills.cjs

@@ -0,0 +1,16 @@
+'use strict';
+
+var _ = require('buffer/');
+
+/* eslint-disable */
+/**
+ * @walletconnect/client and @walletconnect/qrcode-modal use `global` and `Buffer`, respectively.
+ * This issue is captured here: https://github.com/WalletConnect/walletconnect-monorepo/issues/341
+ * Here are some GH issues of others facing the same problem:
+ *   * https://github.com/WalletConnect/walletconnect-monorepo/issues/734
+ *   * https://github.com/WalletConnect/walletconnect-monorepo/issues/748
+ */
+if (typeof window !== 'undefined') {
+    window.global = globalThis;
+    Object.assign(window, { Buffer: _.Buffer });
+}

package/src/polyfills.d.ts

@@ -0,0 +1 @@
+export {};

package/src/polyfills.js

@@ -0,0 +1,14 @@
+import { Buffer } from 'buffer/index.js';
+
+/* eslint-disable */
+/**
+ * @walletconnect/client and @walletconnect/qrcode-modal use `global` and `Buffer`, respectively.
+ * This issue is captured here: https://github.com/WalletConnect/walletconnect-monorepo/issues/341
+ * Here are some GH issues of others facing the same problem:
+ *   * https://github.com/WalletConnect/walletconnect-monorepo/issues/734
+ *   * https://github.com/WalletConnect/walletconnect-monorepo/issues/748
+ */
+if (typeof window !== 'undefined') {
+    window.global = globalThis;
+    Object.assign(window, { Buffer });
+}

package/src/types.d.ts

@@ -1,11 +1,13 @@
 import { ProviderCondition } from '@dynamic-labs/wallet-connector-core';
 declare global {
+    interface IWindowPhantom {
+        ethereum: IEthereum;
+    }
     interface Window {
         ethereum?: IEthereum;
-        phantom?: {
-            ethereum: IEthereum;
-        };
+        phantom?: IWindowPhantom;
         zerionWallet?: IEthereum;
+        superb?: IEthereum;
     }
 }
 export type IEthereum = {
@@ -16,5 +18,5 @@ export type IEthereum = {
         method: T;
     } | object) => Promise<T extends 'eth_requestAccounts' ? [string] : object>;
 };
-export type ProviderFlag = 'isDawn' | 'isBraveWallet' | 'isCoinbaseWallet' | 'isFrame' | 'isGamestop' | 'isMetaMask' | 'isExodus' | 'isOpera' | 'isBlocto' | 'isTrustWallet' | 'isZerion' | 'isPhantom';
+export type ProviderFlag = 'isDawn' | 'isBraveWallet' | 'isCoinbaseWallet' | 'isFrame' | 'isGamestop' | 'isMetaMask' | 'isExodus' | 'isOpera' | 'isBlocto' | 'isTrustWallet' | 'isZerion' | 'isPhantom' | 'isSuperb';
 export type EthProviderCondition = ProviderCondition<ProviderFlag>;

package/src/walletConnect/client/client.cjs

@@ -72,26 +72,6 @@ const killWalletConnectSession = (client) => _tslib.__awaiter(void 0, void 0, vo
         walletConnectorCore.logger.debug(e);
     }
 });
-const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
-    var _a, _b, _c, _d;
-    if (!utils.isMobile()) {
-        const origin = ((_a = metadata.desktop) === null || _a === void 0 ? void 0 : _a.universal) || ((_b = metadata.desktop) === null || _b === void 0 ? void 0 : _b.native);
-        if (removeWCUri)
-            return origin || '';
-        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
-    }
-    // deeplinks for ios require special treatment
-    // see: https://docs.walletconnect.com/mobile-linking#for-ios
-    else if (utils.isIOS()) {
-        const origin = ((_c = metadata.mobile) === null || _c === void 0 ? void 0 : _c.universal) || ((_d = metadata.mobile) === null || _d === void 0 ? void 0 : _d.native);
-        if (removeWCUri)
-            return origin || '';
-        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
-    }
-    // on android, the deeplink is simply the uri
-    // see: https://docs.walletconnect.com/mobile-linking#for-android
-    return uri;
-};
 const createSession = (client) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve, reject) => {
         client.on('connect', (error, payload) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -104,19 +84,6 @@ const createSession = (client) => _tslib.__awaiter(void 0, void 0, void 0, funct
         });
     });
 });
-const useDeepLink = (metadata, wcClient, opts) => {
-    var _a, _b, _c;
-    const deepLink = getDeepLink(wcClient.uri, metadata);
-    if (utils.isMobile()) {
-        window.location.href = deepLink;
-    }
-    else {
-        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
-            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
-        }
-        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
-    }
-};
 const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (wcClient.connected) {
@@ -125,7 +92,10 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => _tslib.
     }
     // createSession will trigger the QR code...
     yield wcClient.createSession();
-    useDeepLink(metadata, wcClient, opts);
+    walletConnectorCore.performPlatformSpecificConnectionMethod(wcClient.uri, metadata, {
+        onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
+        onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
+    });
     const payload = yield createSession(wcClient);
     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
     const [accountPublicAddress] = payload.params[0].accounts;
@@ -140,8 +110,10 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
     }
     const [accountPublicAddress] = client.accounts;
     if (utils.isMobile()) {
-        const deepLink = getDeepLink(client.uri, metadata, {
-            removeWCUri: utils.isIOS() && isCryptoWallet,
+        const deepLink = walletConnectorCore.getDeepLink({
+            metadata,
+            mode: 'regular',
+            uri: client.uri,
         });
         window.location.href = deepLink;
     }
@@ -219,10 +191,8 @@ const waitForSafeTransaction = (signature, messageToSign, contract) => _tslib.__
 
 exports.createSession = createSession;
 exports.fetchWalletConnectEVMPublicAddress = fetchWalletConnectEVMPublicAddress;
-exports.getDeepLink = getDeepLink;
 exports.initClient = initClient;
 exports.killWalletConnectSession = killWalletConnectSession;
 exports.setupWalletConnectEventListeners = setupWalletConnectEventListeners;
 exports.signWalletConnectPersonalMessage = signWalletConnectPersonalMessage;
 exports.teardownWalletConnectEventListeners = teardownWalletConnectEventListeners;
-exports.useDeepLink = useDeepLink;

package/src/walletConnect/client/client.d.ts

@@ -12,10 +12,6 @@ export declare const teardownWalletConnectEventListeners: (client: Client) => vo
  * Initialize a client from a stored session and terminate the connection.
  */
 export declare const killWalletConnectSession: (client: Client) => Promise<void>;
-export declare const getDeepLink: (uri: string, metadata: WalletSchema, { removeWCUri, }?: {
-    removeWCUri?: boolean | undefined;
-}) => string;
 export declare const createSession: (client: Client) => Promise<PayloadParams>;
-export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
 export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
 export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;

package/src/walletConnect/client/client.js

@@ -1,8 +1,8 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import Client from '@walletconnect/client';
 import { Contract, ethers } from 'ethers';
-import { isSameAddress, logger } from '@dynamic-labs/wallet-connector-core';
-import { isMobile, isIOS } from '@dynamic-labs/utils';
+import { isSameAddress, logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
+import { isMobile } from '@dynamic-labs/utils';
 
 const initClient = (name, settings) => {
     const storageId = `walletconnect-${name}`;
@@ -64,26 +64,6 @@ const killWalletConnectSession = (client) => __awaiter(void 0, void 0, void 0, f
         logger.debug(e);
     }
 });
-const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
-    var _a, _b, _c, _d;
-    if (!isMobile()) {
-        const origin = ((_a = metadata.desktop) === null || _a === void 0 ? void 0 : _a.universal) || ((_b = metadata.desktop) === null || _b === void 0 ? void 0 : _b.native);
-        if (removeWCUri)
-            return origin || '';
-        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
-    }
-    // deeplinks for ios require special treatment
-    // see: https://docs.walletconnect.com/mobile-linking#for-ios
-    else if (isIOS()) {
-        const origin = ((_c = metadata.mobile) === null || _c === void 0 ? void 0 : _c.universal) || ((_d = metadata.mobile) === null || _d === void 0 ? void 0 : _d.native);
-        if (removeWCUri)
-            return origin || '';
-        return `${origin}?uri=${encodeURIComponent(uri !== null && uri !== void 0 ? uri : '')}`;
-    }
-    // on android, the deeplink is simply the uri
-    // see: https://docs.walletconnect.com/mobile-linking#for-android
-    return uri;
-};
 const createSession = (client) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve, reject) => {
         client.on('connect', (error, payload) => __awaiter(void 0, void 0, void 0, function* () {
@@ -96,19 +76,6 @@ const createSession = (client) => __awaiter(void 0, void 0, void 0, function* ()
         });
     });
 });
-const useDeepLink = (metadata, wcClient, opts) => {
-    var _a, _b, _c;
-    const deepLink = getDeepLink(wcClient.uri, metadata);
-    if (isMobile()) {
-        window.location.href = deepLink;
-    }
-    else {
-        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
-            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
-        }
-        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
-    }
-};
 const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (wcClient.connected) {
@@ -117,7 +84,10 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __await
     }
     // createSession will trigger the QR code...
     yield wcClient.createSession();
-    useDeepLink(metadata, wcClient, opts);
+    performPlatformSpecificConnectionMethod(wcClient.uri, metadata, {
+        onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
+        onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
+    });
     const payload = yield createSession(wcClient);
     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
     const [accountPublicAddress] = payload.params[0].accounts;
@@ -132,8 +102,10 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
     }
     const [accountPublicAddress] = client.accounts;
     if (isMobile()) {
-        const deepLink = getDeepLink(client.uri, metadata, {
-            removeWCUri: isIOS() && isCryptoWallet,
+        const deepLink = getDeepLink({
+            metadata,
+            mode: 'regular',
+            uri: client.uri,
         });
         window.location.href = deepLink;
     }
@@ -209,4 +181,4 @@ const waitForSafeTransaction = (signature, messageToSign, contract) => __awaiter
     }
 });
 
-export { createSession, fetchWalletConnectEVMPublicAddress, getDeepLink, initClient, killWalletConnectSession, setupWalletConnectEventListeners, signWalletConnectPersonalMessage, teardownWalletConnectEventListeners, useDeepLink };
+export { createSession, fetchWalletConnectEVMPublicAddress, initClient, killWalletConnectSession, setupWalletConnectEventListeners, signWalletConnectPersonalMessage, teardownWalletConnectEventListeners };

package/src/walletConnect/walletConnect.cjs

@@ -78,8 +78,10 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         if (!utils.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
             return undefined;
         }
-        return client.getDeepLink(this.getClient().uri, wallet, {
-            removeWCUri: utils.isIOS() && walletConnectorCore.normalizeWalletName(this.name) === 'cryptocom',
+        return walletConnectorCore.getDeepLink({
+            metadata: wallet,
+            mode: 'regular',
+            uri: this.getClient().uri,
         });
     }
     signMessage(messageToSign) {
@@ -99,7 +101,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const client$1 = this.getClient();
+            const client = this.getClient();
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
                 return;
@@ -111,11 +113,15 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             if (!this.supportsNetworkSwitching()) {
                 throw new utils.DynamicError('Network switching not supported');
             }
-            if (!client$1) {
+            if (!client) {
                 throw new utils.DynamicError('Client not found');
             }
             if (utils.isMobile()) {
-                const deepLink = client.getDeepLink(client$1.uri, walletBook.getWalletBookWallet(this.name));
+                const deepLink = walletConnectorCore.getDeepLink({
+                    metadata: walletBook.getWalletBookWallet(this.name),
+                    mode: 'regular',
+                    uri: client.uri,
+                });
                 window.location.href = deepLink;
             }
             return _super.providerSwitchNetwork.call(this, { network, provider });

package/src/walletConnect/walletConnect.js

@@ -1,12 +1,12 @@
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
 import WalletConnectProvider from '@walletconnect/ethereum-provider';
 import { ethers } from 'ethers';
-import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
+import { normalizeWalletName, getDeepLink } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { isMobile, isIOS, DynamicError } from '@dynamic-labs/utils';
+import { isMobile, DynamicError } from '@dynamic-labs/utils';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { INFURA_ID } from '../constants.js';
-import { initClient, setupWalletConnectEventListeners, teardownWalletConnectEventListeners, fetchWalletConnectEVMPublicAddress, getDeepLink, signWalletConnectPersonalMessage, killWalletConnectSession } from './client/client.js';
+import { initClient, setupWalletConnectEventListeners, teardownWalletConnectEventListeners, fetchWalletConnectEVMPublicAddress, signWalletConnectPersonalMessage, killWalletConnectSession } from './client/client.js';
 
 class WalletConnect extends EthWalletConnector {
     constructor(_a) {
@@ -70,8 +70,10 @@ class WalletConnect extends EthWalletConnector {
         if (!isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
             return undefined;
         }
-        return getDeepLink(this.getClient().uri, wallet, {
-            removeWCUri: isIOS() && normalizeWalletName(this.name) === 'cryptocom',
+        return getDeepLink({
+            metadata: wallet,
+            mode: 'regular',
+            uri: this.getClient().uri,
         });
     }
     signMessage(messageToSign) {
@@ -107,7 +109,11 @@ class WalletConnect extends EthWalletConnector {
                 throw new DynamicError('Client not found');
             }
             if (isMobile()) {
-                const deepLink = getDeepLink(client.uri, getWalletBookWallet(this.name));
+                const deepLink = getDeepLink({
+                    metadata: getWalletBookWallet(this.name),
+                    mode: 'regular',
+                    uri: client.uri,
+                });
                 window.location.href = deepLink;
             }
             return _super.providerSwitchNetwork.call(this, { network, provider });

package/src/walletConnect/walletConnectV2.cjs

@@ -9,26 +9,11 @@ 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 client = require('./client/client.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var Provider__default = /*#__PURE__*/_interopDefaultLegacy(Provider);
 
-const performPlatformSpecificConnectionMethod = (uri, metadata, opts) => {
-    var _a, _b, _c;
-    if (utils.isMobile()) {
-        const deepLink = client.getDeepLink(uri, metadata);
-        window.location.href = deepLink;
-    }
-    else {
-        if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
-            const desktopUri = client.getDeepLink(uri, metadata);
-            (_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, desktopUri);
-        }
-        (_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, uri);
-    }
-};
 const sessionTopicKey = (walletName) => `dynamic-wc2-session-topic-${walletName}`;
 class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     constructor(opts) {
@@ -40,46 +25,61 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         this.name = opts.walletName;
         this.projectId = opts.projectId;
     }
+    initConnection() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { provider } = WalletConnectV2;
+            if (!provider) {
+                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) {
+                return;
+            }
+            yield provider.connect({
+                namespaces: {
+                    eip155: {
+                        chains: this.evmNetworks
+                            // filtering out Palm for now since it causes Trust to crash
+                            .filter((network) => network.chainId !== 11297108109)
+                            .map((network) => `eip155:${network.chainId}`),
+                        events: ['chainChanged', 'accountsChanged'],
+                        methods: [
+                            'eth_sendTransaction',
+                            'eth_signTransaction',
+                            'eth_sign',
+                            'personal_sign',
+                            'eth_signTypedData',
+                        ],
+                        rpcMap: this.evmNetworkRpcMap(),
+                    },
+                },
+            });
+        });
+    }
     initProvider() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.projectId && !WalletConnectV2.provider) {
-                WalletConnectV2.provider = yield Provider__default["default"].init({
+            let { provider } = WalletConnectV2;
+            if (!provider) {
+                provider = yield Provider__default["default"].init({
                     projectId: this.projectId,
                 });
-                const connection = yield WalletConnectV2.provider.client.connect({
-                    requiredNamespaces: {
-                        eip155: {
-                            chains: this.evmNetworks
-                                // filtering out Palm for now since it causes Trust to crash
-                                .filter((network) => network.chainId !== 11297108109)
-                                .map((network) => `eip155:${network.chainId}`),
-                            events: ['chainChanged', 'accountsChanged'],
-                            methods: [
-                                'eth_sendTransaction',
-                                'eth_signTransaction',
-                                'eth_sign',
-                                'personal_sign',
-                                'eth_signTypedData',
-                            ],
-                        },
-                    },
-                });
-                // eslint-disable-next-line prefer-destructuring
-                WalletConnectV2.provider.uri = connection.uri;
-                WalletConnectV2.createSession = connection.approval;
+                WalletConnectV2.provider = provider;
             }
         });
     }
-    init() {
+    refreshSession() {
         var _a, _b, _c, _d;
+        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;
+            }
+        }
+    }
+    init() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.initProvider();
-            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;
-                }
-            }
+            yield this.initConnection();
         });
     }
     get sessionTopicKey() {
@@ -135,7 +135,11 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!utils.isMobile() && !((_b = wallet.desktop) === null || _b === void 0 ? void 0 : _b.native)) {
             return undefined;
         }
-        return client.getDeepLink(WalletConnectV2.provider.uri, wallet);
+        return walletConnectorCore.getDeepLink({
+            metadata: wallet,
+            mode: 'regular',
+            uri: WalletConnectV2.provider.uri,
+        });
     }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
@@ -148,49 +152,31 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (this.session) {
                 return this.session.namespaces.eip155.accounts[0].split(':')[2];
             }
-            const metadata = walletBook.getWalletBookWallet(this.name);
             if (!WalletConnectV2.provider) {
                 throw new utils.DynamicError('No provider found');
             }
-            if (!WalletConnectV2.provider.uri || !WalletConnectV2.createSession) {
-                throw new utils.DynamicError('No uri or approval found');
+            if (!WalletConnectV2.provider.uri) {
+                throw new utils.DynamicError('No uri found');
             }
-            performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
+            const metadata = walletBook.getWalletBookWallet(this.name);
+            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnectV2.provider.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             });
-            const session = yield WalletConnectV2.createSession();
-            if (!session) {
-                return undefined;
-            }
-            this.session = session;
-            localStorage.setItem(this.sessionTopicKey, session.topic);
-            // need to "reconnect" the provider so that we can tell it what the rpc urls are
-            yield WalletConnectV2.provider.connect({
-                namespaces: {
-                    eip155: {
-                        chains: this.evmNetworks
-                            // filtering out Palm for now since it causes Trust to crash
-                            .filter((network) => network.chainId !== 11297108109)
-                            .map((network) => `eip155:${network.chainId}`),
-                        events: ['chainChanged', 'accountsChanged'],
-                        methods: [
-                            'eth_sendTransaction',
-                            'eth_signTransaction',
-                            'eth_sign',
-                            'personal_sign',
-                            'eth_signTypedData',
-                        ],
-                        rpcMap: this.evmNetworkRpcMap(),
-                    },
-                },
-                skipPairing: true,
+            return new Promise((resolve, reject) => {
+                if (!WalletConnectV2.provider) {
+                    reject(new utils.DynamicError('No provider found'));
+                    return;
+                }
+                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 LINE IS SUPER IMPORTANT
-            // since we are skipping pairing, (see: skipPairing: true above), we need to manually set the session
-            // so that future provider requests work (like getNetwork)
-            WalletConnectV2.provider.session = session;
-            return session.namespaces.eip155.accounts[0].split(':')[2];
         });
     }
     signMessage(messageToSign) {
@@ -205,7 +191,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (utils.isMobile()) {
                 // for sign message, no uri is needed because the uri encodes connection details,
                 // and at this point we are already connected
-                const deepLink = client.getDeepLink('', metadata);
+                const deepLink = walletConnectorCore.getDeepLink({ metadata, mode: 'regular' });
                 window.location.href = deepLink;
             }
             // eslint-disable-next-line prefer-destructuring
@@ -227,7 +213,9 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             }
             try {
                 yield WalletConnectV2.provider.disconnect();
+                WalletConnectV2.provider.uri = undefined;
                 localStorage.removeItem(this.sessionTopicKey);
+                this.session = undefined;
             }
             catch (e) {
                 walletConnectorCore.logger.debug(e);
@@ -257,6 +245,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            this.refreshSession();
             if (!this.session) {
                 return [];
             }

package/src/walletConnect/walletConnectV2.d.ts

@@ -15,10 +15,11 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     canConnectViaQrCode: boolean;
     isWalletConnect: boolean;
     private static provider;
-    private static createSession;
     private projectId?;
     constructor(opts: WalletConnectorV2Opts);
+    private initConnection;
     private initProvider;
+    private refreshSession;
     init(): Promise<void>;
     get sessionTopicKey(): string;
     supportsNetworkSwitching(): boolean;