@dynamic-labs/ethereum 4.0.0-alpha.4 → 4.0.0-alpha.40

package/src/ethProviderHelper.d.ts

@@ -1,16 +1,14 @@
 import { Hex, WalletClient, Account, Transport, Chain as ViemChain } from 'viem';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { EthWalletConnector } from '@dynamic-labs/ethereum-core';
 import { IEthereum, ExtensionLocator } from './types';
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
 export declare class EthProviderHelper {
-    private wallet;
+    private walletBookWallet;
     private connector;
-    constructor(wallet: WalletSchema, connector: EthWalletConnector);
+    constructor(connector: InjectedWalletBase);
     getInstalledProvider(): IEthereum | undefined;
-    getEip6963Config(): {
-        rdns: string;
-    } | undefined;
+    getInjectedProvider(): IEthereum | undefined;
+    getEip6963Provider(): IEthereum | undefined;
     getInjectedConfig(): {
         chain: string;
         extensionLocators: {

package/src/ethProviderHelper.js

@@ -1,23 +1,24 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
-import { ProviderLookup, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
+import { ProviderLookup, logger, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { getProvidersFromWindow, Eip6963ProviderSingleton } from '@dynamic-labs/utils';
 import { chainsMap } from '@dynamic-labs/ethereum-core';
 
 class EthProviderHelper {
-    constructor(wallet, connector) {
-        this.wallet = wallet;
+    constructor(connector) {
+        this.walletBookWallet = findWalletBookWallet(connector.walletBook, connector.key);
         this.connector = connector;
     }
     getInstalledProvider() {
-        const eip6963Config = this.getEip6963Config();
-        if (eip6963Config) {
-            const eip6963Provider = this.eip6963ProviderLookup(eip6963Config.rdns);
-            if (eip6963Provider) {
-                return eip6963Provider;
-            }
+        const eip6963Provider = this.getEip6963Provider();
+        if (eip6963Provider) {
+            return eip6963Provider;
         }
+        return this.getInjectedProvider();
+    }
+    getInjectedProvider() {
         const config = this.getInjectedConfig();
         if (!config ||
             !config.extensionLocators ||
@@ -25,16 +26,17 @@ class EthProviderHelper {
             return undefined;
         return this.installedProviderLookup(config.extensionLocators);
     }
-    getEip6963Config() {
-        if (!this.wallet || !this.wallet.eip6963Config)
-            return;
-        return this.wallet.eip6963Config;
+    getEip6963Provider() {
+        const { rdns } = this.connector.metadata;
+        if (!rdns) {
+            return undefined;
+        }
+        return this.eip6963ProviderLookup(rdns);
     }
     getInjectedConfig() {
-        if (!this.wallet || !this.wallet.injectedConfig)
-            return;
-        const { injectedConfig } = this.wallet;
-        return injectedConfig.find((c) => c.chain === 'evm');
+        var _a;
+        const injectedConfig = (_a = this.walletBookWallet) === null || _a === void 0 ? void 0 : _a.injectedConfig;
+        return injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.find((c) => c.chain === 'evm');
     }
     installedProviders() {
         const config = this.getInjectedConfig();
@@ -71,7 +73,7 @@ class EthProviderHelper {
         return this.findProvider() !== undefined;
     }
     findProvider() {
-        return this.getInstalledProvider();
+        return this.connector.findProvider();
     }
     findWalletClient(chainId) {
         const provider = this.findProvider();
@@ -126,43 +128,44 @@ class EthProviderHelper {
     }
     _setupEventListeners(walletConnector) {
         const web3Provider = this.findProvider();
-        if (web3Provider && 'on' in web3Provider) {
-            const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(walletConnector);
-            web3Provider.on('accountsChanged', handleAccountChange);
-            web3Provider.on('chainChanged', handleChainChange);
-            web3Provider.on('disconnect', handleDisconnect);
-            const tearDownEventListeners = () => {
-                const web3Provider = this.findProvider();
-                if (!web3Provider) {
-                    return;
-                }
-                if (handleAccountChange) {
-                    web3Provider.removeListener('accountsChanged', handleAccountChange);
-                }
-                if (handleChainChange) {
-                    web3Provider.removeListener('chainChanged', handleChainChange);
-                }
-                if (handleDisconnect) {
-                    web3Provider.removeListener('disconnect', handleDisconnect);
-                }
-            };
-            return {
-                tearDownEventListeners,
-            };
-        }
         if (!web3Provider) {
             logger.warn('Provider not found', {
                 connector: walletConnector,
             });
+            return {
+                tearDownEventListeners: () => { },
+            };
         }
-        else if (!('on' in web3Provider)) {
+        if (!web3Provider.on) {
             logger.warn('Provider does not support event listeners', {
                 connector: walletConnector,
                 provider: web3Provider,
             });
+            return {
+                tearDownEventListeners: () => { },
+            };
         }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(walletConnector);
+        web3Provider.on('accountsChanged', handleAccountChange);
+        web3Provider.on('chainChanged', handleChainChange);
+        web3Provider.on('disconnect', handleDisconnect);
+        const tearDownEventListeners = () => {
+            const web3Provider = this.findProvider();
+            if (!web3Provider) {
+                return;
+            }
+            if (handleAccountChange) {
+                web3Provider.removeListener('accountsChanged', handleAccountChange);
+            }
+            if (handleChainChange) {
+                web3Provider.removeListener('chainChanged', handleChainChange);
+            }
+            if (handleDisconnect) {
+                web3Provider.removeListener('disconnect', handleDisconnect);
+            }
+        };
         return {
-            tearDownEventListeners: () => { },
+            tearDownEventListeners,
         };
     }
 }

package/src/index.cjs

@@ -5,35 +5,43 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
 var embeddedWalletEvm = require('@dynamic-labs/embedded-wallet-evm');
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
-var UnknownInjected = require('./injected/UnknownInjected.cjs');
 var FallbackEvmConnector = require('./injected/FallbackEvmConnector.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
+var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
 require('./walletConnect/walletConnect.cjs');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
 var coinbase = require('./coinbase/coinbase.cjs');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
+var MetaMaskConnector = require('./metaMask/MetaMaskConnector.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
 var constants = require('./constants.cjs');
 
+assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum', _package.version);
 const EthereumWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
     ...embeddedWalletEvm.TurnkeyEVMWalletConnectors(props),
+    MetaMaskConnector.MetaMaskConnector,
     coinbase.Coinbase,
-    UnknownInjected.UnknownInjected,
     FallbackEvmConnector.FallbackEvmConnector,
     fetchWalletConnectWallets.getWalletConnectConnector(),
 ];
 
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
 exports.ExodusEvm = ExodusEvm.ExodusEvm;
-exports.UnknownInjected = UnknownInjected.UnknownInjected;
 exports.FallbackEvmConnector = FallbackEvmConnector.FallbackEvmConnector;
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
 exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
+exports.EthereumInjectedConnector = InjectedWalletBase.InjectedWalletBase;
+Object.defineProperty(exports, 'EthereumWalletConnector', {
+  enumerable: true,
+  get: function () { return ethereumCore.EthereumWalletConnector; }
+});
 Object.defineProperty(exports, 'isEthereumWallet', {
   enumerable: true,
   get: function () { return ethereumCore.isEthereumWallet; }

package/src/index.d.ts

@@ -6,4 +6,4 @@ export * from './ethProviderHelper';
 export * from './constants';
 export * from './types';
 export declare const EthereumWalletConnectors: (props: any) => WalletConnectorConstructor[];
-export { isEthereumWallet } from '@dynamic-labs/ethereum-core';
+export { isEthereumWallet, EthereumWalletConnector, } from '@dynamic-labs/ethereum-core';

package/src/index.js

@@ -1,28 +1,31 @@
 'use client'
 import './polyfills.js';
 import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/embedded-wallet-evm';
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
 export { PhantomEvm } from './injected/PhantomEvm.js';
 export { ExodusEvm } from './injected/ExodusEvm.js';
-import { UnknownInjected } from './injected/UnknownInjected.js';
-export { UnknownInjected } from './injected/UnknownInjected.js';
 import { FallbackEvmConnector } from './injected/FallbackEvmConnector.js';
 export { FallbackEvmConnector } from './injected/FallbackEvmConnector.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
 export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
+export { InjectedWalletBase as EthereumInjectedConnector } from './injected/InjectedWalletBase.js';
 import './walletConnect/walletConnect.js';
 import { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
 import { Coinbase } from './coinbase/coinbase.js';
-export { isEthereumWallet } from '@dynamic-labs/ethereum-core';
+export { EthereumWalletConnector, isEthereumWallet } from '@dynamic-labs/ethereum-core';
+import { MetaMaskConnector } from './metaMask/MetaMaskConnector.js';
 export { EthProviderHelper } from './ethProviderHelper.js';
 export { INFURA_ID } from './constants.js';
 
+assertPackageVersion('@dynamic-labs/ethereum', version);
 const EthereumWalletConnectors = (props) => [
     ...injectedWalletOverrides,
     ...fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets(props),
     ...TurnkeyEVMWalletConnectors(props),
+    MetaMaskConnector,
     Coinbase,
-    UnknownInjected,
     FallbackEvmConnector,
     getWalletConnectConnector(),
 ];

package/src/injected/ExodusEvm.cjs

@@ -3,17 +3,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 // leaving ExodusEvm in here due to a backwards compatibility issue with this one wallet and v18
-class ExodusEvm extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+class ExodusEvm extends InjectedWalletBase.InjectedWalletBase {
+    constructor() {
+        super(...arguments);
         this.name = 'ExodusEvm';
         this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
 }
 

package/src/injected/ExodusEvm.d.ts

@@ -1,8 +1,6 @@
-import { EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-import InjectedWalletBase from './InjectedWalletBase';
+import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class ExodusEvm extends InjectedWalletBase {
     name: string;
     overrideKey: string;
     walletConnectorFallback: boolean;
-    constructor(props: EthWalletConnectorOpts);
 }

package/src/injected/ExodusEvm.js

@@ -1,15 +1,13 @@
 'use client'
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import InjectedWalletBase from './InjectedWalletBase.js';
+import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 // leaving ExodusEvm in here due to a backwards compatibility issue with this one wallet and v18
 class ExodusEvm extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+    constructor() {
+        super(...arguments);
         this.name = 'ExodusEvm';
         this.overrideKey = 'exodusevm';
         this.walletConnectorFallback = true;
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
 }
 

package/src/injected/FallbackEvmConnector.cjs

@@ -3,16 +3,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class FallbackEvmConnector extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+class FallbackEvmConnector extends InjectedWalletBase.InjectedWalletBase {
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/FallbackEvmConnector.d.ts

@@ -1,9 +1,7 @@
-import { EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-import InjectedWalletBase from './InjectedWalletBase';
+import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class FallbackEvmConnector extends InjectedWalletBase {
     name: string;
     overrideKey: string;
     isAvailable: boolean;
-    constructor(props: EthWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
 }

package/src/injected/FallbackEvmConnector.js

@@ -1,14 +1,12 @@
 'use client'
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import InjectedWalletBase from './InjectedWalletBase.js';
+import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class FallbackEvmConnector extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/InjectedWalletBase.cjs

@@ -1,44 +1,34 @@
 'use client'
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var _tslib = require('../../_virtual/_tslib.cjs');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
 var ethProviderHelper = require('../ethProviderHelper.cjs');
 var walletConnect = require('../walletConnect/walletConnect.cjs');
 
-class InjectedWalletBase extends ethereumCore.EthWalletConnector {
+class InjectedWalletBase extends ethereumCore.EthereumWalletConnector {
     constructor() {
         super(...arguments);
-        this.supportedChains = ['ETH', 'EVM'];
-        this.connectedChain = 'EVM';
         this.walletConnectorFallback = false;
     }
-    getEthProviderHelper() {
-        if (!this.wallet) {
-            // changing this to findWalletBookWallet so it returns undefined if not found which
-            // allows the getEthProviderHelper to return undefined if the wallet is not installed
-            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        }
-        if (this.wallet && !this.ethProviderHelper) {
-            this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(this.wallet, this);
+    get ethProviderHelper() {
+        if (!this._ethProviderHelper) {
+            this._ethProviderHelper = new ethProviderHelper.EthProviderHelper(this);
         }
-        // this.ethProviderHelper is undefined if the wallet is not installed or found in walletbook
-        return this.ethProviderHelper;
+        return this._ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b;
-        if (!this.wallet) {
-            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        }
+        var _a;
         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) &&
+        if (((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
             this.mobileExperience === 'in-app-browser' &&
             utils.isMobile()) {
             return this;
@@ -51,28 +41,31 @@ class InjectedWalletBase extends ethereumCore.EthWalletConnector {
         }
         return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
+    findProvider() {
+        var _a;
+        return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+    }
     setupEventListeners() {
         const provider = this.getWalletClient();
         if (!provider)
             return;
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
+        if (!this.ethProviderHelper)
             return;
-        const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
+        const { tearDownEventListeners } = this.ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
     getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
+        return (_a = this.ethProviderHelper) === 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;
+        return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
@@ -83,7 +76,7 @@ class InjectedWalletBase extends ethereumCore.EthWalletConnector {
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
         });
     }
     proveOwnership(address, messageToSign) {
@@ -108,4 +101,4 @@ class InjectedWalletBase extends ethereumCore.EthWalletConnector {
     }
 }
 
-module.exports = InjectedWalletBase;
+exports.InjectedWalletBase = InjectedWalletBase;

package/src/injected/InjectedWalletBase.d.ts

@@ -1,18 +1,15 @@
 import { WalletClient, Transport, Account, Chain as ViemChain } from 'viem';
-import { Chain } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
-import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { EthWalletConnector } from '@dynamic-labs/ethereum-core';
+import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
 import { EthProviderHelper } from '../ethProviderHelper';
-declare abstract class InjectedWalletBase extends EthWalletConnector {
-    supportedChains: Chain[];
-    connectedChain: Chain;
+import { IEthereum } from '../types';
+export declare abstract class InjectedWalletBase extends EthereumWalletConnector {
     publicAddress: string | undefined;
     walletConnectorFallback: boolean;
-    ethProviderHelper: EthProviderHelper | undefined;
-    wallet: WalletSchema | undefined;
-    getEthProviderHelper(): EthProviderHelper | undefined;
+    _ethProviderHelper: EthProviderHelper | undefined;
+    get ethProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
+    findProvider(): IEthereum | undefined;
     setupEventListeners(): void;
     getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
     isInstalledOnBrowser(): boolean;
@@ -26,4 +23,3 @@ declare abstract class InjectedWalletBase extends EthWalletConnector {
         provider: WalletClient;
     }): Promise<void>;
 }
-export default InjectedWalletBase;

package/src/injected/InjectedWalletBase.js

@@ -1,42 +1,30 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile } from '@dynamic-labs/utils';
-import { EthWalletConnector } from '@dynamic-labs/ethereum-core';
+import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
 import { EthProviderHelper } from '../ethProviderHelper.js';
 import { WalletConnect } from '../walletConnect/walletConnect.js';
 
-class InjectedWalletBase extends EthWalletConnector {
+class InjectedWalletBase extends EthereumWalletConnector {
     constructor() {
         super(...arguments);
-        this.supportedChains = ['ETH', 'EVM'];
-        this.connectedChain = 'EVM';
         this.walletConnectorFallback = false;
     }
-    getEthProviderHelper() {
-        if (!this.wallet) {
-            // changing this to findWalletBookWallet so it returns undefined if not found which
-            // allows the getEthProviderHelper to return undefined if the wallet is not installed
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+    get ethProviderHelper() {
+        if (!this._ethProviderHelper) {
+            this._ethProviderHelper = new EthProviderHelper(this);
         }
-        if (this.wallet && !this.ethProviderHelper) {
-            this.ethProviderHelper = new EthProviderHelper(this.wallet, this);
-        }
-        // this.ethProviderHelper is undefined if the wallet is not installed or found in walletbook
-        return this.ethProviderHelper;
+        return this._ethProviderHelper;
     }
     getMobileOrInstalledWallet() {
-        var _a, _b;
-        if (!this.wallet) {
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
-        }
+        var _a;
         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) &&
+        if (((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
             this.mobileExperience === 'in-app-browser' &&
             isMobile()) {
             return this;
@@ -49,28 +37,31 @@ class InjectedWalletBase extends EthWalletConnector {
         }
         return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
+    findProvider() {
+        var _a;
+        return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+    }
     setupEventListeners() {
         const provider = this.getWalletClient();
         if (!provider)
             return;
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
+        if (!this.ethProviderHelper)
             return;
-        const { tearDownEventListeners } = ethProviderHelper._setupEventListeners(this);
+        const { tearDownEventListeners } = this.ethProviderHelper._setupEventListeners(this);
         this.teardownEventListeners = tearDownEventListeners;
     }
     getWalletClient(chainId) {
         var _a;
-        return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
+        return (_a = this.ethProviderHelper) === 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;
+        return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress();
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     connect() {
@@ -81,7 +72,7 @@ class InjectedWalletBase extends EthWalletConnector {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
+            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
         });
     }
     proveOwnership(address, messageToSign) {
@@ -106,4 +97,4 @@ class InjectedWalletBase extends EthWalletConnector {
     }
 }
 
-export { InjectedWalletBase as default };
+export { InjectedWalletBase };

package/src/injected/PhantomEvm.cjs

@@ -5,15 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
-class PhantomEvm extends InjectedWalletBase {
-    constructor(props) {
-        super(props);
+class PhantomEvm extends InjectedWalletBase.InjectedWalletBase {
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -34,7 +32,7 @@ class PhantomEvm extends InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return Boolean((_b = (_a = this.getEthProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
+        return Boolean((_b = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.selectedAddress);
     }
 }
 

package/src/injected/PhantomEvm.d.ts

@@ -1,9 +1,7 @@
-import { EthWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
-import InjectedWalletBase from './InjectedWalletBase';
+import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class PhantomEvm extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(props: EthWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     canGetChainAddress(): boolean;
 }