@dynamic-labs/ethereum 0.19.0-alpha.2 → 0.19.0-alpha.21

package/src/ethProviderHelper.cjs

@@ -3,216 +3,139 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
-var ethers = require('ethers');
+var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var isUnsupportedProviderError = require('./utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
+var utils = require('@dynamic-labs/utils');
+var eventListenerHandlers = require('./utils/eventListenerHandlers.cjs');
 
-var _a;
-class EthProviderHelper {
-    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);
-        }
-        if (window.okxwallet) {
-            ethereumProviders.push(window.okxwallet);
-        }
-        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, listeners, web3Provider) {
-        if (!web3Provider) {
-            return {
-                tearDownEventListeners: () => { },
-            };
-        }
-        const externalProvider = web3Provider.provider;
-        const handleAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _b, _c;
-            if (accounts.length === 0) {
-                yield ((_b = listeners.onDisconnect) === null || _b === void 0 ? void 0 : _b.call(listeners));
-                return;
-            }
-            yield ((_c = listeners.onAccountChange) === null || _c === void 0 ? void 0 : _c.call(listeners, accounts));
-        });
-        const handleChainChange = () => _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _d;
-            const network = yield web3Provider.getNetwork();
-            yield ((_d = listeners.onChainChange) === null || _d === void 0 ? void 0 : _d.call(listeners, network.chainId.toString()));
-        });
-        const handleDisconnect = (error) => _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _e;
-            if ((error === null || error === void 0 ? void 0 : error.code) === 1013) {
-                return;
-            }
-            yield ((_e = listeners.onDisconnect) === null || _e === void 0 ? void 0 : _e.call(listeners));
-        });
-        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 = 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,
-};
+class EthProviderHelper {
+    constructor(wallet) {
+        this.wallet = wallet;
+    }
+    getInstalledProvider() {
+        const config = this.getInjectedConfig();
+        if (!config ||
+            !config.extensionLocators ||
+            !config.extensionLocators.length)
+            return undefined;
+        return this.installedProviderLookup(config.extensionLocators);
+    }
+    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.getProvidersFromWindow(windowLocation);
+                if (foundProviders && foundProviders.length)
+                    providers.push(...foundProviders);
+            }
+        }
+        if (window.ethereum) {
+            if (!window.ethereum.providers || !window.ethereum.providers.length) {
+                providers.push(window.ethereum);
+            }
+            else {
+                window.ethereum.providers.forEach((p) => providers.push(p));
+            }
+        }
+        return providers;
+    }
+    installedProviderLookup(providerFlags) {
+        const allInstalledProviders = this.installedProviders();
+        return walletConnectorCore.ProviderLookup(allInstalledProviders, providerFlags);
+    }
+    isInstalledHelper() {
+        return this.findProvider() !== undefined;
+    }
+    findProvider() {
+        return this.getInstalledProvider();
+    }
+    findWalletClient() {
+        const provider = this.findProvider();
+        if (!provider) {
+            return undefined;
+        }
+        return viem.createWalletClient({
+            transport: viem.custom(provider),
+        });
+    }
+    fetchPublicAddress() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const client = this.findWalletClient();
+            if (!client) {
+                return Promise.resolve(undefined);
+            }
+            return this.fetchPublicAddressWithProvider(client);
+        });
+    }
+    fetchPublicAddressWithProvider(client) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const [lowercaseAddress] = yield client.requestAddresses();
+                const publicAddress = viem.getAddress(lowercaseAddress);
+                return publicAddress;
+            }
+            catch (err) {
+                walletConnectorCore.logger.error(err);
+                return Promise.reject(err);
+            }
+        });
+    }
+    signMessage(messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress) {
+                return Promise.resolve(undefined);
+            }
+            const client = this.findWalletClient();
+            if (!client) {
+                return Promise.resolve(undefined);
+            }
+            const signedMessage = yield client.signMessage({
+                account: walletAddress,
+                message: messageToSign,
+            });
+            return signedMessage;
+        });
+    }
+    _setupEventListeners(walletConnector, publicClient) {
+        const web3Provider = this.findProvider();
+        if (!web3Provider) {
+            return {
+                tearDownEventListeners: () => { },
+            };
+        }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers.eventListenerHandlers(walletConnector, publicClient);
+        web3Provider.on('accountsChanged', handleAccountChange);
+        web3Provider.on('chainChanged', handleChainChange);
+        web3Provider.on('disconnect', handleDisconnect);
+        const tearDownEventListeners = () => {
+            const web3Provider = this.findProvider();
+            if (!web3Provider) {
+                return;
+            }
+            if (handleAccountChange) {
+                web3Provider.removeListener('accountsChanged', handleAccountChange);
+            }
+            if (handleChainChange) {
+                web3Provider.removeListener('chainChanged', handleChainChange);
+            }
+            if (handleDisconnect) {
+                web3Provider.removeListener('disconnect', handleDisconnect);
+            }
+        };
+        return {
+            tearDownEventListeners,
+        };
+    }
+}
 
 exports.EthProviderHelper = EthProviderHelper;

package/src/ethProviderHelper.d.ts

@@ -1,36 +1,28 @@
-import { ethers } from 'ethers';
-import { ProviderCondition, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-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, listeners: WalletEventListeners, web3Provider?: ethers.providers.Web3Provider): {
-        tearDownEventListeners: () => void;
-    };
-}
-export {};
+import { Hex, PublicClient, WalletClient } from 'viem';
+import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { IEthereum, ProviderFlag } from './types';
+export declare class EthProviderHelper {
+    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(): IEthereum | undefined;
+    findWalletClient(): WalletClient | undefined;
+    fetchPublicAddress(): Promise<Hex | undefined>;
+    fetchPublicAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    _setupEventListeners(walletConnector: WalletConnector, publicClient: PublicClient): {
+        tearDownEventListeners: () => void;
+    };
+}