viem 2.39.3 → 2.40.0

package/actions/wallet/prepareTransactionRequest.ts

@@ -24,6 +24,7 @@ import {
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { AccountNotFoundErrorType } from '../../errors/account.js'
+import type { BaseError } from '../../errors/base.js'
 import {
   Eip1559FeesNotSupportedError,
   MaxFeePerGasTooLowError,
@@ -58,6 +59,7 @@ import { commitmentsToVersionedHashes } from '../../utils/blob/commitmentsToVers
 import { toBlobSidecars } from '../../utils/blob/toBlobSidecars.js'
 import type { FormattedTransactionRequest } from '../../utils/formatters/transactionRequest.js'
 import { getAction } from '../../utils/getAction.js'
+import { LruMap } from '../../utils/lru.js'
 import type { NonceManager } from '../../utils/nonceManager.js'
 import {
   type AssertRequestErrorType,
@@ -68,6 +70,10 @@ import {
   type GetTransactionType,
   getTransactionType,
 } from '../../utils/transaction/getTransactionType.js'
+import {
+  type FillTransactionParameters,
+  fillTransaction,
+} from '../public/fillTransaction.js'
 import { getChainId as getChainId_ } from '../public/getChainId.js'
 
 export const defaultParameters = [
@@ -82,6 +88,8 @@ export const defaultParameters = [
 /** @internal */
 export const eip1559NetworkCache = /*#__PURE__*/ new Map<string, boolean>()
 
+const supportsFillTransaction = /*#__PURE__*/ new LruMap<boolean>(128)
+
 export type PrepareTransactionRequestParameterType =
   | 'blobVersionedHashes'
   | 'chainId'
@@ -241,7 +249,7 @@ export async function prepareTransactionRequest<
   chainOverride extends Chain | undefined = undefined,
 >(
   client: Client<Transport, chain, account>,
-  args: PrepareTransactionRequestParameters<
+  args_: PrepareTransactionRequestParameters<
     chain,
     account,
     chainOverride,
@@ -257,6 +265,60 @@ export async function prepareTransactionRequest<
     request
   >
 > {
+  const attemptFill =
+    // Do not attempt if `eth_fillTransaction` is not supported.
+    supportsFillTransaction.get(client.uid) !== false &&
+    // Should attempt `eth_fillTransaction` if "fees" or "gas" are required to be populated,
+    // otherwise, can just use the other individual calls.
+    ['fees', 'gas'].some((parameter) =>
+      args_.parameters?.includes(
+        parameter as PrepareTransactionRequestParameterType,
+      ),
+    )
+
+  const fillResult = attemptFill
+    ? await getAction(
+        client,
+        fillTransaction,
+        'fillTransaction',
+      )(args_ as FillTransactionParameters)
+        .then((result) => {
+          const {
+            chainId,
+            from,
+            gas,
+            gasPrice,
+            nonce,
+            maxFeePerBlobGas,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            type,
+          } = result.transaction
+          supportsFillTransaction.set(client.uid, true)
+          return {
+            ...args_,
+            chainId,
+            from,
+            gas,
+            gasPrice,
+            nonce,
+            maxFeePerBlobGas,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            type,
+          }
+        })
+        .catch((e) => {
+          const error = e as BaseError & { cause: BaseError }
+          if (
+            error.cause.name === 'MethodNotFoundRpcError' ||
+            error.cause.name === 'MethodNotSupportedRpcError'
+          )
+            supportsFillTransaction.set(client.uid, false)
+          return args_
+        })
+    : args_
+
   const {
     account: account_ = client.account,
     blobs,
@@ -267,10 +329,14 @@ export async function prepareTransactionRequest<
     nonceManager,
     parameters = defaultParameters,
     type,
-  } = args
+  } = fillResult
+
   const account = account_ ? parseAccount(account_) : account_
 
-  const request = { ...args, ...(account ? { from: account?.address } : {}) }
+  const request = {
+    ...fillResult,
+    ...(account ? { from: account?.address } : {}),
+  }
 
   let block: Block | undefined
   async function getBlock(): Promise<Block> {
@@ -287,7 +353,7 @@ export async function prepareTransactionRequest<
   async function getChainId(): Promise<number> {
     if (chainId) return chainId
     if (chain) return chain.id
-    if (typeof args.chainId !== 'undefined') return args.chainId
+    if (typeof request.chainId !== 'undefined') return request.chainId
     const chainId_ = await getAction(client, getChainId_, 'getChainId')({})
     chainId = chainId_
     return chainId
@@ -379,9 +445,9 @@ export async function prepareTransactionRequest<
           })
 
         if (
-          typeof args.maxPriorityFeePerGas === 'undefined' &&
-          args.maxFeePerGas &&
-          args.maxFeePerGas < maxPriorityFeePerGas
+          typeof request.maxPriorityFeePerGas === 'undefined' &&
+          request.maxFeePerGas &&
+          request.maxFeePerGas < maxPriorityFeePerGas
         )
           throw new MaxFeePerGasTooLowError({
             maxPriorityFeePerGas,
@@ -393,12 +459,12 @@ export async function prepareTransactionRequest<
     } else {
       // Legacy fees
       if (
-        typeof args.maxFeePerGas !== 'undefined' ||
-        typeof args.maxPriorityFeePerGas !== 'undefined'
+        typeof request.maxFeePerGas !== 'undefined' ||
+        typeof request.maxPriorityFeePerGas !== 'undefined'
       )
         throw new Eip1559FeesNotSupportedError()
 
-      if (typeof args.gasPrice === 'undefined') {
+      if (typeof request.gasPrice === 'undefined') {
         const block = await getBlock()
         const { gasPrice: gasPrice_ } = await internal_estimateFeesPerGas(
           client,

package/chains/definitions/monad.ts

@@ -11,14 +11,26 @@ export const monad = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: {
-      http: ['https://rpc.monad.xyz'],
+      http: ['https://rpc.monad.xyz', 'https://rpc1.monad.xyz'],
+      webSocket: ['wss://rpc.monad.xyz', 'wss://rpc1.monad.xyz'],
     },
   },
   blockExplorers: {
     default: {
-      name: 'Monvision',
-      url: 'https://mainnet-beta.monvision.io',
+      name: 'MonadVision',
+      url: 'https://monadvision.com',
+    },
+    monadscan: {
+      name: 'Monadscan',
+      url: 'https://monadscan.com',
+      apiUrl: 'https://api.monadscan.com/api',
     },
   },
   testnet: false,
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 9248132,
+    },
+  },
 })

package/clients/decorators/public.ts

@@ -73,6 +73,11 @@ import {
   type EstimateMaxPriorityFeePerGasReturnType,
   estimateMaxPriorityFeePerGas,
 } from '../../actions/public/estimateMaxPriorityFeePerGas.js'
+import {
+  type FillTransactionParameters,
+  type FillTransactionReturnType,
+  fillTransaction,
+} from '../../actions/public/fillTransaction.js'
 import {
   type GetBalanceParameters,
   type GetBalanceReturnType,
@@ -543,6 +548,40 @@ export type PublicActions<
   estimateGas: (
     args: EstimateGasParameters<chain>,
   ) => Promise<EstimateGasReturnType>
+  /**
+   * Fills a transaction request with the necessary fields to be signed over.
+   *
+   * - Docs: https://viem.sh/docs/actions/public/fillTransaction
+   *
+   * @param client - Client to use
+   * @param parameters - {@link FillTransactionParameters}
+   * @returns The filled transaction. {@link FillTransactionReturnType}
+   *
+   * @example
+   * import { createPublicClient, http } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createPublicClient({
+   *   chain: mainnet,
+   *   transport: http(),
+   * })
+   * const result = await client.fillTransaction({
+   *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+   *   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *   value: parseEther('1'),
+   * })
+   */
+  fillTransaction: <
+    chainOverride extends Chain | undefined = undefined,
+    accountOverride extends Account | Address | undefined = undefined,
+  >(
+    args: FillTransactionParameters<
+      chain,
+      account,
+      chainOverride,
+      accountOverride
+    >,
+  ) => Promise<FillTransactionReturnType<chain, chainOverride>>
   /**
    * Returns the balance of an address in wei.
    *
@@ -2039,6 +2078,7 @@ export function publicActions<
     getProof: (args) => getProof(client, args),
     estimateMaxPriorityFeePerGas: (args) =>
       estimateMaxPriorityFeePerGas(client, args),
+    fillTransaction: (args) => fillTransaction(client, args),
     getStorageAt: (args) => getStorageAt(client, args),
     getTransaction: (args) => getTransaction(client, args),
     getTransactionConfirmations: (args) =>

package/clients/decorators/wallet.ts

@@ -1,6 +1,11 @@
 import type { Abi, Address, TypedData } from 'abitype'
 
 import type { Account } from '../../accounts/types.js'
+import {
+  type FillTransactionParameters,
+  type FillTransactionReturnType,
+  fillTransaction,
+} from '../../actions/public/fillTransaction.js'
 import {
   type GetChainIdReturnType,
   getChainId,
@@ -195,6 +200,40 @@ export type WalletActions<
   >(
     args: DeployContractParameters<abi, chain, account, chainOverride>,
   ) => Promise<DeployContractReturnType>
+  /**
+   * Fills a transaction request with the necessary fields to be signed over.
+   *
+   * - Docs: https://viem.sh/docs/actions/public/fillTransaction
+   *
+   * @param client - Client to use
+   * @param parameters - {@link FillTransactionParameters}
+   * @returns The filled transaction. {@link FillTransactionReturnType}
+   *
+   * @example
+   * import { createWalletClient, custom } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createWalletClient({
+   *   chain: mainnet,
+   *   transport: custom(window.ethereum),
+   * })
+   * const result = await client.fillTransaction({
+   *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+   *   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+   *   value: parseEther('1'),
+   * })
+   */
+  fillTransaction: <
+    chainOverride extends Chain | undefined = undefined,
+    accountOverride extends Account | Address | undefined = undefined,
+  >(
+    args: FillTransactionParameters<
+      chain,
+      account,
+      chainOverride,
+      accountOverride
+    >,
+  ) => Promise<FillTransactionReturnType<chain, chainOverride>>
   /**
    * Returns a list of account addresses owned by the wallet or client.
    *
@@ -1146,6 +1185,7 @@ export function walletActions<
   return {
     addChain: (args) => addChain(client, args),
     deployContract: (args) => deployContract(client, args),
+    fillTransaction: (args) => fillTransaction(client, args),
     getAddresses: () => getAddresses(client),
     getCallsStatus: (args) => getCallsStatus(client, args),
     getCapabilities: (args) => getCapabilities(client, args),

package/errors/request.ts

@@ -48,6 +48,7 @@ export type WebSocketRequestErrorType = WebSocketRequestError & {
   name: 'WebSocketRequestError'
 }
 export class WebSocketRequestError extends BaseError {
+  url: string
   constructor({
     body,
     cause,
@@ -68,6 +69,7 @@ export class WebSocketRequestError extends BaseError {
       ].filter(Boolean) as string[],
       name: 'WebSocketRequestError',
     })
+    this.url = url
   }
 }
 
@@ -77,7 +79,7 @@ export type RpcRequestErrorType = RpcRequestError & {
 export class RpcRequestError extends BaseError {
   code: number
   data?: unknown
-
+  url: string
   constructor({
     body,
     error,
@@ -95,6 +97,7 @@ export class RpcRequestError extends BaseError {
     })
     this.code = error.code
     this.data = error.data
+    this.url = url
   }
 }
 
@@ -102,6 +105,7 @@ export type SocketClosedErrorType = SocketClosedError & {
   name: 'SocketClosedError'
 }
 export class SocketClosedError extends BaseError {
+  url: string | undefined
   constructor({
     url,
   }: {
@@ -111,6 +115,7 @@ export class SocketClosedError extends BaseError {
       metaMessages: [url && `URL: ${getUrl(url)}`].filter(Boolean) as string[],
       name: 'SocketClosedError',
     })
+    this.url = url
   }
 }
 
@@ -118,6 +123,7 @@ export type TimeoutErrorType = TimeoutError & {
   name: 'TimeoutError'
 }
 export class TimeoutError extends BaseError {
+  url: string
   constructor({
     body,
     url,
@@ -130,5 +136,6 @@ export class TimeoutError extends BaseError {
       metaMessages: [`URL: ${getUrl(url)}`, `Request body: ${stringify(body)}`],
       name: 'TimeoutError',
     })
+    this.url = url
   }
 }

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.39.3'
+export const version = '2.40.0'

package/index.ts

@@ -135,6 +135,11 @@ export type {
   EstimateMaxPriorityFeePerGasParameters,
   EstimateMaxPriorityFeePerGasReturnType,
 } from './actions/public/estimateMaxPriorityFeePerGas.js'
+export type {
+  FillTransactionErrorType,
+  FillTransactionParameters,
+  FillTransactionReturnType,
+} from './actions/public/fillTransaction.js'
 export type {
   GetBalanceErrorType,
   GetBalanceParameters,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.39.3",
+  "version": "2.40.0",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/types/eip1193.ts

@@ -753,6 +753,21 @@ export type PublicRpcSchema = [
         ]
     ReturnType: Quantity
   },
+  /**
+   * @description Fills a transaction with the necessary data to be signed.
+   *
+   * @example
+   * provider.request({ method: 'eth_fillTransaction', params: [{ from: '0x...', to: '0x...', value: '0x...' }] })
+   * // => '0x...'
+   */
+  {
+    Method: 'eth_fillTransaction'
+    Parameters: [transaction: TransactionRequest]
+    ReturnType: {
+      raw: Hex
+      tx: Transaction
+    }
+  },
   /**
    * @description Returns a collection of historical gas information
    *
@@ -1701,6 +1716,21 @@ export type WalletRpcSchema = [
         ]
     ReturnType: Quantity
   },
+  /**
+   * @description Fills a transaction with the necessary data to be signed.
+   *
+   * @example
+   * provider.request({ method: 'eth_fillTransaction', params: [{ from: '0x...', to: '0x...', value: '0x...' }] })
+   * // => '0x...'
+   */
+  {
+    Method: 'eth_fillTransaction'
+    Parameters: [transaction: TransactionRequest]
+    ReturnType: {
+      raw: Hex
+      tx: Transaction
+    }
+  },
   /**
    * @description Requests that the user provides an Ethereum address to be identified by. Typically causes a browser extension popup to appear.
    * @link https://eips.ethereum.org/EIPS/eip-1102

package/utils/transaction/assertRequest.ts

@@ -14,10 +14,7 @@ import {
   TipAboveFeeCapError,
   type TipAboveFeeCapErrorType,
 } from '../../errors/node.js'
-import {
-  FeeConflictError,
-  type FeeConflictErrorType,
-} from '../../errors/transaction.js'
+import type { FeeConflictErrorType } from '../../errors/transaction.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { Chain } from '../../types/chain.js'
 import type { ExactPartial } from '../../types/utils.js'
@@ -36,23 +33,11 @@ export type AssertRequestErrorType =
   | ErrorType
 
 export function assertRequest(args: AssertRequestParameters) {
-  const {
-    account: account_,
-    gasPrice,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    to,
-  } = args
+  const { account: account_, maxFeePerGas, maxPriorityFeePerGas, to } = args
   const account = account_ ? parseAccount(account_) : undefined
   if (account && !isAddress(account.address))
     throw new InvalidAddressError({ address: account.address })
   if (to && !isAddress(to)) throw new InvalidAddressError({ address: to })
-  if (
-    typeof gasPrice !== 'undefined' &&
-    (typeof maxFeePerGas !== 'undefined' ||
-      typeof maxPriorityFeePerGas !== 'undefined')
-  )
-    throw new FeeConflictError()
 
   if (maxFeePerGas && maxFeePerGas > maxUint256)
     throw new FeeCapTooHighError({ maxFeePerGas })