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

package/src/ethProviderHelper.cjs

@@ -3,137 +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 utils = require('@dynamic-labs/utils');
-var isUnsupportedProviderError = require('./utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs');
 var eventListenerHandlers = require('./utils/eventListenerHandlers.cjs');
 
-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.getPathFromObject(window, 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() {
-        const windowReference = this.getInstalledProvider();
-        try {
-            return windowReference === undefined
-                ? undefined
-                : 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 ${this.wallet.name}`, err);
-            return undefined;
-        }
-    }
-    fetchPublicAddress() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider();
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
-            return this.fetchPublicAddressWithProvider(provider);
-        });
-    }
-    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);
-            }
-        });
-    }
-    signMessage(messageToSign) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
-            if (!walletAddress) {
-                return Promise.resolve(undefined);
-            }
-            const provider = this.findProvider();
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
-            const signer = provider.getSigner();
-            const signedMessage = yield signer.signMessage(messageToSign);
-            return signedMessage;
-        });
-    }
-    _setupEventListeners(walletConnector, web3Provider) {
-        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 = () => {
-            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,
-        };
-    }
+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,27 +1,28 @@
-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';
-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(): 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;
-    };
-}
+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;
+    };
+}

package/src/ethProviderHelper.js

@@ -1,135 +1,137 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { ethers, utils } from 'ethers';
+import { createWalletClient, custom, getAddress } from 'viem';
 import { ProviderLookup, logger } from '@dynamic-labs/wallet-connector-core';
-import { getPathFromObject } from '@dynamic-labs/utils';
-import { isUnsupportedProviderError } from './utils/isUnsupportedProviderError/isUnsupportedProviderError.js';
+import { getProvidersFromWindow } from '@dynamic-labs/utils';
 import { eventListenerHandlers } from './utils/eventListenerHandlers.js';
 
-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 = getPathFromObject(window, 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 ProviderLookup(allInstalledProviders, providerFlags);
-    }
-    isInstalledHelper() {
-        return this.findProvider() !== undefined;
-    }
-    findProvider() {
-        const windowReference = this.getInstalledProvider();
-        try {
-            return windowReference === undefined
-                ? undefined
-                : 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 ${this.wallet.name}`, err);
-            return undefined;
-        }
-    }
-    fetchPublicAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.findProvider();
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
-            return this.fetchPublicAddressWithProvider(provider);
-        });
-    }
-    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);
-            }
-        });
-    }
-    signMessage(messageToSign) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const walletAddress = yield this.fetchPublicAddress();
-            if (!walletAddress) {
-                return Promise.resolve(undefined);
-            }
-            const provider = this.findProvider();
-            if (!provider) {
-                return Promise.resolve(undefined);
-            }
-            const signer = provider.getSigner();
-            const signedMessage = yield signer.signMessage(messageToSign);
-            return signedMessage;
-        });
-    }
-    _setupEventListeners(walletConnector, web3Provider) {
-        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 = () => {
-            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,
-        };
-    }
+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 = 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 ProviderLookup(allInstalledProviders, providerFlags);
+    }
+    isInstalledHelper() {
+        return this.findProvider() !== undefined;
+    }
+    findProvider() {
+        return this.getInstalledProvider();
+    }
+    findWalletClient() {
+        const provider = this.findProvider();
+        if (!provider) {
+            return undefined;
+        }
+        return createWalletClient({
+            transport: custom(provider),
+        });
+    }
+    fetchPublicAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const client = this.findWalletClient();
+            if (!client) {
+                return Promise.resolve(undefined);
+            }
+            return this.fetchPublicAddressWithProvider(client);
+        });
+    }
+    fetchPublicAddressWithProvider(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const [lowercaseAddress] = yield client.requestAddresses();
+                const publicAddress = getAddress(lowercaseAddress);
+                return publicAddress;
+            }
+            catch (err) {
+                logger.error(err);
+                return Promise.reject(err);
+            }
+        });
+    }
+    signMessage(messageToSign) {
+        return __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(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,
+        };
+    }
 }
 
 export { EthProviderHelper };

package/src/index.cjs

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
+var turnkey = require('@dynamic-labs/turnkey');
 var BloctoInjected = require('./injected/BloctoInjected.cjs');
 var BraveEvm = require('./injected/BraveEvm.cjs');
 var Dawn = require('./injected/Dawn.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
 var Frame = require('./injected/Frame.cjs');
 var GameStop = require('./injected/GameStop.cjs');
-var MetaMask = require('./injected/MetaMask.cjs');
 var Opera = require('./injected/Opera.cjs');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var Trust = require('./injected/Trust.cjs');
@@ -19,7 +19,7 @@ var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConne
 var legacyInjectedWallets = require('./injected/legacyInjectedWallets.cjs');
 require('./walletConnect/walletConnectV2.cjs');
 require('@walletconnect/ethereum-provider');
-require('ethers');
+require('viem');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
@@ -27,14 +27,17 @@ var EthWalletConnector = require('./EthWalletConnector.cjs');
 var constants = require('./constants.cjs');
 require('@walletconnect/client');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
+var coinbase = require('./coinbase/coinbase.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
 var legacyEthProviderHelper = require('./legacyEthProviderHelper.cjs');
 
-const EthereumWalletConnectors = (props) => [
-    ...legacyInjectedWallets.legacyInjectedWallets,
-    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
-    ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
-    fetchWalletConnectWallets.getWalletConnectConnector(props),
+const EthereumWalletConnectors = (props) => [
+    ...legacyInjectedWallets.legacyInjectedWallets,
+    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
+    ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
+    ...turnkey.TurnkeyWalletConnectors(props),
+    coinbase.Coinbase,
+    fetchWalletConnectWallets.getWalletConnectConnector(props),
 ];
 
 exports.BloctoInjected = BloctoInjected.BloctoInjected;
@@ -43,7 +46,6 @@ exports.Dawn = Dawn.Dawn;
 exports.ExodusEvm = ExodusEvm.ExodusEvm;
 exports.Frame = Frame.Frame;
 exports.GameStop = GameStop.GameStop;
-exports.MetaMask = MetaMask.MetaMask;
 exports.Opera = Opera.Opera;
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
 exports.Trust = Trust.Trust;