@dynamic-labs/ethereum 2.0.0-alpha.6 → 2.0.0-alpha.7

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+## [2.0.0-alpha.7](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.6...v2.0.0-alpha.7) (2024-02-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* add networkValidationMode and remove enableForcedNetworkValidation (#4778)
+
+### Features
+
+* add bitget and okx wallets ([51fab41](https://github.com/dynamic-labs/DynamicAuth/commit/51fab413096fd89ce99c6c617cf4f3f5db9bf44d))
+* add networkValidationMode and remove enableForcedNetworkValidation ([#4778](https://github.com/dynamic-labs/DynamicAuth/issues/4778)) ([ccb9576](https://github.com/dynamic-labs/DynamicAuth/commit/ccb9576c81b2c570185f5126d6d1fcfcbb5ac9e3))
+
+
+### Bug Fixes
+
+* **GVTY-1243:** non evm onramp urls ([#4791](https://github.com/dynamic-labs/DynamicAuth/issues/4791)) ([fea602e](https://github.com/dynamic-labs/DynamicAuth/commit/fea602e2835b4bb9bc096b96375fa97297bf35f1))
+* revert use enableForcedNetworkValidation on connect-only ([#4750](https://github.com/dynamic-labs/DynamicAuth/issues/4750)) ([#4772](https://github.com/dynamic-labs/DynamicAuth/issues/4772)) ([b871c22](https://github.com/dynamic-labs/DynamicAuth/commit/b871c2295f39230bc34ae1fca5f8817cd9251a17))
+* use correct chromeId for okx and bitget wallets and remove group from coin98 ([#4795](https://github.com/dynamic-labs/DynamicAuth/issues/4795)) ([e63bad7](https://github.com/dynamic-labs/DynamicAuth/commit/e63bad76ed06636151212c915a102359a03b4218))
+
 ## [2.0.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.5...v2.0.0-alpha.6) (2024-02-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -30,12 +30,12 @@
     "@walletconnect/universal-provider": "2.10.6",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.6",
-    "@dynamic-labs/turnkey": "2.0.0-alpha.6",
-    "@dynamic-labs/types": "2.0.0-alpha.6",
-    "@dynamic-labs/utils": "2.0.0-alpha.6",
-    "@dynamic-labs/wallet-book": "2.0.0-alpha.6",
-    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.6",
+    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.7",
+    "@dynamic-labs/turnkey": "2.0.0-alpha.7",
+    "@dynamic-labs/types": "2.0.0-alpha.7",
+    "@dynamic-labs/utils": "2.0.0-alpha.7",
+    "@dynamic-labs/wallet-book": "2.0.0-alpha.7",
+    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.7",
     "stream": "0.0.2"
   },
   "peerDependencies": {

package/src/coinbase/coinbase.cjs

@@ -19,6 +19,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         var { appName, appLogoUrl, evmNetworks } = _a, props = _tslib.__rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
         super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
+        this.overrideKey = 'coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;

package/src/coinbase/coinbase.d.ts

@@ -7,6 +7,7 @@ type CoinbaseOpts = EthWalletConnectorOpts & {
 };
 export declare class Coinbase extends EthWalletConnector {
     name: string;
+    overrideKey: string;
     supportedChains: Chain[];
     connectedChain: Chain;
     canConnectViaQrCode: boolean;

package/src/coinbase/coinbase.js

@@ -15,6 +15,7 @@ class Coinbase extends EthWalletConnector {
         var { appName, appLogoUrl, evmNetworks } = _a, props = __rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
         super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
+        this.overrideKey = 'coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = true;

package/src/injected/ExodusEvm.cjs

@@ -10,6 +10,7 @@ class ExodusEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'ExodusEvm';
+        this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/ExodusEvm.d.ts

@@ -2,6 +2,7 @@ import { EthWalletConnectorOpts } from '..';
 import InjectedWalletBase from './InjectedWalletBase';
 export declare class ExodusEvm extends InjectedWalletBase {
     name: string;
+    overrideKey: string;
     walletConnectorFallback: boolean;
     constructor(props: EthWalletConnectorOpts);
 }

package/src/injected/ExodusEvm.js

@@ -6,6 +6,7 @@ class ExodusEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'ExodusEvm';
+        this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/PhantomEvm.cjs

@@ -11,6 +11,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/injected/PhantomEvm.d.ts

@@ -2,6 +2,7 @@ import { EthWalletConnectorOpts } from '..';
 import InjectedWalletBase from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
+    overrideKey: string;
     constructor(props: EthWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
 }

package/src/injected/PhantomEvm.js

@@ -7,6 +7,7 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     fetchPublicAddress() {

package/src/walletConnect/fetchWalletConnectWallets.cjs

@@ -6,14 +6,15 @@ var walletConnect = require('./walletConnect.cjs');
 
 const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
         return class extends walletConnect.WalletConnect {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
             }
         };
     });

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -2,14 +2,15 @@ import { WalletConnect } from './walletConnect.js';
 
 const fetchWalletConnectWallets = ({ walletBook, }) => {
     var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
-        .map((wallet) => {
+    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([, wallet]) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map(([key, wallet]) => {
         const { shortName } = wallet;
         const name = shortName || wallet.name;
         return class extends WalletConnect {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
             }
         };
     });

package/src/walletConnect/walletConnect.cjs

@@ -6,9 +6,9 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var Provider = require('@walletconnect/universal-provider');
 var EventEmitter = require('eventemitter3');
 var viem = require('viem');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
+var walletBook = require('@dynamic-labs/wallet-book');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var parseIntSafe = require('../utils/parseIntSafe.cjs');
 
@@ -53,11 +53,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             .map((network) => `eip155:${network.chainId}`));
     }
     getMappedChainsByPreferredOrder() {
-        // adding Ethereum to avoid an error connecting if none of the evm networks are supported by the wallet
         const allChains = this.getMappedChains();
-        if (!allChains.includes('eip155:1')) {
-            allChains.push('eip155:1');
-        }
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
         return [...reorderedChains, ...remainingChains];
@@ -102,15 +98,17 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
     }
     createInitProviderPromise() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = yield Provider__default["default"].init({
+            WalletConnect.provider = yield Provider__default["default"].init({
                 logger: walletConnectorCore.logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
                 projectId: this.projectId,
             });
-            WalletConnect.provider = provider;
             this.teardownEventListeners();
             this.setupEventListeners();
         });
     }
+    // We need to add a gate to this method since we will be calling it asynchronously
+    // from different places (such as setShowAuthFlow), which means there's a chance for
+    // a race condition to happen where createInitProviderPromise is called multiple times
     initProvider() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnect;
@@ -246,7 +244,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 // 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));
+                yield utils.sleep(1000);
                 if (!WalletConnect.provider || !((_b = WalletConnect.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');
@@ -262,7 +260,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                     reject(new utils.DynamicError('No provider found'));
                     return;
                 }
-                ee.on('walletconnect_connection_failed', () => {
+                const onFail = () => {
                     const error = new utils.DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
@@ -274,15 +272,28 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                         this.init();
                     }
                     reject(error);
-                });
-                WalletConnect.provider.on('connect', ({ session }) => {
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const onConnect = ({ session }) => {
                     if (!session) {
                         reject(new utils.DynamicError('No session found'));
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
-                });
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const cleanupListeners = () => {
+                    var _a;
+                    ee.off('walletconnect_connection_failed', onFail);
+                    (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.off('connect', onConnect);
+                };
+                ee.on('walletconnect_connection_failed', onFail);
+                WalletConnect.provider.on('connect', onConnect);
             });
         });
     }

package/src/walletConnect/walletConnect.d.ts

@@ -1,7 +1,7 @@
 import type { SessionTypes } from '@walletconnect/types';
 import { Hex, WalletClient } from 'viem';
-import { Chain, FetchPublicAddressOpts, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
+import { Chain, DeepLinkVariant, FetchPublicAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 export type WalletConnectOpts = EthWalletConnectorOpts & {
     projectId?: string;
@@ -9,7 +9,7 @@ export type WalletConnectOpts = EthWalletConnectorOpts & {
     deepLinkPreference?: DeepLinkVariant;
     walletConnectPreferredChains?: `eip155:${number}`[];
 };
-export declare class WalletConnect extends EthWalletConnector {
+export declare class WalletConnect extends EthWalletConnector implements IWalletConnectConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
     name: string;
@@ -329,5 +329,5 @@ export declare class WalletConnect extends EthWalletConnector {
     }): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
     private isMetaMask;
-    getSupportedNetworks(): Promise<string[] | undefined>;
+    getSupportedNetworks(): Promise<string[]>;
 }

package/src/walletConnect/walletConnect.js

@@ -2,9 +2,9 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import Provider from '@walletconnect/universal-provider';
 import EventEmitter from 'eventemitter3';
 import { createWalletClient, custom } from 'viem';
-import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { DynamicError, isMobile } from '@dynamic-labs/utils';
+import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { parseIntSafe } from '../utils/parseIntSafe.js';
 
@@ -44,11 +44,7 @@ class WalletConnect extends EthWalletConnector {
             .map((network) => `eip155:${network.chainId}`));
     }
     getMappedChainsByPreferredOrder() {
-        // adding Ethereum to avoid an error connecting if none of the evm networks are supported by the wallet
         const allChains = this.getMappedChains();
-        if (!allChains.includes('eip155:1')) {
-            allChains.push('eip155:1');
-        }
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
         return [...reorderedChains, ...remainingChains];
@@ -93,15 +89,17 @@ class WalletConnect extends EthWalletConnector {
     }
     createInitProviderPromise() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = yield Provider.init({
+            WalletConnect.provider = yield Provider.init({
                 logger: logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
                 projectId: this.projectId,
             });
-            WalletConnect.provider = provider;
             this.teardownEventListeners();
             this.setupEventListeners();
         });
     }
+    // We need to add a gate to this method since we will be calling it asynchronously
+    // from different places (such as setShowAuthFlow), which means there's a chance for
+    // a race condition to happen where createInitProviderPromise is called multiple times
     initProvider() {
         return __awaiter(this, void 0, void 0, function* () {
             const { provider } = WalletConnect;
@@ -237,7 +235,7 @@ class WalletConnect extends EthWalletConnector {
                 // 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));
+                yield sleep(1000);
                 if (!WalletConnect.provider || !((_b = WalletConnect.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');
@@ -253,7 +251,7 @@ class WalletConnect extends EthWalletConnector {
                     reject(new DynamicError('No provider found'));
                     return;
                 }
-                ee.on('walletconnect_connection_failed', () => {
+                const onFail = () => {
                     const error = new DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
@@ -265,15 +263,28 @@ class WalletConnect extends EthWalletConnector {
                         this.init();
                     }
                     reject(error);
-                });
-                WalletConnect.provider.on('connect', ({ session }) => {
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const onConnect = ({ session }) => {
                     if (!session) {
                         reject(new DynamicError('No session found'));
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
                     resolve(this.activeAccount);
-                });
+                    // We must clean up the onConnect and onFail listeners
+                    // whenever the connection attempt either succeeds or fails
+                    cleanupListeners();
+                };
+                const cleanupListeners = () => {
+                    var _a;
+                    ee.off('walletconnect_connection_failed', onFail);
+                    (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.off('connect', onConnect);
+                };
+                ee.on('walletconnect_connection_failed', onFail);
+                WalletConnect.provider.on('connect', onConnect);
             });
         });
     }