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

package/src/walletConnect/walletConnectV2.js

@@ -1,26 +1,11 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import Provider from '@walletconnect/universal-provider';
 import { ethers } from 'ethers';
-import { logger, utf8ToHex } from '@dynamic-labs/wallet-connector-core';
+import { logger, getDeepLink, performPlatformSpecificConnectionMethod, utf8ToHex } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { isMobile, DynamicError } from '@dynamic-labs/utils';
+import { DynamicError, isMobile } from '@dynamic-labs/utils';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { getDeepLink } from './client/client.js';
 
-const performPlatformSpecificConnectionMethod = (uri, metadata, opts) => {
-    var _a, _b, _c;
-    if (isMobile()) {
-        const deepLink = 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 = 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 {
     constructor(opts) {
@@ -32,46 +17,61 @@ class WalletConnectV2 extends EthWalletConnector {
         this.name = opts.walletName;
         this.projectId = opts.projectId;
     }
+    initConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { provider } = WalletConnectV2;
+            if (!provider) {
+                throw new 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 __awaiter(this, void 0, void 0, function* () {
-            if (this.projectId && !WalletConnectV2.provider) {
-                WalletConnectV2.provider = yield Provider.init({
+            let { provider } = WalletConnectV2;
+            if (!provider) {
+                provider = yield Provider.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 __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() {
@@ -127,7 +127,11 @@ class WalletConnectV2 extends EthWalletConnector {
         if (!isMobile() && !((_b = wallet.desktop) === null || _b === void 0 ? void 0 : _b.native)) {
             return undefined;
         }
-        return getDeepLink(WalletConnectV2.provider.uri, wallet);
+        return getDeepLink({
+            metadata: wallet,
+            mode: 'regular',
+            uri: WalletConnectV2.provider.uri,
+        });
     }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
@@ -140,49 +144,31 @@ class WalletConnectV2 extends EthWalletConnector {
             if (this.session) {
                 return this.session.namespaces.eip155.accounts[0].split(':')[2];
             }
-            const metadata = getWalletBookWallet(this.name);
             if (!WalletConnectV2.provider) {
                 throw new DynamicError('No provider found');
             }
-            if (!WalletConnectV2.provider.uri || !WalletConnectV2.createSession) {
-                throw new DynamicError('No uri or approval found');
+            if (!WalletConnectV2.provider.uri) {
+                throw new DynamicError('No uri found');
             }
+            const metadata = getWalletBookWallet(this.name);
             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 DynamicError('No provider found'));
+                    return;
+                }
+                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 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) {
@@ -197,7 +183,7 @@ class WalletConnectV2 extends EthWalletConnector {
             if (isMobile()) {
                 // for sign message, no uri is needed because the uri encodes connection details,
                 // and at this point we are already connected
-                const deepLink = getDeepLink('', metadata);
+                const deepLink = getDeepLink({ metadata, mode: 'regular' });
                 window.location.href = deepLink;
             }
             // eslint-disable-next-line prefer-destructuring
@@ -219,7 +205,9 @@ class WalletConnectV2 extends EthWalletConnector {
             }
             try {
                 yield WalletConnectV2.provider.disconnect();
+                WalletConnectV2.provider.uri = undefined;
                 localStorage.removeItem(this.sessionTopicKey);
+                this.session = undefined;
             }
             catch (e) {
                 logger.debug(e);
@@ -249,6 +237,8 @@ class WalletConnectV2 extends EthWalletConnector {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.initProvider();
+            this.refreshSession();
             if (!this.session) {
                 return [];
             }