@dynamic-labs/ethereum 2.0.0-alpha.1 → 2.0.0-alpha.11

package/src/coinbase/coinbase.js

@@ -6,17 +6,16 @@ import '@dynamic-labs/turnkey';
 import '@dynamic-labs/utils';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import '../walletConnect/walletConnectV2.js';
-import '@walletconnect/ethereum-provider';
-import '@dynamic-labs/wallet-connector-core';
-import '@walletconnect/client';
-import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import '../walletConnect/walletConnect.js';
+import { getCoinbaseProvider, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import '@dynamic-labs/rpc-provider-ethereum';
 
 class Coinbase extends EthWalletConnector {
     constructor(_a) {
         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;
@@ -41,10 +40,10 @@ class Coinbase extends EthWalletConnector {
             return;
         this.teardownEventListeners = setupResponse.tearDownEventListeners;
     }
-    getWalletClient() {
+    getWalletClient(chainId) {
         var _a;
         if (this.isInstalledOnBrowser()) {
-            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
         }
         return createWalletClient({
             transport: custom(getCoinbaseProvider({
@@ -56,13 +55,13 @@ class Coinbase extends EthWalletConnector {
         var _a;
         return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
-    fetchPublicAddress(opts) {
+    getAddress(opts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInstalledOnBrowser()) {
-                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
+                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
             }
-            return fetchPublicAddress(this.coinbaseProviderOpts, opts);
+            return getAddress(this.coinbaseProviderOpts, opts);
         });
     }
     signMessage(messageToSign) {

package/src/ethProviderHelper.cjs

@@ -4,8 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var viem = require('viem');
+var accounts = require('viem/accounts');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var viemUtils = require('@dynamic-labs/viem-utils');
 var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
@@ -75,29 +77,32 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return viem.createWalletClient({
+            account: this.account,
+            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
             transport: viem.custom(provider),
         });
     }
-    fetchPublicAddress() {
+    getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const client = this.findWalletClient();
             if (!client) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithProvider(client);
+            return this.getAddressWithProvider(client);
         });
     }
-    fetchPublicAddressWithProvider(client) {
+    getAddressWithProvider(client) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = viem.getAddress(lowercaseAddress);
+                this.account = accounts.toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -108,7 +113,7 @@ class EthProviderHelper {
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
+            const walletAddress = yield this.getAddress();
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }

package/src/ethProviderHelper.d.ts

@@ -4,6 +4,7 @@ import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ProviderFlag } from './types';
 export declare class EthProviderHelper {
     private wallet;
+    private account;
     constructor(wallet: WalletSchema);
     getInstalledProvider(): IEthereum | undefined;
     getEip6963Config(): {
@@ -27,9 +28,9 @@ export declare class EthProviderHelper {
     eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;
-    findWalletClient(): WalletClient | undefined;
-    fetchPublicAddress(): Promise<Hex | undefined>;
-    fetchPublicAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
+    findWalletClient(chainId?: string): WalletClient | undefined;
+    getAddress(): Promise<Hex | undefined>;
+    getAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     _setupEventListeners(walletConnector: WalletConnector): {
         tearDownEventListeners: () => void;

package/src/ethProviderHelper.js

@@ -1,7 +1,9 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
+import { toAccount } from 'viem/accounts';
 import { ProviderLookup, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
 import { getProvidersFromWindow } from '@dynamic-labs/utils';
+import { chainsMap } from '@dynamic-labs/viem-utils';
 import { Eip6963ProviderSingleton } from './eip6963Provider.js';
 
 class EthProviderHelper {
@@ -71,29 +73,32 @@ class EthProviderHelper {
     findProvider() {
         return this.getInstalledProvider();
     }
-    findWalletClient() {
+    findWalletClient(chainId) {
         const provider = this.findProvider();
         if (!provider) {
             return undefined;
         }
         return createWalletClient({
+            account: this.account,
+            chain: chainId ? chainsMap[chainId] : undefined,
             transport: custom(provider),
         });
     }
-    fetchPublicAddress() {
+    getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.findWalletClient();
             if (!client) {
                 return Promise.resolve(undefined);
             }
-            return this.fetchPublicAddressWithProvider(client);
+            return this.getAddressWithProvider(client);
         });
     }
-    fetchPublicAddressWithProvider(client) {
+    getAddressWithProvider(client) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield client.requestAddresses();
                 const publicAddress = getAddress(lowercaseAddress);
+                this.account = toAccount(publicAddress);
                 return publicAddress;
             }
             catch (err) {
@@ -104,7 +109,7 @@ class EthProviderHelper {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
+            const walletAddress = yield this.getAddress();
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }

package/src/index.cjs

@@ -7,19 +7,13 @@ 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,
@@ -27,7 +21,7 @@ const EthereumWalletConnectors = (props) => [
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
     ...turnkey.TurnkeyWalletConnectors(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

@@ -4,19 +4,13 @@ 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,
@@ -24,7 +18,7 @@ const EthereumWalletConnectors = (props) => [
     ...fetchWalletConnectWallets(props),
     ...TurnkeyWalletConnectors(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

@@ -4,7 +4,6 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
 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,17 +26,10 @@ 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 }));
-            }
+            return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }
@@ -51,23 +43,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

@@ -2,7 +2,6 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 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,17 +24,10 @@ 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 }));
-            }
+            return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
         }
         return this;
     }
@@ -49,23 +41,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/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/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;

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -1,43 +1,24 @@
-import { WalletConnectV2 } from './walletConnectV2.js';
 import { WalletConnect } from './walletConnect.js';
 
-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 {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-        else {
-            return class extends WalletConnect {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
+        return class extends WalletConnect {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { walletName: name }));
+                this.overrideKey = key;
+            }
+        };
     });
 };
-const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
-    ? class extends WalletConnectV2 {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
+const getWalletConnectConnector = () => class extends WalletConnect {
+    constructor(props) {
+        super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
     }
-    : class extends WalletConnect {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
-    };
+};
 
 export { fetchWalletConnectWallets, getWalletConnectConnector };

package/src/walletConnect/index.d.ts

@@ -1,3 +1,2 @@
-export { WalletConnectV2, type WalletConnectorV2Opts } from './walletConnectV2';
-export { WalletConnect } from './walletConnect';
+export { WalletConnect, type WalletConnectOpts } from './walletConnect';
 export { fetchWalletConnectWallets } from './fetchWalletConnectWallets';