@dynamic-labs/ethereum 0.19.0-alpha.7 → 0.19.0-alpha.9

package/src/ethProviderHelper.js

@@ -1,74 +1,83 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { ethers, utils } from 'ethers';
-import { ProviderLookup, normalizeWalletName, logger } from '@dynamic-labs/wallet-connector-core';
+import { ProviderLookup, logger } from '@dynamic-labs/wallet-connector-core';
+import { getPathFromObject } from '@dynamic-labs/utils';
 import { isUnsupportedProviderError } from './utils/isUnsupportedProviderError/isUnsupportedProviderError.js';
+import { eventListenerHandlers } from './utils/eventListenerHandlers.js';
 
-var _a;
 class EthProviderHelper {
-    static installedProviderLookup(providerFlags) {
-        const allInstalledProviders = this.allInstalledProviders();
-        return ProviderLookup(allInstalledProviders, providerFlags);
+    constructor(wallet) {
+        this.wallet = wallet;
+    }
+    getInstalledProvider() {
+        const config = this.getInjectedConfig();
+        if (!config ||
+            !config.extensionLocators ||
+            !config.extensionLocators.length)
+            return undefined;
+        return this.installedProviderLookup(config.extensionLocators);
     }
-    static allInstalledProviders() {
-        var _b;
-        const ethereumProviders = [];
+    getInjectedConfig() {
+        if (!this.wallet || !this.wallet.injectedConfig)
+            return;
+        const { injectedConfig } = this.wallet;
+        return injectedConfig.find((c) => c.chain === 'evm');
+    }
+    installedProviders() {
+        const config = this.getInjectedConfig();
+        if (!config)
+            return [];
+        const providers = [];
+        if (config.windowLocations) {
+            for (const windowLocation of config.windowLocations) {
+                const foundProviders = getPathFromObject(window, windowLocation);
+                if (foundProviders && foundProviders.length)
+                    providers.push(...foundProviders);
+            }
+        }
         if (window.ethereum) {
-            if (!window.ethereum.providers) {
-                ethereumProviders.push(window.ethereum);
+            if (!window.ethereum.providers || !window.ethereum.providers.length) {
+                providers.push(window.ethereum);
             }
             else {
-                window.ethereum.providers.forEach((provider) => {
-                    ethereumProviders.push(provider);
-                });
+                window.ethereum.providers.forEach((p) => providers.push(p));
             }
         }
-        if ((_b = window.phantom) === null || _b === void 0 ? void 0 : _b.ethereum) {
-            ethereumProviders.push(window.phantom.ethereum);
-        }
-        if (window.zerionWallet) {
-            ethereumProviders.push(window.zerionWallet);
-        }
-        if (window.coinbaseWalletExtension) {
-            ethereumProviders.push(window.coinbaseWalletExtension);
-        }
-        if (window.superb) {
-            ethereumProviders.push(window.superb);
-        }
-        if (window.okxwallet) {
-            ethereumProviders.push(window.okxwallet);
-        }
-        return ethereumProviders;
+        return providers;
     }
-    static isInstalledHelper(walletName) {
-        return this.findProvider(walletName) !== undefined;
+    installedProviderLookup(providerFlags) {
+        const allInstalledProviders = this.installedProviders();
+        return ProviderLookup(allInstalledProviders, providerFlags);
+    }
+    isInstalledHelper() {
+        return this.findProvider() !== undefined;
     }
-    static findProvider(walletName) {
-        var _b, _c;
+    findProvider() {
+        const windowReference = this.getInstalledProvider();
         try {
-            const provider = (_c = (_b = this.providers)[normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
-            return provider === undefined
+            return windowReference === undefined
                 ? undefined
-                : new ethers.providers.Web3Provider(provider, 'any'); // https://github.com/ethers-io/ethers.js/discussions/1480
+                : new ethers.providers.Web3Provider(windowReference, 'any'); // https://github.com/ethers-io/ethers.js/discussions/1480
         }
         catch (err) {
             if (isUnsupportedProviderError(err)) {
                 logger.error(`ETH Provider is not supported ${err.value}`, err);
                 return;
             }
-            logger.error(`Could not find provider for ${walletName}`, err);
+            logger.error(`Could not find provider for ${this.wallet.name}`, err);
             return undefined;
         }
     }
-    static fetchPublicAddressWithName(name) {
+    fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider(name);
+            const provider = this.findProvider();
             if (!provider) {
                 return Promise.resolve(undefined);
             }
             return this.fetchPublicAddressWithProvider(provider);
         });
     }
-    static fetchPublicAddressWithProvider(provider) {
+    fetchPublicAddressWithProvider(provider) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
@@ -81,13 +90,13 @@ class EthProviderHelper {
             }
         });
     }
-    static signMessageWithName(messageToSign, name) {
+    signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddressWithName(name);
+            const walletAddress = yield this.fetchPublicAddress();
             if (!walletAddress) {
                 return Promise.resolve(undefined);
             }
-            const provider = this.findProvider(name);
+            const provider = this.findProvider();
             if (!provider) {
                 return Promise.resolve(undefined);
             }
@@ -96,37 +105,13 @@ class EthProviderHelper {
             return signedMessage;
         });
     }
-    static _setupEventListeners(name, walletConnector, web3Provider) {
-        if (!web3Provider) {
-            return {
-                tearDownEventListeners: () => { },
-            };
-        }
+    _setupEventListeners(walletConnector, web3Provider) {
         const externalProvider = web3Provider.provider;
-        const handleAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
-            if (accounts.length === 0) {
-                walletConnector.emit('disconnect');
-                return;
-            }
-            walletConnector.emit('accountChange', { accounts });
-        });
-        const handleChainChange = () => __awaiter(this, void 0, void 0, function* () {
-            const network = yield web3Provider.getNetwork();
-            walletConnector.emit('chainChange', {
-                chain: network.chainId.toString(),
-            });
-        });
-        const handleDisconnect = (error) => __awaiter(this, void 0, void 0, function* () {
-            if ((error === null || error === void 0 ? void 0 : error.code) === 1013) {
-                return;
-            }
-            walletConnector.emit('disconnect');
-        });
+        const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(walletConnector, web3Provider);
         externalProvider.on('accountsChanged', handleAccountChange);
         externalProvider.on('chainChanged', handleChainChange);
         externalProvider.on('disconnect', handleDisconnect);
         const tearDownEventListeners = () => {
-            const web3Provider = this.findProvider(name);
             if (!web3Provider || !(web3Provider === null || web3Provider === void 0 ? void 0 : web3Provider.provider)) {
                 return;
             }
@@ -145,69 +130,6 @@ class EthProviderHelper {
             tearDownEventListeners,
         };
     }
-}
-_a = EthProviderHelper;
-EthProviderHelper.MetamaskProvider = () => 
-// Stop these wallets from showing up as MetaMask
-_a.installedProviderLookup([
-    { flag: 'isDawn', value: false },
-    { flag: 'isBraveWallet', value: false },
-    { flag: 'isTrustWallet', value: false },
-    { flag: 'isExodus', value: false },
-    { flag: 'isPhantom', value: false },
-    { flag: 'isZerion', value: false },
-    { flag: 'isMetaMask', value: true },
-    { flag: 'isSuperb', value: false },
-    { flag: 'isRabby', value: false },
-    { flag: 'isOkxWallet', value: false },
-]);
-EthProviderHelper.BraveProvider = () => _a.installedProviderLookup([{ flag: 'isBraveWallet', value: true }]);
-EthProviderHelper.DawnProvider = () => _a.installedProviderLookup([{ flag: 'isDawn', value: true }]);
-EthProviderHelper.FrameProvider = () => _a.installedProviderLookup([{ flag: 'isFrame', value: true }]);
-EthProviderHelper.CoinbaseProvider = () => _a.installedProviderLookup([{ flag: 'isCoinbaseWallet', value: true }]);
-EthProviderHelper.OperaProvider = () => _a.installedProviderLookup([{ flag: 'isOpera', value: true }]);
-EthProviderHelper.GameStopProvider = () => _a.installedProviderLookup([{ flag: 'isGamestop', value: true }]);
-EthProviderHelper.ExodusProvider = () => _a.installedProviderLookup([{ flag: 'isExodus', value: true }]);
-EthProviderHelper.BloctoProvider = () => _a.installedProviderLookup([{ flag: 'isBlocto', value: true }]);
-EthProviderHelper.TrustWalletProvider = () => _a.installedProviderLookup([{ flag: 'isTrustWallet', value: true }]);
-EthProviderHelper.PhantomProvider = () => _a.installedProviderLookup([{ flag: 'isPhantom', value: true }]);
-EthProviderHelper.ZerionProvider = () => _a.installedProviderLookup([{ flag: 'isZerion', value: true }]);
-EthProviderHelper.SuperbProvider = () => _a.installedProviderLookup([{ flag: 'isSuperb', value: true }]);
-EthProviderHelper.RabbyProvider = () => _a.installedProviderLookup([{ flag: 'isRabby', value: true }]);
-EthProviderHelper.OKXProvider = () => _a.installedProviderLookup([{ flag: 'isOkxWallet', value: true }]);
-EthProviderHelper.UnknownInjectedProvider = () => _a.installedProviderLookup([
-    { flag: 'isMetaMask', value: false },
-    { flag: 'isExodus', value: false },
-    { flag: 'isCoinbaseWallet', value: false },
-    { flag: 'isBraveWallet', value: false },
-    { flag: 'isGamestop', value: false },
-    { flag: 'isFrame', value: false },
-    { flag: 'isOpera', value: false },
-    { flag: 'isBlocto', value: false },
-    { flag: 'isTrustWallet', value: false },
-    { flag: 'isPhantom', value: false },
-    { flag: 'isZerion', value: false },
-    { flag: 'isSuperb', value: false },
-    { flag: 'isRabby', value: false },
-    { flag: 'isOkxWallet', value: false },
-]);
-EthProviderHelper.providers = {
-    bloctoinjected: _a.BloctoProvider,
-    braveevm: _a.BraveProvider,
-    coinbase: _a.CoinbaseProvider,
-    dawn: _a.DawnProvider,
-    exodusevm: _a.ExodusProvider,
-    frame: _a.FrameProvider,
-    gamestop: _a.GameStopProvider,
-    injectedwallet: _a.UnknownInjectedProvider,
-    metamask: _a.MetamaskProvider,
-    okxwallet: _a.OKXProvider,
-    opera: _a.OperaProvider,
-    phantomevm: _a.PhantomProvider,
-    rabby: _a.RabbyProvider,
-    superb: _a.SuperbProvider,
-    trust: _a.TrustWalletProvider,
-    zerion: _a.ZerionProvider,
-};
+}
 
 export { EthProviderHelper };

package/src/index.cjs

@@ -3,18 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
-var index = require('./injected/index.cjs');
-require('./walletConnect/walletConnectV2.cjs');
-require('@walletconnect/ethereum-provider');
-require('ethers');
-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');
-var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
-var ethProviderHelper = require('./ethProviderHelper.cjs');
 var BloctoInjected = require('./injected/BloctoInjected.cjs');
 var BraveEvm = require('./injected/BraveEvm.cjs');
 var Dawn = require('./injected/Dawn.cjs');
@@ -25,21 +13,30 @@ var MetaMask = require('./injected/MetaMask.cjs');
 var Opera = require('./injected/Opera.cjs');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var Trust = require('./injected/Trust.cjs');
-var UnknownInjectedWallet = require('./injected/UnknownInjectedWallet.cjs');
 var Zerion = require('./injected/Zerion.cjs');
 var Rabby = require('./injected/Rabby.cjs');
-var OKX = require('./injected/OKX.cjs');
+var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
+var legacyInjectedWallets = require('./injected/legacyInjectedWallets.cjs');
+require('./walletConnect/walletConnectV2.cjs');
+require('@walletconnect/ethereum-provider');
+require('ethers');
+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');
+var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
+var ethProviderHelper = require('./ethProviderHelper.cjs');
+var legacyEthProviderHelper = require('./legacyEthProviderHelper.cjs');
 
 const EthereumWalletConnectors = (props) => [
-    ...index.injectedWallets,
+    ...legacyInjectedWallets.legacyInjectedWallets,
+    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
     fetchWalletConnectWallets.getWalletConnectConnector(props),
 ];
 
-exports.injectedWallets = index.injectedWallets;
-exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
-exports.INFURA_ID = constants.INFURA_ID;
-exports.EthProviderHelper = ethProviderHelper.EthProviderHelper;
 exports.BloctoInjected = BloctoInjected.BloctoInjected;
 exports.BraveEvm = BraveEvm.BraveEvm;
 exports.Dawn = Dawn.Dawn;
@@ -50,8 +47,13 @@ exports.MetaMask = MetaMask.MetaMask;
 exports.Opera = Opera.Opera;
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
 exports.Trust = Trust.Trust;
-exports.UnknownInjectedWallet = UnknownInjectedWallet.UnknownInjectedWallet;
 exports.Zerion = Zerion.Zerion;
 exports.Rabby = Rabby.Rabby;
-exports.OKX = OKX.OKX;
+exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
+exports.filteredLegacyInjectedWalletKeys = legacyInjectedWallets.filteredLegacyInjectedWalletKeys;
+exports.legacyInjectedWallets = legacyInjectedWallets.legacyInjectedWallets;
+exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
+exports.INFURA_ID = constants.INFURA_ID;
+exports.EthProviderHelper = ethProviderHelper.EthProviderHelper;
+exports.LegacyEthProviderHelper = legacyEthProviderHelper.LegacyEthProviderHelper;
 exports.EthereumWalletConnectors = EthereumWalletConnectors;

package/src/index.d.ts

@@ -3,6 +3,7 @@ import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core'
 export * from './injected';
 export * from './EthWalletConnector';
 export * from './ethProviderHelper';
+export * from './legacyEthProviderHelper';
 export * from './constants';
 export * from './types';
 export declare const EthereumWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

@@ -1,17 +1,4 @@
 import './polyfills.js';
-import { injectedWallets } from './injected/index.js';
-export { injectedWallets } from './injected/index.js';
-import './walletConnect/walletConnectV2.js';
-import '@walletconnect/ethereum-provider';
-import 'ethers';
-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 { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
-export { EthProviderHelper } from './ethProviderHelper.js';
 export { BloctoInjected } from './injected/BloctoInjected.js';
 export { BraveEvm } from './injected/BraveEvm.js';
 export { Dawn } from './injected/Dawn.js';
@@ -22,13 +9,28 @@ export { MetaMask } from './injected/MetaMask.js';
 export { Opera } from './injected/Opera.js';
 export { PhantomEvm } from './injected/PhantomEvm.js';
 export { Trust } from './injected/Trust.js';
-export { UnknownInjectedWallet } from './injected/UnknownInjectedWallet.js';
 export { Zerion } from './injected/Zerion.js';
 export { Rabby } from './injected/Rabby.js';
-export { OKX } from './injected/OKX.js';
+import { fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
+export { fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
+import { legacyInjectedWallets } from './injected/legacyInjectedWallets.js';
+export { filteredLegacyInjectedWalletKeys, legacyInjectedWallets } from './injected/legacyInjectedWallets.js';
+import './walletConnect/walletConnectV2.js';
+import '@walletconnect/ethereum-provider';
+import 'ethers';
+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 { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
+export { EthProviderHelper } from './ethProviderHelper.js';
+export { LegacyEthProviderHelper } from './legacyEthProviderHelper.js';
 
 const EthereumWalletConnectors = (props) => [
-    ...injectedWallets,
+    ...legacyInjectedWallets,
+    ...fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets(props),
     getWalletConnectConnector(props),
 ];

package/src/injected/BloctoInjected.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class BloctoInjected extends InjectedWalletBase {
+class BloctoInjected extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'bloctoInjected';

package/src/injected/BloctoInjected.d.ts

@@ -1,4 +1,4 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class BloctoInjected extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class BloctoInjected extends LegacyInjectedWalletBase {
     name: string;
 }

package/src/injected/BloctoInjected.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class BloctoInjected extends InjectedWalletBase {
+class BloctoInjected extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'bloctoInjected';

package/src/injected/BraveEvm.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class BraveEvm extends InjectedWalletBase {
+class BraveEvm extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'BraveEvm';

package/src/injected/BraveEvm.d.ts

@@ -1,4 +1,4 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class BraveEvm extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class BraveEvm extends LegacyInjectedWalletBase {
     name: string;
 }

package/src/injected/BraveEvm.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class BraveEvm extends InjectedWalletBase {
+class BraveEvm extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'BraveEvm';

package/src/injected/Dawn.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class Dawn extends InjectedWalletBase {
+class Dawn extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Dawn';

package/src/injected/Dawn.d.ts

@@ -1,4 +1,4 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class Dawn extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class Dawn extends LegacyInjectedWalletBase {
     name: string;
 }

package/src/injected/Dawn.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class Dawn extends InjectedWalletBase {
+class Dawn extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Dawn';

package/src/injected/ExodusEvm.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class ExodusEvm extends InjectedWalletBase {
+class ExodusEvm extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'ExodusEvm';

package/src/injected/ExodusEvm.d.ts

@@ -1,5 +1,5 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class ExodusEvm extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class ExodusEvm extends LegacyInjectedWalletBase {
     name: string;
     walletConnectorFallback: boolean;
 }

package/src/injected/ExodusEvm.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class ExodusEvm extends InjectedWalletBase {
+class ExodusEvm extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'ExodusEvm';

package/src/injected/Frame.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class Frame extends InjectedWalletBase {
+class Frame extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Frame';

package/src/injected/Frame.d.ts

@@ -1,4 +1,4 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class Frame extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class Frame extends LegacyInjectedWalletBase {
     name: string;
 }

package/src/injected/Frame.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class Frame extends InjectedWalletBase {
+class Frame extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'Frame';

package/src/injected/GameStop.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
 
-class GameStop extends InjectedWalletBase {
+class GameStop extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'GameStop';

package/src/injected/GameStop.d.ts

@@ -1,4 +1,4 @@
-import InjectedWalletBase from './InjectedWalletBase';
-export declare class GameStop extends InjectedWalletBase {
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
+export declare class GameStop extends LegacyInjectedWalletBase {
     name: string;
 }

package/src/injected/GameStop.js

@@ -1,6 +1,6 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
+import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
 
-class GameStop extends InjectedWalletBase {
+class GameStop extends LegacyInjectedWalletBase {
     constructor() {
         super(...arguments);
         this.name = 'GameStop';

package/src/injected/InjectedWalletBase.cjs

@@ -14,12 +14,22 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         this.connectedChain = 'EVM';
         this.walletConnectorFallback = false;
     }
+    getEthProviderHelper() {
+        if (!this.wallet) {
+            this.wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
+        }
+        if (!this.ethProviderHelper) {
+            this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(this.wallet);
+        }
+        return this.ethProviderHelper;
+    }
     getMobileOrInstalledWallet() {
         var _a, _b, _c;
         if (this.walletConnectorFallback && !this.isInstalledOnBrowser()) {
-            const wallet = walletBook.getWalletBookWallet(this.walletBook, this.name);
+            if (!this.wallet)
+                this.wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
             if (((_a = this.constructorProps) === null || _a === void 0 ? void 0 : _a.isWalletConnectV2Enabled) &&
-                ((_c = (_b = wallet.walletConnect) === null || _b === void 0 ? void 0 : _b.sdks) === null || _c === void 0 ? void 0 : _c.includes('sign_v2'))) {
+                ((_c = (_b = this.wallet.walletConnect) === null || _b === void 0 ? void 0 : _b.sdks) === null || _c === void 0 ? void 0 : _c.includes('sign_v2'))) {
                 return new walletConnectV2.WalletConnectV2(Object.assign(Object.assign({}, this.constructorProps), { walletName: this.name }));
             }
             else {
@@ -29,28 +39,31 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         return this;
     }
     setupEventListeners() {
-        const { tearDownEventListeners } = ethProviderHelper.EthProviderHelper._setupEventListeners(this.name, this, this.getWeb3Provider());
+        const provider = this.getWeb3Provider();
+        if (!provider)
+            return;
+        const { tearDownEventListeners } = this.getEthProviderHelper()._setupEventListeners(this, provider);
         this.teardownEventListeners = tearDownEventListeners;
     }
     getWeb3Provider() {
-        return ethProviderHelper.EthProviderHelper.findProvider(this.name);
+        return this.getEthProviderHelper().findProvider();
     }
     isInstalledOnBrowser() {
-        return ethProviderHelper.EthProviderHelper.isInstalledHelper(this.name);
+        return this.getEthProviderHelper().findProvider() !== undefined;
     }
-    connect() {
+    fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.fetchPublicAddress();
+            return this.getEthProviderHelper().fetchPublicAddress();
         });
     }
-    fetchPublicAddress() {
+    connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return ethProviderHelper.EthProviderHelper.fetchPublicAddressWithName(this.name);
+            yield this.fetchPublicAddress();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return ethProviderHelper.EthProviderHelper.signMessageWithName(messageToSign, this.name);
+            return this.getEthProviderHelper().signMessage(messageToSign);
         });
     }
     proveOwnership(messageToSign) {