@dynamic-labs/ethereum 0.17.15 → 0.17.17

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+### [0.17.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.16...v0.17.17) (2023-06-29)
+
+
+### Bug Fixes
+
+* walletconnect v2 fixes ([#2529](https://github.com/dynamic-labs/DynamicAuth/issues/2529)) ([6fe03d8](https://github.com/dynamic-labs/DynamicAuth/commit/6fe03d802b0a3b8f7995d3a52ce5183b3b0bfb83)), closes [#2523](https://github.com/dynamic-labs/DynamicAuth/issues/2523) [#2527](https://github.com/dynamic-labs/DynamicAuth/issues/2527)
+* **wcv2:** use native or universal link when signing message ([#2502](https://github.com/dynamic-labs/DynamicAuth/issues/2502)) ([#2513](https://github.com/dynamic-labs/DynamicAuth/issues/2513)) ([01f7ca1](https://github.com/dynamic-labs/DynamicAuth/commit/01f7ca109c97d5cb04d6f4b4b574ec99aa8272f1))
+
+### [0.17.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.15...v0.17.16) (2023-06-28)
+
+
+### Bug Fixes
+
+* flip native and universal on WC1 ([#2509](https://github.com/dynamic-labs/DynamicAuth/issues/2509)) ([fdc6728](https://github.com/dynamic-labs/DynamicAuth/commit/fdc672877ecfc44ee93d8e0e24e007de625c03a6))
+
 ### [0.17.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.14...v0.17.15) (2023-06-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "0.17.15",
+  "version": "0.17.17",
   "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.15",
-    "@dynamic-labs/types": "0.17.15",
-    "@dynamic-labs/utils": "0.17.15",
-    "@dynamic-labs/wallet-book": "0.17.15",
-    "@dynamic-labs/wallet-connector-core": "0.17.15"
+    "@dynamic-labs/rpc-providers": "0.17.17",
+    "@dynamic-labs/types": "0.17.17",
+    "@dynamic-labs/utils": "0.17.17",
+    "@dynamic-labs/wallet-book": "0.17.17",
+    "@dynamic-labs/wallet-connector-core": "0.17.17"
   },
   "peerDependencies": {}
 }

package/src/walletConnect/client/client.cjs

@@ -95,7 +95,7 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => _tslib.
     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,
-    });
+    }, false);
     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;
@@ -111,6 +111,7 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
     const [accountPublicAddress] = client.accounts;
     if (utils.isMobile()) {
         const deepLink = walletConnectorCore.getDeepLink({
+            isWC2: false,
             metadata,
             mode: 'regular',
             uri: client.uri,

package/src/walletConnect/client/client.js

@@ -87,7 +87,7 @@ const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __await
     performPlatformSpecificConnectionMethod(wcClient.uri, metadata, {
         onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
         onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
-    });
+    }, false);
     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;
@@ -103,6 +103,7 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
     const [accountPublicAddress] = client.accounts;
     if (isMobile()) {
         const deepLink = getDeepLink({
+            isWC2: false,
             metadata,
             mode: 'regular',
             uri: client.uri,

package/src/walletConnect/walletConnect.cjs

@@ -83,6 +83,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             return undefined;
         }
         return walletConnectorCore.getDeepLink({
+            isWC2: false,
             metadata: wallet,
             mode: 'regular',
             uri: this.getClient().uri,
@@ -122,6 +123,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             }
             if (utils.isMobile()) {
                 const deepLink = walletConnectorCore.getDeepLink({
+                    isWC2: false,
                     metadata: walletBook.getWalletBookWallet(this.name),
                     mode: 'regular',
                     uri: client.uri,

package/src/walletConnect/walletConnect.js

@@ -75,6 +75,7 @@ class WalletConnect extends EthWalletConnector {
             return undefined;
         }
         return getDeepLink({
+            isWC2: false,
             metadata: wallet,
             mode: 'regular',
             uri: this.getClient().uri,
@@ -114,6 +115,7 @@ class WalletConnect extends EthWalletConnector {
             }
             if (isMobile()) {
                 const deepLink = getDeepLink({
+                    isWC2: false,
                     metadata: getWalletBookWallet(this.name),
                     mode: 'regular',
                     uri: client.uri,

package/src/walletConnect/walletConnectV2.cjs

@@ -66,6 +66,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
                             'eth_sign',
                             'personal_sign',
                             'eth_sendTransaction',
+                            'eth_signTypedData_v4',
                         ],
                         rpcMap: this.evmNetworkRpcMap(),
                     },
@@ -166,23 +167,9 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         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))
-            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({
-            metadata: wallet,
-            mode: 'regular',
-            uri: WalletConnectV2.provider.uri,
-        });
-    }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
-            throw new Error('No provider found');
+            return;
         }
         return new ethers.ethers.providers.Web3Provider(WalletConnectV2.provider, 'any');
     }
@@ -211,7 +198,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             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,
-            });
+            }, true);
             return new Promise((resolve, reject) => {
                 if (!WalletConnectV2.provider) {
                     reject(new utils.DynamicError('No provider found'));
@@ -237,6 +224,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         });
     }
     signMessage(messageToSign) {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (!this.session) {
                 throw new utils.DynamicError('no session');
@@ -246,16 +234,13 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
             }
             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({
-                    metadata,
-                    mode: 'regular',
-                    uri: WalletConnectV2.provider.uri,
-                });
+                const deepLink = ((_a = metadata['mobile']) === null || _a === void 0 ? void 0 : _a.native) || ((_b = metadata['mobile']) === null || _b === void 0 ? void 0 : _b.universal) || '';
                 window.location.href = deepLink;
             }
             const web3Provider = this.getWeb3Provider();
+            if (!web3Provider) {
+                throw new utils.DynamicError('No web3 provider found');
+            }
             const response = web3Provider.send('personal_sign', [
                 walletConnectorCore.utf8ToHex(messageToSign, true),
                 this.activeAccount,

package/src/walletConnect/walletConnectV2.d.ts

@@ -30,8 +30,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     supportsNetworkSwitching(): boolean;
     setupEventListeners(listeners: WalletEventListeners): void;
     teardownEventListeners(): void;
-    getDeepLink(): string | undefined;
-    getWeb3Provider(): ethers.providers.Web3Provider;
+    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
     fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     private clearActiveAccount;

package/src/walletConnect/walletConnectV2.js

@@ -2,7 +2,7 @@ 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 { logger, 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';
@@ -57,6 +57,7 @@ class WalletConnectV2 extends EthWalletConnector {
                             'eth_sign',
                             'personal_sign',
                             'eth_sendTransaction',
+                            'eth_signTypedData_v4',
                         ],
                         rpcMap: this.evmNetworkRpcMap(),
                     },
@@ -157,23 +158,9 @@ class WalletConnectV2 extends EthWalletConnector {
         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))
-            return;
-        const wallet = getWalletBookWallet(this.name);
-        if (!isMobile() && !((_b = wallet.desktop) === null || _b === void 0 ? void 0 : _b.native)) {
-            return undefined;
-        }
-        return getDeepLink({
-            metadata: wallet,
-            mode: 'regular',
-            uri: WalletConnectV2.provider.uri,
-        });
-    }
     getWeb3Provider() {
         if (!WalletConnectV2.provider) {
-            throw new Error('No provider found');
+            return;
         }
         return new ethers.providers.Web3Provider(WalletConnectV2.provider, 'any');
     }
@@ -202,7 +189,7 @@ class WalletConnectV2 extends EthWalletConnector {
             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,
-            });
+            }, true);
             return new Promise((resolve, reject) => {
                 if (!WalletConnectV2.provider) {
                     reject(new DynamicError('No provider found'));
@@ -228,6 +215,7 @@ class WalletConnectV2 extends EthWalletConnector {
         });
     }
     signMessage(messageToSign) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.session) {
                 throw new DynamicError('no session');
@@ -237,16 +225,13 @@ class WalletConnectV2 extends EthWalletConnector {
             }
             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({
-                    metadata,
-                    mode: 'regular',
-                    uri: WalletConnectV2.provider.uri,
-                });
+                const deepLink = ((_a = metadata['mobile']) === null || _a === void 0 ? void 0 : _a.native) || ((_b = metadata['mobile']) === null || _b === void 0 ? void 0 : _b.universal) || '';
                 window.location.href = deepLink;
             }
             const web3Provider = this.getWeb3Provider();
+            if (!web3Provider) {
+                throw new DynamicError('No web3 provider found');
+            }
             const response = web3Provider.send('personal_sign', [
                 utf8ToHex(messageToSign, true),
                 this.activeAccount,