@dynamic-labs/ethereum 4.0.0-alpha.38 → 4.0.0-alpha.39

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+## [4.0.0-alpha.39](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.38...v4.0.0-alpha.39) (2024-12-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove usages of findWalletBookWallet when possible (#7455)
+
+### Bug Fixes
+
+* sdkHasLoaded always false in cookie enabled env ([#7516](https://github.com/dynamic-labs/dynamic-auth/issues/7516)) ([1c3335c](https://github.com/dynamic-labs/dynamic-auth/commit/1c3335c13930e9bffe60cf1c09bc9c9584a59ef7))
+
+
+* remove usages of findWalletBookWallet when possible ([#7455](https://github.com/dynamic-labs/dynamic-auth/issues/7455)) ([0ce977d](https://github.com/dynamic-labs/dynamic-auth/commit/0ce977d5d4d591c371c6ea2edfb252ba7acff5d2))
+
 ## [4.0.0-alpha.38](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.37...v4.0.0-alpha.38) (2024-11-27)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.38";
+var version = "4.0.0-alpha.39";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.38";
+var version = "4.0.0-alpha.39";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "4.0.0-alpha.38",
+  "version": "4.0.0-alpha.39",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -24,14 +24,14 @@
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
     "@metamask/sdk": "0.30.1",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.38",
-    "@dynamic-labs/embedded-wallet-evm": "4.0.0-alpha.38",
-    "@dynamic-labs/ethereum-core": "4.0.0-alpha.38",
-    "@dynamic-labs/logger": "4.0.0-alpha.38",
-    "@dynamic-labs/types": "4.0.0-alpha.38",
-    "@dynamic-labs/utils": "4.0.0-alpha.38",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.38",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.38"
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.39",
+    "@dynamic-labs/embedded-wallet-evm": "4.0.0-alpha.39",
+    "@dynamic-labs/ethereum-core": "4.0.0-alpha.39",
+    "@dynamic-labs/logger": "4.0.0-alpha.39",
+    "@dynamic-labs/types": "4.0.0-alpha.39",
+    "@dynamic-labs/utils": "4.0.0-alpha.39",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.39",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.39"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/ethProviderHelper.cjs

@@ -6,19 +6,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 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 ethereumCore = require('@dynamic-labs/ethereum-core');
 
 class EthProviderHelper {
-    constructor(wallet, connector) {
-        this.wallet = wallet;
-        this._connector = connector;
-    }
-    get connector() {
-        if (!this._connector) {
-            throw new Error('Connect not provided to EthProviderHelper');
-        }
-        return this._connector;
+    constructor(connector) {
+        this.walletBookWallet = walletBook.findWalletBookWallet(connector.walletBook, connector.key);
+        this.connector = connector;
     }
     getInstalledProvider() {
         const eip6963Provider = this.getEip6963Provider();
@@ -43,10 +38,9 @@ class EthProviderHelper {
         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();

package/src/ethProviderHelper.d.ts

@@ -1,13 +1,11 @@
 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 { IEthereum, ExtensionLocator } from './types';
 import { InjectedWalletBase } from './injected/InjectedWalletBase';
 export declare class EthProviderHelper {
-    private wallet;
-    private _connector;
-    constructor(wallet: WalletSchema, connector?: InjectedWalletBase);
-    private get connector();
+    private walletBookWallet;
+    private connector;
+    constructor(connector: InjectedWalletBase);
     getInstalledProvider(): IEthereum | undefined;
     getInjectedProvider(): IEthereum | undefined;
     getEip6963Provider(): IEthereum | undefined;

package/src/ethProviderHelper.js

@@ -2,19 +2,14 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
 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;
-        this._connector = connector;
-    }
-    get connector() {
-        if (!this._connector) {
-            throw new Error('Connect not provided to EthProviderHelper');
-        }
-        return this._connector;
+    constructor(connector) {
+        this.walletBookWallet = findWalletBookWallet(connector.walletBook, connector.key);
+        this.connector = connector;
     }
     getInstalledProvider() {
         const eip6963Provider = this.getEip6963Provider();
@@ -39,10 +34,9 @@ class EthProviderHelper {
         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();

package/src/injected/InjectedWalletBase.cjs

@@ -4,7 +4,6 @@
 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');
@@ -15,18 +14,11 @@ class InjectedWalletBase extends ethereumCore.EthereumWalletConnector {
         super(...arguments);
         this.walletConnectorFallback = false;
     }
-    get wallet() {
-        if (!this._wallet) {
-            this._wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+    get ethProviderHelper() {
+        if (!this._ethProviderHelper) {
+            this._ethProviderHelper = new ethProviderHelper.EthProviderHelper(this);
         }
-        return this._wallet;
-    }
-    getEthProviderHelper() {
-        if (this.wallet && !this.ethProviderHelper) {
-            this.ethProviderHelper = new ethProviderHelper.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;
@@ -50,33 +42,30 @@ class InjectedWalletBase extends ethereumCore.EthereumWalletConnector {
         return new walletConnect.WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     findProvider() {
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
-            return;
-        return ethProviderHelper.getInstalledProvider();
+        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() {
@@ -87,7 +76,7 @@ class InjectedWalletBase extends ethereumCore.EthereumWalletConnector {
     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) {

package/src/injected/InjectedWalletBase.d.ts

@@ -1,85 +1,13 @@
 import { WalletClient, Transport, Account, Chain as ViemChain } from 'viem';
 import { EvmNetwork } from '@dynamic-labs/types';
-import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
 import { EthProviderHelper } from '../ethProviderHelper';
 import { IEthereum } from '../types';
 export declare abstract class InjectedWalletBase extends EthereumWalletConnector {
     publicAddress: string | undefined;
     walletConnectorFallback: boolean;
-    ethProviderHelper: EthProviderHelper | undefined;
-    _wallet: WalletSchema | undefined;
-    get wallet(): {
-        name: string;
-        brand?: {
-            alt?: string | undefined;
-            primaryColor?: string | undefined;
-            spriteId?: string | undefined;
-        } | undefined;
-        chainGroup?: string | undefined;
-        chains?: string[] | undefined;
-        desktop?: {
-            chromeId?: string | undefined;
-            edgeId?: string | undefined;
-            firefoxId?: string | undefined;
-            native?: string | undefined;
-            operaId?: string | undefined;
-            safariId?: string | undefined;
-            universal?: string | undefined;
-        } | undefined;
-        eip6963Config?: {
-            rdns: string;
-        } | undefined;
-        filterFromWalletConnect?: boolean | undefined;
-        group?: string | undefined;
-        hardwareWallets?: string[] | undefined;
-        injectedConfig?: {
-            chain: string;
-            extensionLocators: {
-                value: boolean;
-                flag: string;
-            }[];
-            providerInterface?: string | undefined;
-            walletStandard?: {
-                features: string[];
-                name: string;
-                providerId?: string | undefined;
-            } | undefined;
-            walletStandardLocators?: {
-                name: string;
-                locator: string;
-            }[] | undefined;
-            windowLocations?: string[] | undefined;
-        }[] | undefined;
-        mobile?: {
-            android?: string | null | undefined;
-            androidId?: string | undefined;
-            inAppBrowser?: string | null | undefined;
-            ios?: string | null | undefined;
-            iosId?: string | undefined;
-            native?: string | undefined;
-            universal?: string | undefined;
-        } | undefined;
-        mobileExperience?: "in-app-browser" | "redirect" | undefined;
-        shortName?: string | undefined;
-        showOnlyIfInstalled?: boolean | undefined;
-        switchNetworkOnlyFromWallet?: boolean | undefined;
-        walletConnect?: {
-            sdks?: string[] | undefined;
-        } | undefined;
-        walletGroup?: string | undefined;
-        walletLimitations?: {
-            browserExtension?: {
-                unsupportedEvents?: string[] | undefined;
-                unsupportedMethods?: string[] | undefined;
-            } | undefined;
-            mobile?: {
-                unsupportedEvents?: string[] | undefined;
-                unsupportedMethods?: string[] | undefined;
-            } | undefined;
-        } | undefined;
-    } | undefined;
-    getEthProviderHelper(): EthProviderHelper | undefined;
+    _ethProviderHelper: EthProviderHelper | undefined;
+    get ethProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
     findProvider(): IEthereum | undefined;
     setupEventListeners(): void;

package/src/injected/InjectedWalletBase.js

@@ -1,6 +1,5 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile } from '@dynamic-labs/utils';
 import { EthereumWalletConnector } from '@dynamic-labs/ethereum-core';
 import { EthProviderHelper } from '../ethProviderHelper.js';
@@ -11,18 +10,11 @@ class InjectedWalletBase extends EthereumWalletConnector {
         super(...arguments);
         this.walletConnectorFallback = false;
     }
-    get wallet() {
-        if (!this._wallet) {
-            this._wallet = findWalletBookWallet(this.walletBook, this.key);
+    get ethProviderHelper() {
+        if (!this._ethProviderHelper) {
+            this._ethProviderHelper = new EthProviderHelper(this);
         }
-        return this._wallet;
-    }
-    getEthProviderHelper() {
-        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;
@@ -46,33 +38,30 @@ class InjectedWalletBase extends EthereumWalletConnector {
         return new WalletConnect(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
     }
     findProvider() {
-        const ethProviderHelper = this.getEthProviderHelper();
-        if (!ethProviderHelper)
-            return;
-        return ethProviderHelper.getInstalledProvider();
+        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() {
@@ -83,7 +72,7 @@ class InjectedWalletBase extends EthereumWalletConnector {
     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) {

package/src/injected/PhantomEvm.cjs

@@ -32,7 +32,7 @@ class PhantomEvm extends InjectedWalletBase.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.js

@@ -28,7 +28,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/fetchInjectedWalletConnectors.cjs

@@ -42,9 +42,6 @@ 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;
             }
-            get wallet() {
-                return wallet;
-            }
             getAddress() {
                 const _super = Object.create(null, {
                     getAddress: { get: () => super.getAddress }

package/src/injected/fetchInjectedWalletConnectors.js

@@ -38,9 +38,6 @@ 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;
             }
-            get wallet() {
-                return wallet;
-            }
             getAddress() {
                 const _super = Object.create(null, {
                     getAddress: { get: () => super.getAddress }

package/src/metaMask/MetaMaskConnector.cjs

@@ -9,9 +9,8 @@ var viem = require('viem');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var logger = require('../utils/logger.cjs');
-var ethProviderHelper = require('../ethProviderHelper.cjs');
+var InjectedWalletBase = require('../injected/InjectedWalletBase.cjs');
 var createMetaMaskSDKDisplayUriState = require('./utils/createMetaMaskSDKDisplayUriState.cjs');
 var waitForConnection = require('./utils/waitForConnection.cjs');
 var isPendingWalletRequestPermissionError = require('./utils/isPendingWalletRequestPermissionError.cjs');
@@ -23,7 +22,7 @@ var isPendingWalletRequestPermissionError = require('./utils/isPendingWalletRequ
 let _metaMaskSDK = null;
 let _metaMaskSDKDisplayUriState = null;
 const eventTimeline = utils.createEventTimeline();
-class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
+class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'MetaMask';
@@ -54,9 +53,6 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
             return this.evmNetworks.map((network) => network.chainId.toString());
         });
     }
-    get ethProviderHelper() {
-        return new ethProviderHelper.EthProviderHelper(walletBook.getWalletBookWallet(this.walletBook, this.key));
-    }
     get metaMaskSDK() {
         if (!_metaMaskSDK)
             throw new Error('MetaMaskSDK not initialized');
@@ -114,7 +110,6 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
     getAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                var _a, _b, _c, _d;
                 // QR Code flow
                 if (!utils.isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
                     this.metaMaskSDKDisplayUriState
@@ -130,9 +125,9 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
                 }
                 // Deep link to MetaMask app in-app browser
                 if (this.shouldDeepLinkToMetaMaskInAppBrowser() &&
-                    ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser)) {
+                    this.metadata.inAppBrowserUrl) {
                     // Redirect to the in-app browser and append the current url
-                    window.location.href = `${(_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.inAppBrowser}/${window.location.href}`;
+                    window.location.href = `${this.metadata.inAppBrowserUrl}/${window.location.href}`;
                     resolve(undefined);
                     return;
                 }
@@ -248,12 +243,6 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
         }
         return rdns;
     }
-    isInstalledOnBrowser() {
-        var _a;
-        const metaMaskEip6963Provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.eip6963ProviderLookup(this.rdns);
-        const isInstalled = Boolean(metaMaskEip6963Provider);
-        return isInstalled;
-    }
     setupEventListeners() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.metaMaskSDK.sdkInitPromise;
@@ -355,15 +344,11 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
      * on a mobile device
      */
     getIsInAppBrowser() {
-        var _a, _b;
         if (!utils.isMobile())
             return false;
-        const provider = ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.eip6963ProviderLookup(this.rdns)) ||
-            ((_b = this.ethProviderHelper) === null || _b === void 0 ? void 0 : _b.getInjectedProvider());
-        return Boolean(provider);
+        return this.isInstalledOnBrowser();
     }
     shouldDeepLinkToMetaMaskInAppBrowser() {
-        var _a;
         // Not in an in-app browser
         if (this.isInAppBrowser)
             return false;
@@ -373,18 +358,11 @@ class MetaMaskConnector extends ethereumCore.EthereumWalletConnector {
         // SDK is configured to use the in-app browser
         if (this.mobileExperience !== 'in-app-browser')
             return false;
-        const isAppBrowserLinkPresent = ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) && this.wallet.mobile.inAppBrowser;
-        // Wallet has an in-app browser link
-        if (!isAppBrowserLinkPresent)
+        // Wallet does not have an in-app browser link
+        if (!this.metadata.inAppBrowserUrl)
             return false;
         return true;
     }
-    /**
-     * Get wallet book wallet information
-     */
-    get wallet() {
-        return walletBook.findWalletBookWallet(this.walletBook, this.key);
-    }
 }
 // Utils
 const getReadonlyRPCMap = (evmNetworkRpcMap) => Object.keys(evmNetworkRpcMap).reduce((acc, chainId) => (Object.assign(Object.assign({}, acc), { [viem.toHex(parseInt(chainId))]: evmNetworkRpcMap[chainId] })), {});

package/src/metaMask/MetaMaskConnector.d.ts

@@ -1,15 +1,15 @@
 import { MetaMaskSDK } from '@metamask/sdk';
 import { Account, Transport, WalletClient, Chain as ViemChain } from 'viem';
-import { EthereumWalletConnector, EthereumWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
+import { EthereumWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
 import { GetAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
-import { EthProviderHelper } from '../ethProviderHelper';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 import { MetaMaskSDKDisplayUriState } from './utils/createMetaMaskSDKDisplayUriState';
 export type MetaMaskConnectorProps = EthereumWalletConnectorOpts & {
     appName: string;
     appLogoUrl: string;
 };
 export declare const clearMetaMaskSdk: () => void;
-export declare class MetaMaskConnector extends EthereumWalletConnector implements IWalletConnectConnector {
+export declare class MetaMaskConnector extends InjectedWalletBase implements IWalletConnectConnector {
     name: string;
     overrideKey: string;
     canConnectViaQrCode: boolean;
@@ -18,7 +18,6 @@ export declare class MetaMaskConnector extends EthereumWalletConnector implement
     private isInAppBrowser;
     constructor(props: MetaMaskConnectorProps);
     getSupportedNetworks(): Promise<string[]>;
-    get ethProviderHelper(): EthProviderHelper | undefined;
     get metaMaskSDK(): MetaMaskSDK;
     set metaMaskSDK(metaMaskSDK: MetaMaskSDK);
     get metaMaskSDKDisplayUriState(): MetaMaskSDKDisplayUriState;
@@ -31,7 +30,6 @@ export declare class MetaMaskConnector extends EthereumWalletConnector implement
     chooseAccountsToConnect(): Promise<never[]>;
     getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
     get rdns(): string;
-    isInstalledOnBrowser(): boolean;
     setupEventListeners(): Promise<void>;
     /**
      * This override is necessary to wait for the MetaMask SDK to initialize
@@ -51,8 +49,4 @@ export declare class MetaMaskConnector extends EthereumWalletConnector implement
      */
     private getIsInAppBrowser;
     private shouldDeepLinkToMetaMaskInAppBrowser;
-    /**
-     * Get wallet book wallet information
-     */
-    private get wallet();
 }

package/src/metaMask/MetaMaskConnector.js

@@ -2,12 +2,11 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { MetaMaskSDK } from '@metamask/sdk';
 import { createWalletClient, custom, isHex, toHex } from 'viem';
-import { EthereumWalletConnector, getOrMapViemChain } from '@dynamic-labs/ethereum-core';
+import { getOrMapViemChain } from '@dynamic-labs/ethereum-core';
 import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { createEventTimeline, PlatformService, isMobile, retryableFn } from '@dynamic-labs/utils';
-import { getWalletBookWallet, findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { logger } from '../utils/logger.js';
-import { EthProviderHelper } from '../ethProviderHelper.js';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase.js';
 import { createMetaMaskSDKDisplayUriState } from './utils/createMetaMaskSDKDisplayUriState.js';
 import { waitForConnection } from './utils/waitForConnection.js';
 import { isPendingWalletRequestPermissionError } from './utils/isPendingWalletRequestPermissionError.js';
@@ -19,7 +18,7 @@ import { isPendingWalletRequestPermissionError } from './utils/isPendingWalletRe
 let _metaMaskSDK = null;
 let _metaMaskSDKDisplayUriState = null;
 const eventTimeline = createEventTimeline();
-class MetaMaskConnector extends EthereumWalletConnector {
+class MetaMaskConnector extends InjectedWalletBase {
     constructor(props) {
         super(props);
         this.name = 'MetaMask';
@@ -50,9 +49,6 @@ class MetaMaskConnector extends EthereumWalletConnector {
             return this.evmNetworks.map((network) => network.chainId.toString());
         });
     }
-    get ethProviderHelper() {
-        return new EthProviderHelper(getWalletBookWallet(this.walletBook, this.key));
-    }
     get metaMaskSDK() {
         if (!_metaMaskSDK)
             throw new Error('MetaMaskSDK not initialized');
@@ -110,7 +106,6 @@ class MetaMaskConnector extends EthereumWalletConnector {
     getAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                var _a, _b, _c, _d;
                 // QR Code flow
                 if (!isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
                     this.metaMaskSDKDisplayUriState
@@ -126,9 +121,9 @@ class MetaMaskConnector extends EthereumWalletConnector {
                 }
                 // Deep link to MetaMask app in-app browser
                 if (this.shouldDeepLinkToMetaMaskInAppBrowser() &&
-                    ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser)) {
+                    this.metadata.inAppBrowserUrl) {
                     // Redirect to the in-app browser and append the current url
-                    window.location.href = `${(_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.inAppBrowser}/${window.location.href}`;
+                    window.location.href = `${this.metadata.inAppBrowserUrl}/${window.location.href}`;
                     resolve(undefined);
                     return;
                 }
@@ -244,12 +239,6 @@ class MetaMaskConnector extends EthereumWalletConnector {
         }
         return rdns;
     }
-    isInstalledOnBrowser() {
-        var _a;
-        const metaMaskEip6963Provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.eip6963ProviderLookup(this.rdns);
-        const isInstalled = Boolean(metaMaskEip6963Provider);
-        return isInstalled;
-    }
     setupEventListeners() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.metaMaskSDK.sdkInitPromise;
@@ -351,15 +340,11 @@ class MetaMaskConnector extends EthereumWalletConnector {
      * on a mobile device
      */
     getIsInAppBrowser() {
-        var _a, _b;
         if (!isMobile())
             return false;
-        const provider = ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.eip6963ProviderLookup(this.rdns)) ||
-            ((_b = this.ethProviderHelper) === null || _b === void 0 ? void 0 : _b.getInjectedProvider());
-        return Boolean(provider);
+        return this.isInstalledOnBrowser();
     }
     shouldDeepLinkToMetaMaskInAppBrowser() {
-        var _a;
         // Not in an in-app browser
         if (this.isInAppBrowser)
             return false;
@@ -369,18 +354,11 @@ class MetaMaskConnector extends EthereumWalletConnector {
         // SDK is configured to use the in-app browser
         if (this.mobileExperience !== 'in-app-browser')
             return false;
-        const isAppBrowserLinkPresent = ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) && this.wallet.mobile.inAppBrowser;
-        // Wallet has an in-app browser link
-        if (!isAppBrowserLinkPresent)
+        // Wallet does not have an in-app browser link
+        if (!this.metadata.inAppBrowserUrl)
             return false;
         return true;
     }
-    /**
-     * Get wallet book wallet information
-     */
-    get wallet() {
-        return findWalletBookWallet(this.walletBook, this.key);
-    }
 }
 // Utils
 const getReadonlyRPCMap = (evmNetworkRpcMap) => Object.keys(evmNetworkRpcMap).reduce((acc, chainId) => (Object.assign(Object.assign({}, acc), { [toHex(parseInt(chainId))]: evmNetworkRpcMap[chainId] })), {});