@dynamic-labs/ethereum 0.17.29 → 0.17.31

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [0.17.31](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.30...v0.17.31) (2023-08-03)
+
+
+### Bug Fixes
+
+* **wcv2:** simulate chain change event in switchNetwork ([#2828](https://github.com/dynamic-labs/DynamicAuth/issues/2828)) ([bfce880](https://github.com/dynamic-labs/DynamicAuth/commit/bfce880a7a280c5545145a41dc155e44a609cccd)), closes [#2809](https://github.com/dynamic-labs/DynamicAuth/issues/2809)
+
+### [0.17.30](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.29...v0.17.30) (2023-08-01)
+
+
+### Bug Fixes
+
+* ensure auto-redirect back to dapp after message signing
+
 ### [0.17.29](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.28...v0.17.29) (2023-07-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "0.17.29",
+  "version": "0.17.31",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -32,11 +32,11 @@
     "ethers": "5.7.2",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-providers": "0.17.29",
-    "@dynamic-labs/types": "0.17.29",
-    "@dynamic-labs/utils": "0.17.29",
-    "@dynamic-labs/wallet-book": "0.17.29",
-    "@dynamic-labs/wallet-connector-core": "0.17.29"
+    "@dynamic-labs/rpc-providers": "0.17.31",
+    "@dynamic-labs/types": "0.17.31",
+    "@dynamic-labs/utils": "0.17.31",
+    "@dynamic-labs/wallet-book": "0.17.31",
+    "@dynamic-labs/wallet-connector-core": "0.17.31"
   },
   "peerDependencies": {}
 }

package/src/EthWalletConnector.d.ts

@@ -26,7 +26,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
-    protected providerSwitchNetwork({ network, provider, }: {
+    providerSwitchNetwork({ network, provider, }: {
         network: EvmNetwork;
         provider: ethers.providers.Web3Provider;
     }): Promise<void>;

package/src/walletConnect/walletConnectV2.cjs

@@ -28,6 +28,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
+        this.listeners = {};
         this.name = opts.walletName;
         this.projectId = opts.projectId;
     }
@@ -138,6 +139,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!WalletConnectV2.provider) {
             return;
         }
+        this.listeners = listeners;
         WalletConnectV2.provider.client.on('session_event', ({ params }) => {
             var _a, _b;
             if (!params || !params.event) {
@@ -177,23 +179,27 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         if (!WalletConnectV2.provider) {
             return;
         }
+        this.listeners = {};
         WalletConnectV2.provider.client.removeAllListeners('session_event');
         WalletConnectV2.provider.client.removeAllListeners('session_delete');
     }
     getDeepLink() {
         var _a, _b;
-        if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri))
+        if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri) || !this.session)
             return;
         const wallet = walletBook.getWalletBookWallet(this.name);
         if (!utils.isMobile() && !((_b = wallet.desktop) === null || _b === void 0 ? void 0 : _b.native)) {
             return undefined;
         }
-        return walletConnectorCore.getDeepLink({
+        const deepLink = walletConnectorCore.getDeepLink({
             isWC2: true,
             metadata: wallet,
             mode: 'regular',
             uri: WalletConnectV2.provider.uri,
         });
+        // we need to include the session topic here because it helps the wallet
+        // auto redirect back to the dapp after signing
+        return `${deepLink}?sessionTopic=${this.session.topic}`;
     }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
@@ -294,16 +300,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (!WalletConnectV2.provider) {
                 throw new utils.DynamicError('No WalletConnect provider found to handle signing');
             }
-            const metadata = walletBook.getWalletBookWallet(this.name);
-            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 = walletConnectorCore.getDeepLink({
-                    isWC2: true,
-                    metadata,
-                    mode: 'regular',
-                    uri: WalletConnectV2.provider.uri,
-                });
+            const deepLink = this.getDeepLink();
+            if (utils.isMobile() && deepLink) {
                 window.location.href = deepLink;
             }
             const web3Provider = this.getWeb3Provider();
@@ -369,6 +367,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
@@ -383,7 +382,8 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             if (!provider) {
                 throw new utils.DynamicError('Provider not found');
             }
-            return _super.providerSwitchNetwork.call(this, { network, provider });
+            yield _super.providerSwitchNetwork.call(this, { network, provider });
+            (_b = (_a = this.listeners).onChainChange) === null || _b === void 0 ? void 0 : _b.call(_a, String(network.chainId));
         });
     }
     getConnectedAccounts() {

package/src/walletConnect/walletConnectV2.d.ts

@@ -19,6 +19,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     isWalletConnect: boolean;
     private static provider;
     private projectId?;
+    private listeners;
     constructor(opts: WalletConnectorV2Opts);
     private initConnection;
     private createInitProviderPromise;

package/src/walletConnect/walletConnectV2.js

@@ -19,6 +19,7 @@ class WalletConnectV2 extends EthWalletConnector {
         this.isInitialized = false;
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
+        this.listeners = {};
         this.name = opts.walletName;
         this.projectId = opts.projectId;
     }
@@ -129,6 +130,7 @@ class WalletConnectV2 extends EthWalletConnector {
         if (!WalletConnectV2.provider) {
             return;
         }
+        this.listeners = listeners;
         WalletConnectV2.provider.client.on('session_event', ({ params }) => {
             var _a, _b;
             if (!params || !params.event) {
@@ -168,23 +170,27 @@ class WalletConnectV2 extends EthWalletConnector {
         if (!WalletConnectV2.provider) {
             return;
         }
+        this.listeners = {};
         WalletConnectV2.provider.client.removeAllListeners('session_event');
         WalletConnectV2.provider.client.removeAllListeners('session_delete');
     }
     getDeepLink() {
         var _a, _b;
-        if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri))
+        if (!((_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri) || !this.session)
             return;
         const wallet = getWalletBookWallet(this.name);
         if (!isMobile() && !((_b = wallet.desktop) === null || _b === void 0 ? void 0 : _b.native)) {
             return undefined;
         }
-        return getDeepLink({
+        const deepLink = getDeepLink({
             isWC2: true,
             metadata: wallet,
             mode: 'regular',
             uri: WalletConnectV2.provider.uri,
         });
+        // we need to include the session topic here because it helps the wallet
+        // auto redirect back to the dapp after signing
+        return `${deepLink}?sessionTopic=${this.session.topic}`;
     }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
@@ -285,16 +291,8 @@ class WalletConnectV2 extends EthWalletConnector {
             if (!WalletConnectV2.provider) {
                 throw new DynamicError('No WalletConnect provider found to handle signing');
             }
-            const metadata = getWalletBookWallet(this.name);
-            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({
-                    isWC2: true,
-                    metadata,
-                    mode: 'regular',
-                    uri: WalletConnectV2.provider.uri,
-                });
+            const deepLink = this.getDeepLink();
+            if (isMobile() && deepLink) {
                 window.location.href = deepLink;
             }
             const web3Provider = this.getWeb3Provider();
@@ -360,6 +358,7 @@ class WalletConnectV2 extends EthWalletConnector {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
@@ -374,7 +373,8 @@ class WalletConnectV2 extends EthWalletConnector {
             if (!provider) {
                 throw new DynamicError('Provider not found');
             }
-            return _super.providerSwitchNetwork.call(this, { network, provider });
+            yield _super.providerSwitchNetwork.call(this, { network, provider });
+            (_b = (_a = this.listeners).onChainChange) === null || _b === void 0 ? void 0 : _b.call(_a, String(network.chainId));
         });
     }
     getConnectedAccounts() {