@dynamic-labs/ethereum 2.0.0-alpha.3 → 2.0.0-alpha.30

package/src/index.cjs

@@ -7,27 +7,21 @@ var turnkey = require('@dynamic-labs/turnkey');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
-require('./walletConnect/walletConnectV2.cjs');
-require('../_virtual/_tslib.cjs');
-require('@walletconnect/ethereum-provider');
-require('viem');
-require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-var EthWalletConnector = require('./EthWalletConnector.cjs');
-var constants = require('./constants.cjs');
-require('@walletconnect/client');
+require('./walletConnect/walletConnect.cjs');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
 var coinbase = require('./coinbase/coinbase.cjs');
+require('@dynamic-labs/rpc-provider-ethereum');
+var EthWalletConnector = require('./EthWalletConnector.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
+var constants = require('./constants.cjs');
 
 const EthereumWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
-    ...turnkey.TurnkeyWalletConnectors(props),
+    ...turnkey.TurnkeyEVMWalletConnectors(props),
     coinbase.Coinbase,
-    fetchWalletConnectWallets.getWalletConnectConnector(props),
+    fetchWalletConnectWallets.getWalletConnectConnector(),
 ];
 
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
@@ -35,6 +29,6 @@ exports.ExodusEvm = ExodusEvm.ExodusEvm;
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
 exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
 exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
-exports.INFURA_ID = constants.INFURA_ID;
 exports.EthProviderHelper = ethProviderHelper.EthProviderHelper;
+exports.INFURA_ID = constants.INFURA_ID;
 exports.EthereumWalletConnectors = EthereumWalletConnectors;

package/src/index.d.ts

@@ -1,5 +1,6 @@
 import './polyfills';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/rpc-provider-ethereum';
 export * from './injected';
 export * from './EthWalletConnector';
 export * from './ethProviderHelper';

package/src/index.js

@@ -1,30 +1,24 @@
 import './polyfills.js';
-import { TurnkeyWalletConnectors } from '@dynamic-labs/turnkey';
+import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/turnkey';
 export { PhantomEvm } from './injected/PhantomEvm.js';
 export { ExodusEvm } from './injected/ExodusEvm.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
 export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
-import './walletConnect/walletConnectV2.js';
-import '../_virtual/_tslib.js';
-import '@walletconnect/ethereum-provider';
-import 'viem';
-import '@dynamic-labs/wallet-connector-core';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-export { EthWalletConnector } from './EthWalletConnector.js';
-export { INFURA_ID } from './constants.js';
-import '@walletconnect/client';
+import './walletConnect/walletConnect.js';
 import { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
 import { Coinbase } from './coinbase/coinbase.js';
+import '@dynamic-labs/rpc-provider-ethereum';
+export { EthWalletConnector } from './EthWalletConnector.js';
 export { EthProviderHelper } from './ethProviderHelper.js';
+export { INFURA_ID } from './constants.js';
 
 const EthereumWalletConnectors = (props) => [
     ...injectedWalletOverrides,
     ...fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets(props),
-    ...TurnkeyWalletConnectors(props),
+    ...TurnkeyEVMWalletConnectors(props),
     Coinbase,
-    getWalletConnectConnector(props),
+    getWalletConnectConnector(),
 ];
 
 export { EthereumWalletConnectors };

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/InjectedWalletBase.cjs

@@ -2,9 +2,9 @@
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
-var walletConnectV2 = require('../walletConnect/walletConnectV2.cjs');
 var walletConnect = require('../walletConnect/walletConnect.cjs');
 
 class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
@@ -27,19 +27,28 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
-        if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
-            if (!this.wallet)
-                this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new walletConnectV2.WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+        var _a, _b;
+        if (!this.wallet) {
+            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+        }
+        if (this.isInstalledOnBrowser()) {
+            return this;
+        }
+        // this is to handle the case where the user is in a webview.
+        // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
+        // in which case this condition will be false, and the SDK will use WalletConnect (if available)
+        if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
+            this.constructorProps.deepLinkPreference !== 'universal' &&
+            utils.isMobile()) {
+            return this;
+        }
+        // this is the case where the wallet is not installed on the browser and
+        // it does not support WalletConnect. in this case, the SDK will instruct
+        // the user to download the wallet extension
+        if (!this.walletConnectorFallback) {
+            return this;
         }
-        return this;
+        return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     setupEventListeners() {
         const provider = this.getWalletClient();
@@ -51,23 +60,23 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;
         return ((_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress() {
+    getAddress() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            yield this.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/InjectedWalletBase.d.ts

@@ -14,9 +14,9 @@ declare abstract class InjectedWalletBase extends EthWalletConnector {
     getEthProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
     setupEventListeners(): void;
-    getWalletClient(): WalletClient | undefined;
+    getWalletClient(chainId?: string): WalletClient | undefined;
     isInstalledOnBrowser(): boolean;
-    fetchPublicAddress(): Promise<string | undefined>;
+    getAddress(): Promise<string | undefined>;
     connect(): Promise<void>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;

package/src/injected/InjectedWalletBase.js

@@ -1,8 +1,8 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { isMobile } from '@dynamic-labs/utils';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { WalletConnectV2 } from '../walletConnect/walletConnectV2.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
 
 class InjectedWalletBase extends EthWalletConnector {
@@ -25,19 +25,28 @@ class InjectedWalletBase extends EthWalletConnector {
         return this.ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b, _c, _d;
-        if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
-            if (!this.wallet)
-                this.wallet = findWalletBookWallet(this.walletBook, this.key);
-            if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_d = (_c = (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.walletConnect) === null || _c === void 0 ? void 0 : _c.sdks) === null || _d === void 0 ? void 0 : _d.includes('sign_v2'))) {
-                return new WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
-            else {
-                return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
-            }
+        var _a, _b;
+        if (!this.wallet) {
+            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+        }
+        if (this.isInstalledOnBrowser()) {
+            return this;
+        }
+        // this is to handle the case where the user is in a webview.
+        // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
+        // in which case this condition will be false, and the SDK will use WalletConnect (if available)
+        if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
+            this.constructorProps.deepLinkPreference !== 'universal' &&
+            isMobile()) {
+            return this;
+        }
+        // this is the case where the wallet is not installed on the browser and
+        // it does not support WalletConnect. in this case, the SDK will instruct
+        // the user to download the wallet extension
+        if (!this.walletConnectorFallback) {
+            return this;
         }
-        return this;
+        return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     setupEventListeners() {
         const provider = this.getWalletClient();
@@ -49,23 +58,23 @@ class InjectedWalletBase extends EthWalletConnector {
         const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
     }
     isInstalledOnBrowser() {
         var _a;
         return ((_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress() {
+    getAddress() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            yield this.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/PhantomEvm.cjs

@@ -11,15 +11,16 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
-    fetchPublicAddress() {
+    getAddress() {
         const _super = Object.create(null, {
-            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+            getAddress: { get: () => super.getAddress }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return _super.fetchPublicAddress.call(this);
+                return _super.getAddress.call(this);
             }
             if (utils.isMobile()) {
                 utils.handleMobileWalletRedirect({

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>;
+    getAddress(): Promise<string | undefined>;
 }

package/src/injected/PhantomEvm.js

@@ -7,15 +7,16 @@ class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'PhantomEvm';
+        this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
-    fetchPublicAddress() {
+    getAddress() {
         const _super = Object.create(null, {
-            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+            getAddress: { get: () => super.getAddress }
         });
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return _super.fetchPublicAddress.call(this);
+                return _super.getAddress.call(this);
             }
             if (isMobile()) {
                 handleMobileWalletRedirect({

package/src/injected/Zerion.cjs

@@ -0,0 +1,38 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+exports.Zerion = Zerion;

package/src/injected/Zerion.d.ts

@@ -0,0 +1,10 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { EthWalletConnectorOpts } from '../EthWalletConnector';
+import InjectedWalletBase from './InjectedWalletBase';
+export declare class Zerion extends InjectedWalletBase {
+    name: string;
+    overrideKey: string;
+    wallet: WalletSchema;
+    constructor(props: EthWalletConnectorOpts);
+    isInstalledOnBrowser(): boolean;
+}

package/src/injected/Zerion.js

@@ -0,0 +1,34 @@
+import InjectedWalletBase from './InjectedWalletBase.js';
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+export { Zerion };

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -2,18 +2,23 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var PhantomEvm = require('./PhantomEvm.cjs');
 var ExodusEvm = require('./ExodusEvm.cjs');
+var Zerion = require('./Zerion.cjs');
 
 const injectedWalletOverrides = [
     PhantomEvm.PhantomEvm,
     ExodusEvm.ExodusEvm,
+    Zerion.Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
@@ -36,6 +41,26 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }
+            getAddress() {
+                const _super = Object.create(null, {
+                    getAddress: { get: () => super.getAddress }
+                });
+                var _a;
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    if (this.isInstalledOnBrowser()) {
+                        return _super.getAddress.call(this);
+                    }
+                    const inAppBrowserBase = (_a = this.wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
+                    if (!inAppBrowserBase) {
+                        const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
+                        walletConnectorCore.logger.error(error.message);
+                        throw error;
+                    }
+                    const cleanedTargetUrl = window.location.href.replace('https://', '');
+                    window.location.href = `${inAppBrowserBase}/${cleanedTargetUrl}`;
+                    return undefined;
+                });
+            }
         };
     });
 };

package/src/injected/fetchInjectedWalletConnectors.d.ts

@@ -2,6 +2,5 @@ import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core'
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 export declare const injectedWalletOverrides: WalletConnectorConstructor[];
 export declare const fetchInjectedWalletConnector: ({ walletBook, }: {
-    isWalletConnectV2Enabled: boolean;
     walletBook: WalletBookSchema;
 }) => WalletConnectorConstructor[];

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,15 +1,20 @@
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import InjectedWalletBase from './InjectedWalletBase.js';
 import { PhantomEvm } from './PhantomEvm.js';
 import { ExodusEvm } from './ExodusEvm.js';
+import { Zerion } from './Zerion.js';
 
 const injectedWalletOverrides = [
     PhantomEvm,
     ExodusEvm,
+    Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;
@@ -32,6 +37,26 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }
+            getAddress() {
+                const _super = Object.create(null, {
+                    getAddress: { get: () => super.getAddress }
+                });
+                var _a;
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (this.isInstalledOnBrowser()) {
+                        return _super.getAddress.call(this);
+                    }
+                    const inAppBrowserBase = (_a = this.wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
+                    if (!inAppBrowserBase) {
+                        const error = new Error(`No inAppBrowserBase found for ${this.name}.`);
+                        logger.error(error.message);
+                        throw error;
+                    }
+                    const cleanedTargetUrl = window.location.href.replace('https://', '');
+                    window.location.href = `${inAppBrowserBase}/${cleanedTargetUrl}`;
+                    return undefined;
+                });
+            }
         };
     });
 };

package/src/walletConnect/fetchWalletConnectWallets.cjs

@@ -2,47 +2,28 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletConnectV2 = require('./walletConnectV2.cjs');
 var walletConnect = require('./walletConnect.cjs');
 
-const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
+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) => {
-        var _a;
+    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;
-        // justification: we filtered out null/undefined above
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (isWalletConnectV2Enabled &&
-            ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
-            return class extends walletConnectV2.WalletConnectV2 {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-        else {
-            return class extends walletConnect.WalletConnect {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
+        return class extends walletConnect.WalletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
+            }
+        };
     });
 };
-const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
-    ? class extends walletConnectV2.WalletConnectV2 {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
+const getWalletConnectConnector = () => class extends walletConnect.WalletConnect {
+    constructor(props) {
+        super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
     }
-    : class extends walletConnect.WalletConnect {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
-    };
+};
 
 exports.fetchWalletConnectWallets = fetchWalletConnectWallets;
 exports.getWalletConnectConnector = getWalletConnectConnector;

package/src/walletConnect/fetchWalletConnectWallets.d.ts

@@ -1,9 +1,6 @@
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
-export declare const fetchWalletConnectWallets: ({ isWalletConnectV2Enabled, walletBook, }: {
-    isWalletConnectV2Enabled: boolean;
+export declare const fetchWalletConnectWallets: ({ walletBook, }: {
     walletBook: WalletBookSchema;
 }) => Array<WalletConnectorConstructor>;
-export declare const getWalletConnectConnector: ({ isWalletConnectV2Enabled, }: {
-    isWalletConnectV2Enabled: boolean;
-}) => WalletConnectorConstructor;
+export declare const getWalletConnectConnector: () => WalletConnectorConstructor;