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

package/src/EthWalletConnector.js

@@ -1,16 +1,17 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
-import { formatEther } from 'viem';
+import { getAddress, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, getOrMapViemChain } from '@dynamic-labs/utils';
+import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError } from '@dynamic-labs/utils';
+import { chainsMap, getOrMapViemChain, createViemUiTransaction } from '@dynamic-labs/viem-utils';
+import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
 import { getNameservice } from './utils/getNameservice.js';
 
 class EthWalletConnector extends WalletConnectorBase {
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b;
             const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
@@ -21,7 +22,10 @@ class EthWalletConnector extends WalletConnectorBase {
                 solana: [],
                 starknet: undefined,
             };
-            return (_c = (_b = this.chainRpcProviders) === null || _b === void 0 ? void 0 : _b.getEvmProviderByChainId(configurations, networkId)) === null || _c === void 0 ? void 0 : _c.provider;
+            if (!this.chainRpcProviders)
+                return undefined;
+            const providers = this.chainRpcProviders.getProviders(configurations);
+            return (_b = this.chainRpcProviders.getEvmProviderByChainId(providers, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
         });
     }
     constructor(props) {
@@ -44,7 +48,7 @@ class EthWalletConnector extends WalletConnectorBase {
             if (!this.supportsNetworkSwitching || !provider) {
                 return Promise.resolve(undefined);
             }
-            return retryableFn(provider.getChainId, {
+            const chainId = yield retryableFn(provider.getChainId, {
                 fallbackValue: FALLBACK_UNDEFINED,
                 /**
                  * The timeout is set to 1 second because the getChainId method
@@ -54,32 +58,43 @@ class EthWalletConnector extends WalletConnectorBase {
                  */
                 timeoutMs: 1000,
             });
+            this.setActiveChain(chainsMap[chainId]);
+            return chainId;
         });
     }
-    getNameService() {
+    getNameService(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [[address], rpcProvider] = yield Promise.all([
-                this.getConnectedAccounts(),
-                this.getPublicClient(),
-            ]);
-            if (!address || !rpcProvider) {
+            const rpcProvider = yield this.getPublicClient();
+            if (!rpcProvider) {
                 return;
             }
             return getNameservice({ address, rpcProvider });
         });
     }
+    isTestnet() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            return (_c = (_b = (_a = (yield this.getPublicClient())) === null || _a === void 0 ? void 0 : _a.chain) === null || _b === void 0 ? void 0 : _b.testnet) !== null && _c !== void 0 ? _c : false;
+        });
+    }
+    parseAddress(address) {
+        try {
+            // Ensures the address follows the EIP55 format.
+            // see: https://eips.ethereum.org/EIPS/eip-55
+            return getAddress(address);
+        }
+        catch (err) {
+            logger.debug(`Failed to parse EVM address into EIP55 format: error getting checksum, returning default ${address}`, err);
+        }
+        return address;
+    }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.getWalletClient();
         });
     }
-    getBalance() {
+    getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            // This is equivalent to getSigner().getAddress() but does not crash
-            // if the signer is not available
-            const [address] = yield this.getConnectedAccounts();
-            if (!address)
-                return;
             const client = yield this.getPublicClient();
             const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({
                 address: address,
@@ -119,7 +134,7 @@ class EthWalletConnector extends WalletConnectorBase {
                 return [];
             const addresses = yield retryableFn(provider.getAddresses, {
                 fallbackValue: [],
-                timeoutMs: 300,
+                timeoutMs: 500,
             });
             if (addresses.length) {
                 this.setActiveAccount(addresses[0]);
@@ -139,11 +154,15 @@ class EthWalletConnector extends WalletConnectorBase {
                 if (!this.supportsNetworkSwitching()) {
                     throw new DynamicError('Network switching is not supported');
                 }
-                yield provider.switchChain(getOrMapViemChain(network));
+                const viemChain = getOrMapViemChain(network);
+                yield provider.switchChain(viemChain);
                 if (this.key === 'magiceden') {
                     const newChainId = yield provider.getChainId();
                     this.emit('chainChange', { chain: newChainId.toString() });
                 }
+                else {
+                    this.setActiveChain(viemChain);
+                }
             }
             catch (error) {
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message
@@ -188,6 +207,22 @@ class EthWalletConnector extends WalletConnectorBase {
     getActiveAccount() {
         return this.activeAccount;
     }
+    setActiveChain(chain) {
+        this.activeChain = chain;
+    }
+    getActiveChain() {
+        return this.activeChain;
+    }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletClient = yield this.getWalletClient();
+            const publicClient = yield this.getPublicClient();
+            if (!publicClient || !walletClient) {
+                throw new DynamicError('No public client available');
+            }
+            return createViemUiTransaction({ from, publicClient, walletClient });
+        });
+    }
 }
 
 export { EthWalletConnector };

package/src/coinbase/coinbase.cjs

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var viem = require('viem');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var viemUtils = require('@dynamic-labs/viem-utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var helpers = require('./helpers.cjs');
 
@@ -19,7 +19,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = false;
-        this.canConnectViaCustodialService = true;
+        this.canConnectViaCustodialService = !this.isInstalledOnBrowser();
         this.coinbaseProviderOpts = {
             appLogoUrl: appLogoUrl,
             appName: appName,