@dynamic-labs/ethereum 0.17.11 → 0.17.12

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "0.17.11",
+  "version": "0.17.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -28,15 +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.11",
-    "@dynamic-labs/types": "0.17.11",
-    "@dynamic-labs/utils": "0.17.11",
-    "@dynamic-labs/wallet-book": "0.17.11",
-    "@dynamic-labs/wallet-connector-core": "0.17.11"
+    "@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/walletConnect/walletConnectV2.cjs

@@ -89,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;
             }
         }
     }
@@ -110,25 +112,6 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     get activeAccountKey() {
         return activeAccountKey(this.key);
     }
-    get activeAccount() {
-        if (this._activeAccount) {
-            return this._activeAccount;
-        }
-        const account = localStorage.getItem(this.activeAccountKey);
-        if (!account) {
-            return undefined;
-        }
-        this._activeAccount = account;
-        return account;
-    }
-    set activeAccount(account) {
-        if (!account) {
-            localStorage.removeItem(this.activeAccountKey);
-            return;
-        }
-        localStorage.setItem(this.activeAccountKey, account);
-        this._activeAccount = account;
-    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -158,7 +141,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 }
                 // eslint-disable-next-line prefer-destructuring
                 const account = data[0].split(':')[2];
-                this.activeAccount = account;
+                this.setActiveAccount(account);
                 (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [account]);
             }
         });
@@ -205,6 +188,12 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 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');
@@ -223,17 +212,17 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                 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);
-                    // eslint-disable-next-line prefer-destructuring
-                    this.activeAccount =
-                        this.session.namespaces.eip155.accounts[0].split(':')[2];
+                    this.setSession(session);
+                    this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
                 });
             });
@@ -275,20 +264,33 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             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;
-                this.activeAccount = undefined;
             }
             catch (e) {
                 walletConnectorCore.logger.debug(e);

package/src/walletConnect/walletConnectV2.d.ts

@@ -12,7 +12,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     connectedChain: Chain;
     name: string;
     session: SessionTypes.Struct | undefined;
-    _activeAccount: string | undefined;
+    activeAccount: string | undefined;
     isInitialized: boolean;
     canConnectViaQrCode: boolean;
     isWalletConnect: boolean;
@@ -25,8 +25,6 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     init(): Promise<void>;
     get sessionTopicKey(): string;
     get activeAccountKey(): string;
-    get activeAccount(): string | undefined;
-    set activeAccount(account: string | undefined);
     supportsNetworkSwitching(): boolean;
     setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
@@ -34,6 +32,10 @@ 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, }: {

package/src/walletConnect/walletConnectV2.js

@@ -80,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;
             }
         }
     }
@@ -101,25 +103,6 @@ class WalletConnectV2 extends EthWalletConnector {
     get activeAccountKey() {
         return activeAccountKey(this.key);
     }
-    get activeAccount() {
-        if (this._activeAccount) {
-            return this._activeAccount;
-        }
-        const account = localStorage.getItem(this.activeAccountKey);
-        if (!account) {
-            return undefined;
-        }
-        this._activeAccount = account;
-        return account;
-    }
-    set activeAccount(account) {
-        if (!account) {
-            localStorage.removeItem(this.activeAccountKey);
-            return;
-        }
-        localStorage.setItem(this.activeAccountKey, account);
-        this._activeAccount = account;
-    }
     supportsNetworkSwitching() {
         return true;
     }
@@ -149,7 +132,7 @@ class WalletConnectV2 extends EthWalletConnector {
                 }
                 // eslint-disable-next-line prefer-destructuring
                 const account = data[0].split(':')[2];
-                this.activeAccount = account;
+                this.setActiveAccount(account);
                 (_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [account]);
             }
         });
@@ -196,6 +179,12 @@ class WalletConnectV2 extends EthWalletConnector {
                 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');
@@ -214,17 +203,17 @@ class WalletConnectV2 extends EthWalletConnector {
                 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);
-                    // eslint-disable-next-line prefer-destructuring
-                    this.activeAccount =
-                        this.session.namespaces.eip155.accounts[0].split(':')[2];
+                    this.setSession(session);
+                    this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
                 });
             });
@@ -266,20 +255,33 @@ class WalletConnectV2 extends EthWalletConnector {
             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;
-                this.activeAccount = undefined;
             }
             catch (e) {
                 logger.debug(e);