@dynamic-labs/ethereum 0.18.11 → 0.18.12

package/CHANGELOG.md

@@ -1,4 +1,17 @@
 
+### [0.18.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.11...v0.18.12) (2023-08-30)
+
+
+### Features
+
+* add deepLinkPreference prop ([#3174](https://github.com/dynamic-labs/DynamicAuth/issues/3174)) ([#3176](https://github.com/dynamic-labs/DynamicAuth/issues/3176)) ([8a6e389](https://github.com/dynamic-labs/DynamicAuth/commit/8a6e389e84bd74e80dc9df37ba6df5d46e6ba831))
+
+
+### Bug Fixes
+
+* end connector session when unlinking from bridge ([#3120](https://github.com/dynamic-labs/DynamicAuth/issues/3120)) ([#3178](https://github.com/dynamic-labs/DynamicAuth/issues/3178)) ([0a69e21](https://github.com/dynamic-labs/DynamicAuth/commit/0a69e218dc9a9a0709bb74b901ed0ca08c7f463c))
+* **bridge:** update address when switching networks ([#3171](https://github.com/dynamic-labs/DynamicAuth/issues/3171)) ([#3180](https://github.com/dynamic-labs/DynamicAuth/issues/3180)) ([8ab5ce4](https://github.com/dynamic-labs/DynamicAuth/commit/8ab5ce4add675ae326c052fc1510d54d56d0d665))
+
 ### [0.18.11](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.10...v0.18.11) (2023-08-29)
 
 

package/package.json

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

package/src/walletConnect/client/client.cjs

@@ -84,7 +84,7 @@ const createSession = (client) => _tslib.__awaiter(void 0, void 0, void 0, funct
         });
     });
 });
-const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, deepLinkPreference, opts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (wcClient.connected) {
         const [accountPublicAddress] = wcClient.accounts;
@@ -95,13 +95,13 @@ 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,
-    });
+    }, deepLinkPreference);
     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;
     return accountPublicAddress;
 });
-const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcProvider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const signWalletConnectPersonalMessage = (messageToSign, metadata, client, deepLinkPreference, rpcProvider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _b, _c;
     const isCryptoWallet = ((_b = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _b === void 0 ? void 0 : _b.name) === 'Crypto.com | DeFi Wallet' ||
         ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'DeFi Wallet';
@@ -113,6 +113,7 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
         const deepLink = walletConnectorCore.getDeepLink({
             metadata,
             mode: 'regular',
+            preference: deepLinkPreference,
             uri: client.uri,
         });
         window.location.href = deepLink;

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

@@ -1,6 +1,6 @@
 import Client from '@walletconnect/client';
 import { ethers } from 'ethers';
-import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 export declare const initClient: (name: string, bridge: string, settings?: any) => Client;
 /**
@@ -13,5 +13,5 @@ export declare const teardownWalletConnectEventListeners: (client: Client) => vo
  */
 export declare const killWalletConnectSession: (client: Client) => Promise<void>;
 export declare const createSession: (client: Client) => Promise<PayloadParams>;
-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>;
+export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, deepLinkPreference: DeepLinkVariant, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, deepLinkPreference: DeepLinkVariant, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;

package/src/walletConnect/client/client.js

@@ -76,7 +76,7 @@ const createSession = (client) => __awaiter(void 0, void 0, void 0, function* ()
         });
     });
 });
-const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, deepLinkPreference, opts) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (wcClient.connected) {
         const [accountPublicAddress] = wcClient.accounts;
@@ -87,13 +87,13 @@ 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,
-    });
+    }, deepLinkPreference);
     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;
     return accountPublicAddress;
 });
-const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcProvider) => __awaiter(void 0, void 0, void 0, function* () {
+const signWalletConnectPersonalMessage = (messageToSign, metadata, client, deepLinkPreference, rpcProvider) => __awaiter(void 0, void 0, void 0, function* () {
     var _b, _c;
     const isCryptoWallet = ((_b = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _b === void 0 ? void 0 : _b.name) === 'Crypto.com | DeFi Wallet' ||
         ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'DeFi Wallet';
@@ -105,6 +105,7 @@ const signWalletConnectPersonalMessage = (messageToSign, metadata, client, rpcPr
         const deepLink = getDeepLink({
             metadata,
             mode: 'regular',
+            preference: deepLinkPreference,
             uri: client.uri,
         });
         window.location.href = deepLink;

package/src/walletConnect/walletConnect.cjs

@@ -30,6 +30,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         if (walletConnectV1Bridge) {
             this.bridge = walletConnectV1Bridge;
         }
+        this.deepLinkPreference = props.deepLinkPreference || 'native';
     }
     getClient() {
         if (this.client) {
@@ -69,7 +70,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
     }
     fetchPublicAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return client.fetchWalletConnectEVMPublicAddress(walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
+            return client.fetchWalletConnectEVMPublicAddress(walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
                     var _a;
                     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
                     this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
@@ -85,12 +86,13 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         return walletConnectorCore.getDeepLink({
             metadata: wallet,
             mode: 'regular',
+            preference: this.deepLinkPreference,
             uri: this.getClient().uri,
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return client.signWalletConnectPersonalMessage(messageToSign, walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), 
+            return client.signWalletConnectPersonalMessage(messageToSign, walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, 
             // don't call getRpcProvider until we really need to
             () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.getRpcProvider(); }));
         });
@@ -124,6 +126,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 const deepLink = walletConnectorCore.getDeepLink({
                     metadata: walletBook.getWalletBookWallet(this.walletBook, this.name),
                     mode: 'regular',
+                    preference: this.deepLinkPreference,
                     uri: client.uri,
                 });
                 window.location.href = deepLink;

package/src/walletConnect/walletConnect.d.ts

@@ -1,6 +1,6 @@
 import Client from '@walletconnect/client';
 import { ethers } from 'ethers';
-import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+import { Chain, FetchPublicAddressOpts, WalletEventListeners, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 type ConnectorSession = {
@@ -19,6 +19,7 @@ type ConnectorSession = {
 export type WalletConnectOpts = EthWalletConnectorOpts & {
     walletConnectV1Bridge: string;
     walletName: string;
+    deepLinkPreference?: DeepLinkVariant;
 };
 export declare class WalletConnect extends EthWalletConnector {
     supportedChains: Chain[];
@@ -28,6 +29,7 @@ export declare class WalletConnect extends EthWalletConnector {
     canConnectViaQrCode: boolean;
     isWalletConnect: boolean;
     switchNetworkOnlyFromWallet: boolean;
+    private deepLinkPreference;
     client?: Client;
     clientOptions?: any;
     constructor({ walletConnectV1Bridge, walletName, ...props }: WalletConnectOpts);

package/src/walletConnect/walletConnect.js

@@ -22,6 +22,7 @@ class WalletConnect extends EthWalletConnector {
         if (walletConnectV1Bridge) {
             this.bridge = walletConnectV1Bridge;
         }
+        this.deepLinkPreference = props.deepLinkPreference || 'native';
     }
     getClient() {
         if (this.client) {
@@ -61,7 +62,7 @@ class WalletConnect extends EthWalletConnector {
     }
     fetchPublicAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            return fetchWalletConnectEVMPublicAddress(getWalletBookWallet(this.walletBook, this.name), this.getClient(), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
+            return fetchWalletConnectEVMPublicAddress(getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
                     var _a;
                     (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
                     this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
@@ -77,12 +78,13 @@ class WalletConnect extends EthWalletConnector {
         return getDeepLink({
             metadata: wallet,
             mode: 'regular',
+            preference: this.deepLinkPreference,
             uri: this.getClient().uri,
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return signWalletConnectPersonalMessage(messageToSign, getWalletBookWallet(this.walletBook, this.name), this.getClient(), 
+            return signWalletConnectPersonalMessage(messageToSign, getWalletBookWallet(this.walletBook, this.name), this.getClient(), this.deepLinkPreference, 
             // don't call getRpcProvider until we really need to
             () => __awaiter(this, void 0, void 0, function* () { return this.getRpcProvider(); }));
         });
@@ -116,6 +118,7 @@ class WalletConnect extends EthWalletConnector {
                 const deepLink = getDeepLink({
                     metadata: getWalletBookWallet(this.walletBook, this.name),
                     mode: 'regular',
+                    preference: this.deepLinkPreference,
                     uri: client.uri,
                 });
                 window.location.href = deepLink;

package/src/walletConnect/walletConnectV2.cjs

@@ -30,6 +30,7 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         this.isWalletConnect = true;
         this.name = opts.walletName;
         this.projectId = opts.projectId;
+        this.deepLinkPreference = opts.deepLinkPreference || 'native';
     }
     initConnection() {
         var _a;
@@ -203,7 +204,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,
-            });
+            }, this.deepLinkPreference);
             return new Promise((resolve, reject) => {
                 if (!WalletConnectV2.provider) {
                     reject(new utils.DynamicError('No provider found'));
@@ -254,12 +255,17 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
         });
     }
     getDeepLink() {
-        var _a, _b;
+        var _a;
         if (!this.session) {
             return;
         }
         const metadata = walletBook.getWalletBookWallet(this.walletBook, this.name);
-        const deepLink = ((_a = metadata['mobile']) === null || _a === void 0 ? void 0 : _a.native) || ((_b = metadata['mobile']) === null || _b === void 0 ? void 0 : _b.universal);
+        const deepLink = walletConnectorCore.getDeepLink({
+            metadata,
+            mode: 'regular',
+            preference: this.deepLinkPreference,
+            uri: (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri,
+        });
         if (!deepLink) {
             return;
         }

package/src/walletConnect/walletConnectV2.d.ts

@@ -1,11 +1,12 @@
 import { ethers } from 'ethers';
 import type { SessionTypes } from '@walletconnect/types';
-import { Chain, FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
+import { Chain, FetchPublicAddressOpts, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 export type WalletConnectorV2Opts = EthWalletConnectorOpts & {
     projectId?: string;
     walletName: string;
+    deepLinkPreference?: DeepLinkVariant;
 };
 export declare class WalletConnectV2 extends EthWalletConnector {
     supportedChains: Chain[];
@@ -19,6 +20,7 @@ export declare class WalletConnectV2 extends EthWalletConnector {
     isWalletConnect: boolean;
     private static provider;
     private projectId?;
+    private deepLinkPreference;
     constructor(opts: WalletConnectorV2Opts);
     private initConnection;
     private createInitProviderPromise;

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, performPlatformSpecificConnectionMethod, utf8ToHex } from '@dynamic-labs/wallet-connector-core';
+import { logger, performPlatformSpecificConnectionMethod, getDeepLink, 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';
@@ -21,6 +21,7 @@ class WalletConnectV2 extends EthWalletConnector {
         this.isWalletConnect = true;
         this.name = opts.walletName;
         this.projectId = opts.projectId;
+        this.deepLinkPreference = opts.deepLinkPreference || 'native';
     }
     initConnection() {
         var _a;
@@ -194,7 +195,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,
-            });
+            }, this.deepLinkPreference);
             return new Promise((resolve, reject) => {
                 if (!WalletConnectV2.provider) {
                     reject(new DynamicError('No provider found'));
@@ -245,12 +246,17 @@ class WalletConnectV2 extends EthWalletConnector {
         });
     }
     getDeepLink() {
-        var _a, _b;
+        var _a;
         if (!this.session) {
             return;
         }
         const metadata = getWalletBookWallet(this.walletBook, this.name);
-        const deepLink = ((_a = metadata['mobile']) === null || _a === void 0 ? void 0 : _a.native) || ((_b = metadata['mobile']) === null || _b === void 0 ? void 0 : _b.universal);
+        const deepLink = getDeepLink({
+            metadata,
+            mode: 'regular',
+            preference: this.deepLinkPreference,
+            uri: (_a = WalletConnectV2.provider) === null || _a === void 0 ? void 0 : _a.uri,
+        });
         if (!deepLink) {
             return;
         }