@dynamic-labs/ethereum 3.0.0-alpha.4 → 3.0.0-alpha.41

package/src/EthWalletConnector.d.ts

@@ -1,8 +1,8 @@
-import { WalletClient, PublicClient, Account, Hex } from 'viem';
-import { NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork, GenericNetwork } from '@dynamic-labs/types';
+import { Account, Hex, PublicClient, Transport, Chain as ViemChain, WalletClient } from 'viem';
 import { IChainRpcProviders } from '@dynamic-labs/rpc-provider-ethereum';
+import { EvmNetwork, GenericNetwork, IUITransaction } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { ISendBalanceWalletConnector, NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 export type SwitchNetworkOps = {
     networkChainId?: number;
     networkName?: string;
@@ -15,16 +15,19 @@ export type EthWalletConnectorOpts = {
     evmNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
 };
-export declare abstract class EthWalletConnector extends WalletConnectorBase {
+export declare abstract class EthWalletConnector extends WalletConnectorBase implements ISendBalanceWalletConnector {
     evmNetworks: EvmNetwork[];
     private activeAccount;
-    abstract getWalletClient(chainId?: string): WalletClient | undefined;
-    getPublicClient(): Promise<PublicClient | undefined>;
+    private activeChain;
+    abstract getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
+    getPublicClient(): Promise<void | PublicClient<Transport, ViemChain> | undefined>;
     constructor(props: EthWalletConnectorOpts);
     getNetwork(): Promise<number | undefined>;
-    getNameService(): Promise<NameServiceData | undefined>;
+    getNameService(address: string): Promise<NameServiceData | undefined>;
+    isTestnet(): Promise<boolean>;
+    parseAddress(address: string): string;
     getSigner(): Promise<{
-        account: Account | undefined;
+        account: Account;
         batch?: {
             multicall?: boolean | {
                 batchSize?: number | undefined;
@@ -35,7 +38,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
         ccipRead?: false | {
             request?: ((parameters: import("viem").CcipRequestParameters) => Promise<`0x${string}`>) | undefined;
         } | undefined;
-        chain: import("viem").Chain | undefined;
+        chain: ViemChain;
         key: string;
         name: string;
         pollingInterval: number;
@@ -44,15 +47,15 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, import("viem").Chain | undefined, Account | undefined, chainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends ViemChain | undefined>(args: import("viem").DeployContractParameters<abi, ViemChain, Account, chainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <const TRequest extends import("viem").PrepareTransactionRequestRequest<import("viem").Chain | undefined, TChainOverride>, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, Account | undefined, TChainOverride, TAccountOverride, TRequest>) => Promise<import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<import("viem").Chain, TChainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<import("viem").Chain, TChainOverride> extends infer T_12 ? T_12 extends import("viem").DeriveChain<import("viem").Chain, TChainOverride> ? T_12 extends import("viem").Chain ? {
+        prepareTransactionRequest: <const TRequest extends import("viem").PrepareTransactionRequestRequest<ViemChain, TChainOverride>, TChainOverride extends ViemChain | undefined = undefined, TAccountOverride extends `0x${string}` | Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<ViemChain, Account, TChainOverride, TAccountOverride, TRequest>) => Promise<import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<ViemChain, TChainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<ViemChain, TChainOverride> extends infer T_12 ? T_12 extends import("viem").DeriveChain<ViemChain, TChainOverride> ? T_12 extends ViemChain ? {
             chain: T_12;
         } : {
             chain?: undefined;
-        } : never : never) & (import("viem").DeriveAccount<Account | undefined, TAccountOverride> extends infer T_13 ? T_13 extends import("viem").DeriveAccount<Account | undefined, TAccountOverride> ? T_13 extends Account ? {
+        } : never : never) & (import("viem").DeriveAccount<Account, TAccountOverride> extends infer T_13 ? T_13 extends import("viem").DeriveAccount<Account, TAccountOverride> ? T_13 extends Account ? {
             account: T_13;
             from: `0x${string}`;
         } : {
@@ -1436,11 +1439,11 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
             sidecars: false | readonly import("viem").BlobSidecar<`0x${string}`>[] | undefined;
         }, import("viem").TransactionSerializableEIP4844>)) | import("viem").Opaque<import("viem").TransactionSerializableEIP4844, TRequest> | import("viem").Opaque<import("viem").TransactionRequestEIP4844, TRequest> ? "eip4844" : never) | (TRequest["type"] extends string ? TRequest["type"] : never)>) ? T_21 extends "eip4844" ? import("viem").TransactionRequestEIP4844 : never : never : never)>> & {
             chainId?: number | undefined;
-        }, (TRequest["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? TRequest["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") extends infer T_22 ? T_22 extends (TRequest["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? TRequest["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") ? T_22 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_22 : never : never> & (unknown extends TRequest["kzg"] ? {} : Pick<TRequest, "kzg">) extends infer T ? { [K in keyof T]: (import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<import("viem").Chain, TChainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<import("viem").Chain, TChainOverride> extends infer T_1 ? T_1 extends import("viem").DeriveChain<import("viem").Chain, TChainOverride> ? T_1 extends import("viem").Chain ? {
+        }, (TRequest["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? TRequest["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") extends infer T_22 ? T_22 extends (TRequest["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? TRequest["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") ? T_22 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_22 : never : never> & (unknown extends TRequest["kzg"] ? {} : Pick<TRequest, "kzg">) extends infer T ? { [K in keyof T]: (import("viem").UnionRequiredBy<Extract<import("viem").UnionOmit<import("viem").ExtractChainFormatterParameters<import("viem").DeriveChain<ViemChain, TChainOverride>, "transactionRequest", import("viem").TransactionRequest>, "from"> & (import("viem").DeriveChain<ViemChain, TChainOverride> extends infer T_1 ? T_1 extends import("viem").DeriveChain<ViemChain, TChainOverride> ? T_1 extends ViemChain ? {
             chain: T_1;
         } : {
             chain?: undefined;
-        } : never : never) & (import("viem").DeriveAccount<Account | undefined, TAccountOverride> extends infer T_2 ? T_2 extends import("viem").DeriveAccount<Account | undefined, TAccountOverride> ? T_2 extends Account ? {
+        } : never : never) & (import("viem").DeriveAccount<Account, TAccountOverride> extends infer T_2 ? T_2 extends import("viem").DeriveAccount<Account, TAccountOverride> ? T_2 extends Account ? {
             account: T_2;
             from: `0x${string}`;
         } : {
@@ -2831,9 +2834,9 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
         sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <const TRequest_1 extends import("viem").SendTransactionRequest<import("viem").Chain | undefined, TChainOverride_1>, TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, Account | undefined, TChainOverride_1, TRequest_1>) => Promise<`0x${string}`>;
-        signMessage: (args: import("viem").SignMessageParameters<Account | undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<import("viem").Chain | undefined, Account | undefined, TChainOverride_2>) => Promise<`0x02${string}` | `0x01${string}` | `0x03${string}` | import("viem").TransactionSerializedLegacy>;
+        sendTransaction: <const TRequest_1 extends import("viem").SendTransactionRequest<ViemChain, TChainOverride_1>, TChainOverride_1 extends ViemChain | undefined = undefined>(args: import("viem").SendTransactionParameters<ViemChain, Account, TChainOverride_1, TRequest_1>) => Promise<`0x${string}`>;
+        signMessage: (args: import("viem").SignMessageParameters<Account>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends ViemChain | undefined>(args: import("viem").SignTransactionParameters<ViemChain, Account, TChainOverride_2>) => Promise<`0x02${string}` | `0x01${string}` | `0x03${string}` | import("viem").TransactionSerializedLegacy>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -3041,10 +3044,10 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
             uint256?: undefined;
         } | {
             [key: string]: unknown;
-        }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, Account | undefined>) => Promise<`0x${string}`>;
+        }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, Account>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "nonpayable" | "payable", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, import("viem").Chain | undefined, Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "nonpayable" | "payable", functionName>, TChainOverride_3 extends ViemChain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, ViemChain, Account, TChainOverride_3>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -3059,9 +3062,9 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, import("viem").Chain | undefined, Account | undefined>, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<import("viem").Chain | undefined, Account | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, Account | undefined>>) => client) => import("viem").Client<import("viem").Transport, import("viem").Chain | undefined, Account | undefined, import("viem").WalletRpcSchema, { [K_1 in keyof client]: client[K_1]; } & import("viem").WalletActions<import("viem").Chain | undefined, Account | undefined>>;
+        } & import("viem").ExactPartial<Pick<import("viem").PublicActions<Transport, ViemChain, Account>, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<ViemChain, Account>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<Transport, ViemChain, Account, import("viem").WalletRpcSchema, import("viem").WalletActions<ViemChain, Account>>) => client) => import("viem").Client<Transport, ViemChain, Account, import("viem").WalletRpcSchema, { [K_1 in keyof client]: client[K_1]; } & import("viem").WalletActions<ViemChain, Account>>;
     } | undefined>;
-    getBalance(): Promise<string | undefined>;
+    getBalance(address: string): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
@@ -3076,5 +3079,8 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase {
     protected evmNetworkRpcMap: () => EvmRpcMap;
     setActiveAccount(account: Hex | undefined): void;
     getActiveAccount(): Account | undefined;
+    setActiveChain(chain: ViemChain | undefined): void;
+    getActiveChain(): ViemChain | undefined;
+    createUiTransaction(from: string): Promise<IUITransaction>;
 }
 export {};

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,26 @@ 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,