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

package/CHANGELOG.md

@@ -1,4 +1,33 @@
 
+## [0.19.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.8...v0.19.0-alpha.9) (2023-09-21)
+
+
+### Features
+
+* allow enabling multi wallet in connect-only mode ([#3367](https://github.com/dynamic-labs/DynamicAuth/issues/3367)) ([8ef68a2](https://github.com/dynamic-labs/DynamicAuth/commit/8ef68a295738db5353fcddc54985744313a5474b))
+* move injected wallets configuration to the cdn ([#3077](https://github.com/dynamic-labs/DynamicAuth/issues/3077)) ([291183b](https://github.com/dynamic-labs/DynamicAuth/commit/291183b8daf124577d1049152a2556b6f2a85758))
+* passkey setup completed view ([#3358](https://github.com/dynamic-labs/DynamicAuth/issues/3358)) ([020faf6](https://github.com/dynamic-labs/DynamicAuth/commit/020faf63815e232c64ac8626f747b2997adbaa02))
+* **rohithv/gvty-326:** check if email is real before sending ([#3361](https://github.com/dynamic-labs/DynamicAuth/issues/3361)) ([db554f3](https://github.com/dynamic-labs/DynamicAuth/commit/db554f344707e3c3701012ecc09b67be2aaebba4))
+* safe guard wrong locale override keys ([#3329](https://github.com/dynamic-labs/DynamicAuth/issues/3329)) ([b2cf96b](https://github.com/dynamic-labs/DynamicAuth/commit/b2cf96b55fdd2705335ad942fe8e1c1109bf4134))
+* secure account with passkey view ([#3356](https://github.com/dynamic-labs/DynamicAuth/issues/3356)) ([9d58c44](https://github.com/dynamic-labs/DynamicAuth/commit/9d58c4472f1967ff5201bae6556c7d88a33d6276))
+
+
+### Bug Fixes
+
+* better handling of window opener to mitigate window opener for social linking ([#3379](https://github.com/dynamic-labs/DynamicAuth/issues/3379)) ([e784061](https://github.com/dynamic-labs/DynamicAuth/commit/e784061ab190d314976213e321516bbb256627e7))
+* change buttom copy when cannot link a wallet ([#3364](https://github.com/dynamic-labs/DynamicAuth/issues/3364)) ([5428a60](https://github.com/dynamic-labs/DynamicAuth/commit/5428a60abcbbd9c47e9227a53610ee5975bac379))
+* **DynamicWidget:** goToInitialView when closing send balance ([#3333](https://github.com/dynamic-labs/DynamicAuth/issues/3333)) ([7ea40ec](https://github.com/dynamic-labs/DynamicAuth/commit/7ea40ec3827c40e3340e5ecfa2153e59c05a79f1))
+* **EmailMagicWalletConnector:** to only cancel the verification if user clicks back ([#3374](https://github.com/dynamic-labs/DynamicAuth/issues/3374)) ([1111a18](https://github.com/dynamic-labs/DynamicAuth/commit/1111a186b7b84066e89d385c0bd9c064d0326eae))
+* **embedded-wallet:** display sign typed data message ([#3316](https://github.com/dynamic-labs/DynamicAuth/issues/3316)) ([0014c8b](https://github.com/dynamic-labs/DynamicAuth/commit/0014c8b4250cf9db92b554f02b4e46f3aba2d943))
+* missing translation keys ([#3325](https://github.com/dynamic-labs/DynamicAuth/issues/3325)) ([0e7c383](https://github.com/dynamic-labs/DynamicAuth/commit/0e7c3838a0eb8b49298e59b2919e16994a2d6b19))
+* only set scope/prompt in oauth query params when they're defined ([#3324](https://github.com/dynamic-labs/DynamicAuth/issues/3324)) ([9e8aa2d](https://github.com/dynamic-labs/DynamicAuth/commit/9e8aa2d186fff563607dc836017b918af79718ce))
+* pass the network param on wallet transfers ([#3307](https://github.com/dynamic-labs/DynamicAuth/issues/3307)) ([faf89fd](https://github.com/dynamic-labs/DynamicAuth/commit/faf89fdbfa690a87ae91d7f09c3647b4160b53ad))
+* send primaryWalletId when available to unlinkOauth ([#3342](https://github.com/dynamic-labs/DynamicAuth/issues/3342)) ([0da0ae2](https://github.com/dynamic-labs/DynamicAuth/commit/0da0ae23040f7683000223109446a516c6d7b212))
+* twitter sign-in with dynamic ([#3313](https://github.com/dynamic-labs/DynamicAuth/issues/3313)) ([c77dae4](https://github.com/dynamic-labs/DynamicAuth/commit/c77dae41dbdc02c84f3d3f5f3338136efd5766f9))
+* use social profile photo for profile icon whenever available ([#3298](https://github.com/dynamic-labs/DynamicAuth/issues/3298)) ([143303b](https://github.com/dynamic-labs/DynamicAuth/commit/143303ba5e24d16aaa362f1888e3942bdef59602))
+* wallet transition in the bridge ([#3270](https://github.com/dynamic-labs/DynamicAuth/issues/3270)) ([143cf47](https://github.com/dynamic-labs/DynamicAuth/commit/143cf47e0cd4806780f5b3f527ace2d6c0208534)), closes [#3268](https://github.com/dynamic-labs/DynamicAuth/issues/3268) [#3243](https://github.com/dynamic-labs/DynamicAuth/issues/3243)
+* **wallet-connect:** prevent connector from connecting after logout ([#3345](https://github.com/dynamic-labs/DynamicAuth/issues/3345)) ([9bada77](https://github.com/dynamic-labs/DynamicAuth/commit/9bada7775c5ac7a4fdb5ad8d4d21691335e06936))
+
 ## [0.19.0-alpha.8](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.7...v0.19.0-alpha.8) (2023-09-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "0.19.0-alpha.8",
+  "version": "0.19.0-alpha.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -26,18 +26,18 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "@ethersproject/providers": "5.7.2",
     "@walletconnect/client": "1.8.0",
     "@walletconnect/ethereum-provider": "1.8.0",
     "@walletconnect/universal-provider": "2.8.3",
+    "buffer": "6.0.3",
     "ethers": "5.7.2",
     "eventemitter3": "5.0.1",
-    "buffer": "6.0.3",
-    "@dynamic-labs/rpc-providers": "0.19.0-alpha.8",
-    "@dynamic-labs/types": "0.19.0-alpha.8",
-    "@dynamic-labs/utils": "0.19.0-alpha.8",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.8",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.8",
-    "@ethersproject/providers": "5.7.2"
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.9",
+    "@dynamic-labs/types": "0.19.0-alpha.9",
+    "@dynamic-labs/utils": "0.19.0-alpha.9",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.9",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.9"
   },
   "peerDependencies": {}
 }

package/src/ethProviderHelper.cjs

@@ -5,74 +5,83 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 var ethers = require('ethers');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var isUnsupportedProviderError = require('./utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
+var eventListenerHandlers = require('./utils/eventListenerHandlers.cjs');
 
-var _a;
 class EthProviderHelper {
-    static installedProviderLookup(providerFlags) {
-        const allInstalledProviders = this.allInstalledProviders();
-        return walletConnectorCore.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 = utils.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 walletConnectorCore.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)[walletConnectorCore.normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
-            return provider === undefined
+            return windowReference === undefined
                 ? undefined
-                : new ethers.ethers.providers.Web3Provider(provider, 'any'); // https://github.com/ethers-io/ethers.js/discussions/1480
+                : new ethers.ethers.providers.Web3Provider(windowReference, 'any'); // https://github.com/ethers-io/ethers.js/discussions/1480
         }
         catch (err) {
             if (isUnsupportedProviderError.isUnsupportedProviderError(err)) {
                 walletConnectorCore.logger.error(`ETH Provider is not supported ${err.value}`, err);
                 return;
             }
-            walletConnectorCore.logger.error(`Could not find provider for ${walletName}`, err);
+            walletConnectorCore.logger.error(`Could not find provider for ${this.wallet.name}`, err);
             return undefined;
         }
     }
-    static fetchPublicAddressWithName(name) {
+    fetchPublicAddress() {
         return _tslib.__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 _tslib.__awaiter(this, void 0, void 0, function* () {
             try {
                 const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
@@ -85,13 +94,13 @@ class EthProviderHelper {
             }
         });
     }
-    static signMessageWithName(messageToSign, name) {
+    signMessage(messageToSign) {
         return _tslib.__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);
             }
@@ -100,37 +109,13 @@ class EthProviderHelper {
             return signedMessage;
         });
     }
-    static _setupEventListeners(name, walletConnector, web3Provider) {
-        if (!web3Provider) {
-            return {
-                tearDownEventListeners: () => { },
-            };
-        }
+    _setupEventListeners(walletConnector, web3Provider) {
         const externalProvider = web3Provider.provider;
-        const handleAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (accounts.length === 0) {
-                walletConnector.emit('disconnect');
-                return;
-            }
-            walletConnector.emit('accountChange', { accounts });
-        });
-        const handleChainChange = () => _tslib.__awaiter(this, void 0, void 0, function* () {
-            const network = yield web3Provider.getNetwork();
-            walletConnector.emit('chainChange', {
-                chain: network.chainId.toString(),
-            });
-        });
-        const handleDisconnect = (error) => _tslib.__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.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;
             }
@@ -149,69 +134,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,
-};
+}
 
 exports.EthProviderHelper = EthProviderHelper;

package/src/ethProviderHelper.d.ts

@@ -1,36 +1,27 @@
 import { ethers } from 'ethers';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ProviderFlag } from './types';
-type Provider = () => ethers.providers.ExternalProvider | undefined;
 export declare class EthProviderHelper {
-    static MetamaskProvider: Provider;
-    static BraveProvider: Provider;
-    static DawnProvider: Provider;
-    static FrameProvider: Provider;
-    static CoinbaseProvider: Provider;
-    static OperaProvider: Provider;
-    static GameStopProvider: Provider;
-    static ExodusProvider: Provider;
-    static BloctoProvider: Provider;
-    static TrustWalletProvider: Provider;
-    static PhantomProvider: Provider;
-    static ZerionProvider: Provider;
-    static SuperbProvider: Provider;
-    static RabbyProvider: Provider;
-    static OKXProvider: Provider;
-    static UnknownInjectedProvider: Provider;
-    static providers: {
-        [wallet: string]: Provider;
-    };
-    static installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): IEthereum | undefined;
-    static allInstalledProviders(): IEthereum[];
-    static isInstalledHelper(walletName: string): boolean;
-    static findProvider(walletName: string): ethers.providers.Web3Provider | undefined;
-    static fetchPublicAddressWithName(name: string): Promise<string | undefined>;
-    static fetchPublicAddressWithProvider(provider: ethers.providers.Web3Provider): Promise<string | undefined>;
-    static signMessageWithName(messageToSign: string, name: string): Promise<string | undefined>;
-    static _setupEventListeners(name: string, walletConnector: WalletConnector, web3Provider?: ethers.providers.Web3Provider): {
+    private wallet;
+    constructor(wallet: WalletSchema);
+    getInstalledProvider(): IEthereum | undefined;
+    getInjectedConfig(): {
+        chain: string;
+        extensionLocators: {
+            value: boolean;
+            flag: string;
+        }[];
+        windowLocations?: string[] | undefined;
+    } | undefined;
+    installedProviders(): IEthereum[];
+    installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): IEthereum | undefined;
+    isInstalledHelper(): boolean;
+    findProvider(): ethers.providers.Web3Provider | undefined;
+    fetchPublicAddress(): Promise<string | undefined>;
+    fetchPublicAddressWithProvider(provider: ethers.providers.Web3Provider): Promise<string | undefined>;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    _setupEventListeners(walletConnector: WalletConnector, web3Provider: ethers.providers.Web3Provider): {
         tearDownEventListeners: () => void;
     };
 }
-export {};

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 };