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

package/src/legacyEthProviderHelper.cjs

@@ -0,0 +1,193 @@
+'use strict';
+
+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 isUnsupportedProviderError = require('./utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
+var eventListenerHandlers = require('./utils/eventListenerHandlers.cjs');
+
+var _a;
+class LegacyEthProviderHelper {
+    static installedProviderLookup(providerFlags) {
+        const allInstalledProviders = this.allInstalledProviders();
+        return walletConnectorCore.ProviderLookup(allInstalledProviders, providerFlags);
+    }
+    static allInstalledProviders() {
+        var _b;
+        const ethereumProviders = [];
+        if (window.ethereum) {
+            if (!window.ethereum.providers) {
+                ethereumProviders.push(window.ethereum);
+            }
+            else {
+                window.ethereum.providers.forEach((provider) => {
+                    ethereumProviders.push(provider);
+                });
+            }
+        }
+        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);
+        }
+        return ethereumProviders;
+    }
+    static isInstalledHelper(walletName) {
+        return this.findProvider(walletName) !== undefined;
+    }
+    static findProvider(walletName) {
+        var _b, _c;
+        try {
+            const provider = (_c = (_b = this.providers)[walletConnectorCore.normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
+            return provider === undefined
+                ? undefined
+                : new ethers.ethers.providers.Web3Provider(provider, '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);
+            return undefined;
+        }
+    }
+    static fetchPublicAddressWithName(name) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.findProvider(name);
+            if (!provider) {
+                return Promise.resolve(undefined);
+            }
+            return this.fetchPublicAddressWithProvider(provider);
+        });
+    }
+    static fetchPublicAddressWithProvider(provider) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
+                const publicAddress = ethers.utils.getAddress(lowercaseAddress);
+                return publicAddress;
+            }
+            catch (err) {
+                walletConnectorCore.logger.error(err);
+                return Promise.reject(err);
+            }
+        });
+    }
+    static signMessageWithName(messageToSign, name) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const walletAddress = yield this.fetchPublicAddressWithName(name);
+            if (!walletAddress) {
+                return Promise.resolve(undefined);
+            }
+            const provider = this.findProvider(name);
+            if (!provider) {
+                return Promise.resolve(undefined);
+            }
+            const signer = provider.getSigner();
+            const signedMessage = yield signer.signMessage(messageToSign);
+            return signedMessage;
+        });
+    }
+    static _setupEventListeners(name, walletConnector, web3Provider) {
+        if (!web3Provider) {
+            return {
+                tearDownEventListeners: () => { },
+            };
+        }
+        const externalProvider = web3Provider.provider;
+        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;
+            }
+            const externalProvider = web3Provider.provider;
+            if (handleAccountChange) {
+                externalProvider.removeListener('accountsChanged', handleAccountChange);
+            }
+            if (handleChainChange) {
+                externalProvider.removeListener('chainChanged', handleChainChange);
+            }
+            if (handleDisconnect) {
+                externalProvider.removeListener('disconnect', handleDisconnect);
+            }
+        };
+        return {
+            tearDownEventListeners,
+        };
+    }
+}
+_a = LegacyEthProviderHelper;
+LegacyEthProviderHelper.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 },
+]);
+LegacyEthProviderHelper.BraveProvider = () => _a.installedProviderLookup([{ flag: 'isBraveWallet', value: true }]);
+LegacyEthProviderHelper.DawnProvider = () => _a.installedProviderLookup([{ flag: 'isDawn', value: true }]);
+LegacyEthProviderHelper.FrameProvider = () => _a.installedProviderLookup([{ flag: 'isFrame', value: true }]);
+LegacyEthProviderHelper.CoinbaseProvider = () => _a.installedProviderLookup([{ flag: 'isCoinbaseWallet', value: true }]);
+LegacyEthProviderHelper.OperaProvider = () => _a.installedProviderLookup([{ flag: 'isOpera', value: true }]);
+LegacyEthProviderHelper.GameStopProvider = () => _a.installedProviderLookup([{ flag: 'isGamestop', value: true }]);
+LegacyEthProviderHelper.ExodusProvider = () => _a.installedProviderLookup([{ flag: 'isExodus', value: true }]);
+LegacyEthProviderHelper.BloctoProvider = () => _a.installedProviderLookup([{ flag: 'isBlocto', value: true }]);
+LegacyEthProviderHelper.TrustWalletProvider = () => _a.installedProviderLookup([{ flag: 'isTrustWallet', value: true }]);
+LegacyEthProviderHelper.PhantomProvider = () => _a.installedProviderLookup([{ flag: 'isPhantom', value: true }]);
+LegacyEthProviderHelper.ZerionProvider = () => _a.installedProviderLookup([{ flag: 'isZerion', value: true }]);
+LegacyEthProviderHelper.SuperbProvider = () => _a.installedProviderLookup([{ flag: 'isSuperb', value: true }]);
+LegacyEthProviderHelper.RabbyProvider = () => _a.installedProviderLookup([{ flag: 'isRabby', value: true }]);
+LegacyEthProviderHelper.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 },
+]);
+LegacyEthProviderHelper.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,
+    opera: _a.OperaProvider,
+    phantomevm: _a.PhantomProvider,
+    rabby: _a.RabbyProvider,
+    superb: _a.SuperbProvider,
+    trust: _a.TrustWalletProvider,
+    zerion: _a.ZerionProvider,
+};
+
+exports.LegacyEthProviderHelper = LegacyEthProviderHelper;

package/src/legacyEthProviderHelper.d.ts

@@ -0,0 +1,33 @@
+import { ethers } from 'ethers';
+import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { IEthereum, ProviderFlag, Provider } from './types';
+export declare class LegacyEthProviderHelper {
+    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 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): {
+        tearDownEventListeners: () => void;
+    };
+}

package/src/legacyEthProviderHelper.js

@@ -0,0 +1,189 @@
+import { __awaiter } from '../_virtual/_tslib.js';
+import { ethers, utils } from 'ethers';
+import { ProviderLookup, normalizeWalletName, logger } from '@dynamic-labs/wallet-connector-core';
+import { isUnsupportedProviderError } from './utils/isUnsupportedProviderError/isUnsupportedProviderError.js';
+import { eventListenerHandlers } from './utils/eventListenerHandlers.js';
+
+var _a;
+class LegacyEthProviderHelper {
+    static installedProviderLookup(providerFlags) {
+        const allInstalledProviders = this.allInstalledProviders();
+        return ProviderLookup(allInstalledProviders, providerFlags);
+    }
+    static allInstalledProviders() {
+        var _b;
+        const ethereumProviders = [];
+        if (window.ethereum) {
+            if (!window.ethereum.providers) {
+                ethereumProviders.push(window.ethereum);
+            }
+            else {
+                window.ethereum.providers.forEach((provider) => {
+                    ethereumProviders.push(provider);
+                });
+            }
+        }
+        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);
+        }
+        return ethereumProviders;
+    }
+    static isInstalledHelper(walletName) {
+        return this.findProvider(walletName) !== undefined;
+    }
+    static findProvider(walletName) {
+        var _b, _c;
+        try {
+            const provider = (_c = (_b = this.providers)[normalizeWalletName(walletName)]) === null || _c === void 0 ? void 0 : _c.call(_b);
+            return provider === undefined
+                ? undefined
+                : new ethers.providers.Web3Provider(provider, '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);
+            return undefined;
+        }
+    }
+    static fetchPublicAddressWithName(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.findProvider(name);
+            if (!provider) {
+                return Promise.resolve(undefined);
+            }
+            return this.fetchPublicAddressWithProvider(provider);
+        });
+    }
+    static fetchPublicAddressWithProvider(provider) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const [lowercaseAddress] = yield provider.send('eth_requestAccounts', []);
+                const publicAddress = utils.getAddress(lowercaseAddress);
+                return publicAddress;
+            }
+            catch (err) {
+                logger.error(err);
+                return Promise.reject(err);
+            }
+        });
+    }
+    static signMessageWithName(messageToSign, name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletAddress = yield this.fetchPublicAddressWithName(name);
+            if (!walletAddress) {
+                return Promise.resolve(undefined);
+            }
+            const provider = this.findProvider(name);
+            if (!provider) {
+                return Promise.resolve(undefined);
+            }
+            const signer = provider.getSigner();
+            const signedMessage = yield signer.signMessage(messageToSign);
+            return signedMessage;
+        });
+    }
+    static _setupEventListeners(name, walletConnector, web3Provider) {
+        if (!web3Provider) {
+            return {
+                tearDownEventListeners: () => { },
+            };
+        }
+        const externalProvider = web3Provider.provider;
+        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;
+            }
+            const externalProvider = web3Provider.provider;
+            if (handleAccountChange) {
+                externalProvider.removeListener('accountsChanged', handleAccountChange);
+            }
+            if (handleChainChange) {
+                externalProvider.removeListener('chainChanged', handleChainChange);
+            }
+            if (handleDisconnect) {
+                externalProvider.removeListener('disconnect', handleDisconnect);
+            }
+        };
+        return {
+            tearDownEventListeners,
+        };
+    }
+}
+_a = LegacyEthProviderHelper;
+LegacyEthProviderHelper.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 },
+]);
+LegacyEthProviderHelper.BraveProvider = () => _a.installedProviderLookup([{ flag: 'isBraveWallet', value: true }]);
+LegacyEthProviderHelper.DawnProvider = () => _a.installedProviderLookup([{ flag: 'isDawn', value: true }]);
+LegacyEthProviderHelper.FrameProvider = () => _a.installedProviderLookup([{ flag: 'isFrame', value: true }]);
+LegacyEthProviderHelper.CoinbaseProvider = () => _a.installedProviderLookup([{ flag: 'isCoinbaseWallet', value: true }]);
+LegacyEthProviderHelper.OperaProvider = () => _a.installedProviderLookup([{ flag: 'isOpera', value: true }]);
+LegacyEthProviderHelper.GameStopProvider = () => _a.installedProviderLookup([{ flag: 'isGamestop', value: true }]);
+LegacyEthProviderHelper.ExodusProvider = () => _a.installedProviderLookup([{ flag: 'isExodus', value: true }]);
+LegacyEthProviderHelper.BloctoProvider = () => _a.installedProviderLookup([{ flag: 'isBlocto', value: true }]);
+LegacyEthProviderHelper.TrustWalletProvider = () => _a.installedProviderLookup([{ flag: 'isTrustWallet', value: true }]);
+LegacyEthProviderHelper.PhantomProvider = () => _a.installedProviderLookup([{ flag: 'isPhantom', value: true }]);
+LegacyEthProviderHelper.ZerionProvider = () => _a.installedProviderLookup([{ flag: 'isZerion', value: true }]);
+LegacyEthProviderHelper.SuperbProvider = () => _a.installedProviderLookup([{ flag: 'isSuperb', value: true }]);
+LegacyEthProviderHelper.RabbyProvider = () => _a.installedProviderLookup([{ flag: 'isRabby', value: true }]);
+LegacyEthProviderHelper.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 },
+]);
+LegacyEthProviderHelper.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,
+    opera: _a.OperaProvider,
+    phantomevm: _a.PhantomProvider,
+    rabby: _a.RabbyProvider,
+    superb: _a.SuperbProvider,
+    trust: _a.TrustWalletProvider,
+    zerion: _a.ZerionProvider,
+};
+
+export { LegacyEthProviderHelper };

package/src/types.d.ts

@@ -1,3 +1,4 @@
+import { ethers } from 'ethers';
 import { ProviderCondition } from '@dynamic-labs/wallet-connector-core';
 declare global {
     interface IWindowPhantom {
@@ -22,3 +23,13 @@ export type IEthereum = {
 };
 export type ProviderFlag = 'isDawn' | 'isBraveWallet' | 'isCoinbaseWallet' | 'isFrame' | 'isGamestop' | 'isMetaMask' | 'isExodus' | 'isOpera' | 'isBlocto' | 'isTrustWallet' | 'isZerion' | 'isPhantom' | 'isSuperb' | 'isRabby' | 'isOkxWallet';
 export type EthProviderCondition = ProviderCondition<ProviderFlag>;
+export type Provider = () => ethers.providers.ExternalProvider | undefined;
+export type AccountChangeEventHandler = (accounts: string[]) => Promise<void>;
+export type ChainChangeEventHandler = (chainId: string | number) => Promise<void>;
+export type DisconnectEventHandler = (error?: {
+    code: number;
+}) => Promise<void>;
+export type ExternalProviderEventEmitter = ethers.providers.ExternalProvider & {
+    on: (event: string, listener: (...args: Array<any>) => unknown) => void;
+    removeListener: (event: string, listener: (...args: Array<any>) => unknown) => void;
+};

package/src/utils/eventListenerHandlers.cjs

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../_virtual/_tslib.cjs');
+
+const eventListenerHandlers = (walletConnector, web3Provider) => {
+    const handleAccountChange = (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (accounts.length === 0) {
+            walletConnector.emit('disconnect');
+            return;
+        }
+        walletConnector.emit('accountChange', { accounts });
+    });
+    const handleChainChange = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const network = yield web3Provider.getNetwork();
+        walletConnector.emit('chainChange', {
+            chain: network.chainId.toString(),
+        });
+    });
+    const handleDisconnect = (error) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if ((error === null || error === void 0 ? void 0 : error.code) === 1013) {
+            return;
+        }
+        walletConnector.emit('disconnect');
+    });
+    return {
+        handleAccountChange,
+        handleChainChange,
+        handleDisconnect,
+    };
+};
+
+exports.eventListenerHandlers = eventListenerHandlers;

package/src/utils/eventListenerHandlers.d.ts

@@ -0,0 +1,8 @@
+import { Web3Provider } from '@ethersproject/providers';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { AccountChangeEventHandler, ChainChangeEventHandler, DisconnectEventHandler } from '../types';
+export declare const eventListenerHandlers: (walletConnector: WalletConnector, web3Provider: Web3Provider) => {
+    handleAccountChange: AccountChangeEventHandler;
+    handleChainChange: ChainChangeEventHandler;
+    handleDisconnect: DisconnectEventHandler;
+};

package/src/utils/eventListenerHandlers.js

@@ -0,0 +1,30 @@
+import { __awaiter } from '../../_virtual/_tslib.js';
+
+const eventListenerHandlers = (walletConnector, web3Provider) => {
+    const handleAccountChange = (accounts) => __awaiter(void 0, void 0, void 0, function* () {
+        if (accounts.length === 0) {
+            walletConnector.emit('disconnect');
+            return;
+        }
+        walletConnector.emit('accountChange', { accounts });
+    });
+    const handleChainChange = () => __awaiter(void 0, void 0, void 0, function* () {
+        const network = yield web3Provider.getNetwork();
+        walletConnector.emit('chainChange', {
+            chain: network.chainId.toString(),
+        });
+    });
+    const handleDisconnect = (error) => __awaiter(void 0, void 0, void 0, function* () {
+        if ((error === null || error === void 0 ? void 0 : error.code) === 1013) {
+            return;
+        }
+        walletConnector.emit('disconnect');
+    });
+    return {
+        handleAccountChange,
+        handleChainChange,
+        handleDisconnect,
+    };
+};
+
+export { eventListenerHandlers };

package/src/walletConnect/fetchWalletConnectWallets.cjs

@@ -5,24 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var walletConnectV2 = require('./walletConnectV2.cjs');
 var walletConnect = require('./walletConnect.cjs');
 
-// These wallets are either not supported or implement their
-// own WalletConnect connector
-const filteredWalletConnectWallets = [
-    'MetaMask',
-    'Gnosis Safe',
-    'Trust',
-    'lilico',
-    'Keplr',
-    'Zerion',
-    'Rabby',
-    'Exodus',
-    'OKX Wallet',
-];
 const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
     var _a;
     return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect &&
-        !filteredWalletConnectWallets.includes(wallet.shortName || wallet.name))
+        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
         .map((wallet) => {
         var _a;
         const { shortName } = wallet;
@@ -59,5 +45,4 @@ const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletCon
     };
 
 exports.fetchWalletConnectWallets = fetchWalletConnectWallets;
-exports.filteredWalletConnectWallets = filteredWalletConnectWallets;
 exports.getWalletConnectConnector = getWalletConnectConnector;

package/src/walletConnect/fetchWalletConnectWallets.d.ts

@@ -1,6 +1,5 @@
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
-export declare const filteredWalletConnectWallets: string[];
 export declare const fetchWalletConnectWallets: ({ isWalletConnectV2Enabled, walletBook, }: {
     isWalletConnectV2Enabled: boolean;
     walletBook: WalletBookSchema;

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -1,24 +1,10 @@
 import { WalletConnectV2 } from './walletConnectV2.js';
 import { WalletConnect } from './walletConnect.js';
 
-// These wallets are either not supported or implement their
-// own WalletConnect connector
-const filteredWalletConnectWallets = [
-    'MetaMask',
-    'Gnosis Safe',
-    'Trust',
-    'lilico',
-    'Keplr',
-    'Zerion',
-    'Rabby',
-    'Exodus',
-    'OKX Wallet',
-];
 const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
     var _a;
     return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect &&
-        !filteredWalletConnectWallets.includes(wallet.shortName || wallet.name))
+        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
         .map((wallet) => {
         var _a;
         const { shortName } = wallet;
@@ -54,4 +40,4 @@ const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletCon
         }
     };
 
-export { fetchWalletConnectWallets, filteredWalletConnectWallets, getWalletConnectConnector };
+export { fetchWalletConnectWallets, getWalletConnectConnector };

package/src/walletConnect/walletConnectV2.cjs

@@ -373,9 +373,11 @@ class WalletConnectV2 extends EthWalletConnector.EthWalletConnector {
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.initProvider();
-            this.refreshSession();
-            this.isInitialized = true;
+            if (this.isInitialized === false) {
+                yield this.initProvider();
+                this.refreshSession();
+                this.isInitialized = true;
+            }
             if (!this.activeAccount) {
                 return [];
             }

package/src/walletConnect/walletConnectV2.js

@@ -364,9 +364,11 @@ class WalletConnectV2 extends EthWalletConnector {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.initProvider();
-            this.refreshSession();
-            this.isInitialized = true;
+            if (this.isInitialized === false) {
+                yield this.initProvider();
+                this.refreshSession();
+                this.isInitialized = true;
+            }
             if (!this.activeAccount) {
                 return [];
             }

package/src/injected/OKX.cjs

@@ -1,15 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-
-class OKX extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'OKX Wallet';
-        this.walletConnectorFallback = true;
-    }
-}
-
-exports.OKX = OKX;

package/src/injected/OKX.d.ts

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

package/src/injected/OKX.js

@@ -1,11 +0,0 @@
-import InjectedWalletBase from './InjectedWalletBase.js';
-
-class OKX extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'OKX Wallet';
-        this.walletConnectorFallback = true;
-    }
-}
-
-export { OKX };

package/src/injected/UnknownInjectedWallet.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-
-class UnknownInjectedWallet extends InjectedWalletBase {
-    constructor() {
-        super(...arguments);
-        this.name = 'InjectedWallet';
-    }
-}
-
-exports.UnknownInjectedWallet = UnknownInjectedWallet;