viem 2.19.9 → 2.20.0

package/account-abstraction/actions/bundler/estimateUserOperationGas.ts

@@ -10,7 +10,12 @@ import type { BaseError } from '../../../errors/base.js'
 import type { ErrorType } from '../../../errors/utils.js'
 import type { Chain } from '../../../types/chain.js'
 import type { Hex } from '../../../types/misc.js'
-import type { Assign, OneOf, Prettify } from '../../../types/utils.js'
+import type {
+  Assign,
+  MaybeRequired,
+  OneOf,
+  Prettify,
+} from '../../../types/utils.js'
 import type { RequestErrorType } from '../../../utils/buildRequest.js'
 import { getAction } from '../../../utils/getAction.js'
 import type { SmartAccount } from '../../accounts/types.js'
@@ -55,26 +60,39 @@ export type EstimateUserOperationGasParameters<
   >,
   _derivedVersion extends
     EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>,
-> = Assign<
-  UserOperationRequest<_derivedVersion>,
-  OneOf<{ calls: UserOperationCalls<Narrow<calls>> } | { callData: Hex }> & {
-    paymaster?:
-      | Address
-      | true
-      | {
-          /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
-          getPaymasterData?: PaymasterActions['getPaymasterData'] | undefined
-          /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
-          getPaymasterStubData?:
-            | PaymasterActions['getPaymasterStubData']
+> = GetSmartAccountParameter<account, accountOverride, false> &
+  (
+    | UserOperation // Accept a full-formed User Operation.
+    | Assign<
+        // Accept a partially-formed User Operation (UserOperationRequest) to be filled.
+        UserOperationRequest<_derivedVersion>,
+        OneOf<
+          { calls: UserOperationCalls<Narrow<calls>> } | { callData: Hex }
+        > & {
+          paymaster?:
+            | Address
+            | true
+            | {
+                /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+                getPaymasterData?:
+                  | PaymasterActions['getPaymasterData']
+                  | undefined
+                /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+                getPaymasterStubData?:
+                  | PaymasterActions['getPaymasterStubData']
+                  | undefined
+              }
             | undefined
+          /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+          paymasterContext?: unknown | undefined
         }
-      | undefined
-    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
-    paymasterContext?: unknown | undefined
-  }
-> &
-  GetSmartAccountParameter<account, accountOverride>
+      >
+  ) &
+  // Allow the EntryPoint address to be overridden, if no Account is provided, it will need to be required.
+  MaybeRequired<
+    { entryPointAddress?: Address },
+    _derivedAccount extends undefined ? true : false
+  >
 
 export type EstimateUserOperationGasReturnType<
   account extends SmartAccount | undefined = SmartAccount | undefined,
@@ -135,26 +153,28 @@ export async function estimateUserOperationGas<
     calls
   >,
 ): Promise<EstimateUserOperationGasReturnType<account, accountOverride>> {
-  const { account: account_ = client.account } = parameters
+  const { account: account_ = client.account, entryPointAddress } = parameters
 
-  if (!account_) throw new AccountNotFoundError()
-  const account = parseAccount(account_)
+  if (!account_ && !parameters.sender) throw new AccountNotFoundError()
+  const account = account_ ? parseAccount(account_) : undefined
 
-  const request = await getAction(
-    client,
-    prepareUserOperation,
-    'prepareUserOperation',
-  )({
-    ...parameters,
-    parameters: ['factory', 'nonce', 'paymaster', 'signature'],
-  } as unknown as PrepareUserOperationParameters)
+  const request = account
+    ? await getAction(
+        client,
+        prepareUserOperation,
+        'prepareUserOperation',
+      )({
+        ...parameters,
+        parameters: ['factory', 'nonce', 'paymaster', 'signature'],
+      } as unknown as PrepareUserOperationParameters)
+    : parameters
 
   try {
     const result = await client.request({
       method: 'eth_estimateUserOperationGas',
       params: [
         formatUserOperationRequest(request as UserOperation),
-        account.entryPoint.address,
+        (entryPointAddress ?? account?.entryPoint?.address)!,
       ],
     })
     return formatUserOperationGas(result) as EstimateUserOperationGasReturnType<
@@ -162,9 +182,10 @@ export async function estimateUserOperationGas<
       accountOverride
     >
   } catch (error) {
+    const calls = (parameters as any).calls
     throw getUserOperationError(error as BaseError, {
       ...(request as UserOperation),
-      calls: parameters.calls,
+      ...(calls ? { calls } : {}),
     })
   }
 }

package/account-abstraction/actions/bundler/sendUserOperation.ts

@@ -7,7 +7,7 @@ import type { BaseError } from '../../../errors/base.js'
 import type { ErrorType } from '../../../errors/utils.js'
 import type { Chain } from '../../../types/chain.js'
 import type { Hex } from '../../../types/misc.js'
-import type { Assign, OneOf } from '../../../types/utils.js'
+import type { Assign, MaybeRequired, OneOf } from '../../../types/utils.js'
 import type { RequestErrorType } from '../../../utils/buildRequest.js'
 import { getAction } from '../../../utils/getAction.js'
 import type { SmartAccount } from '../../accounts/types.js'
@@ -47,27 +47,39 @@ export type SendUserOperationParameters<
   >,
   _derivedVersion extends
     EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>,
-> = Assign<
-  UserOperationRequest<_derivedVersion>,
-  OneOf<{ calls: UserOperationCalls<Narrow<calls>> } | { callData: Hex }> & {
-    paymaster?:
-      | Address
-      | true
-      | {
-          /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
-          getPaymasterData?: PaymasterActions['getPaymasterData'] | undefined
-          /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
-          getPaymasterStubData?:
-            | PaymasterActions['getPaymasterStubData']
+> = GetSmartAccountParameter<account, accountOverride, false> &
+  (
+    | UserOperation // Accept a full-formed User Operation.
+    | Assign<
+        // Accept a partially-formed User Operation (UserOperationRequest) to be filled.
+        UserOperationRequest<_derivedVersion>,
+        OneOf<
+          { calls: UserOperationCalls<Narrow<calls>> } | { callData: Hex }
+        > & {
+          paymaster?:
+            | Address
+            | true
+            | {
+                /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+                getPaymasterData?:
+                  | PaymasterActions['getPaymasterData']
+                  | undefined
+                /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+                getPaymasterStubData?:
+                  | PaymasterActions['getPaymasterStubData']
+                  | undefined
+              }
             | undefined
+          /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+          paymasterContext?: unknown | undefined
         }
-      | undefined
-    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
-    paymasterContext?: unknown
-  }
-> &
-  GetSmartAccountParameter<account, accountOverride>
-
+      >
+  ) &
+  // Allow the EntryPoint address to be overridden, if no Account is provided, it will need to be required.
+  MaybeRequired<
+    { entryPointAddress?: Address },
+    _derivedAccount extends undefined ? true : false
+  >
 export type SendUserOperationReturnType = Hex
 
 export type SendUserOperationErrorType =
@@ -111,20 +123,21 @@ export async function sendUserOperation<
   client: Client<Transport, Chain | undefined, account>,
   parameters: SendUserOperationParameters<account, accountOverride, calls>,
 ) {
-  const { account: account_ = client.account } = parameters
+  const { account: account_ = client.account, entryPointAddress } = parameters
 
-  if (!account_) throw new AccountNotFoundError()
-  const account = parseAccount(account_)
+  if (!account_ && !parameters.sender) throw new AccountNotFoundError()
+  const account = account_ ? parseAccount(account_) : undefined
 
-  const request = await getAction(
-    client,
-    prepareUserOperation,
-    'prepareUserOperation',
-  )(parameters as unknown as PrepareUserOperationParameters)
+  const request = account
+    ? await getAction(
+        client,
+        prepareUserOperation,
+        'prepareUserOperation',
+      )(parameters as unknown as PrepareUserOperationParameters)
+    : parameters
 
-  const signature =
-    parameters.signature ||
-    (await account.signUserOperation(request as UserOperation))
+  const signature = (parameters.signature ||
+    (await account?.signUserOperation(request as UserOperation)))!
 
   const rpcParameters = formatUserOperationRequest({
     ...request,
@@ -135,14 +148,18 @@ export async function sendUserOperation<
     return await client.request(
       {
         method: 'eth_sendUserOperation',
-        params: [rpcParameters, account.entryPoint.address],
+        params: [
+          rpcParameters,
+          (entryPointAddress ?? account?.entryPoint.address)!,
+        ],
       },
       { retryCount: 0 },
     )
   } catch (error) {
+    const calls = (parameters as any).calls
     throw getUserOperationError(error as BaseError, {
       ...(request as UserOperation),
-      calls: parameters.calls,
+      ...(calls ? { calls } : {}),
       signature,
     })
   }

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.19.9'
+export const version = '2.20.0'

package/experimental/eip5792/actions/sendCalls.ts

@@ -1,3 +1,4 @@
+import type { AbiStateMutability, Address, Narrow } from 'abitype'
 import { parseAccount } from '../../../accounts/utils/parseAccount.js'
 import type { Client } from '../../../clients/createClient.js'
 import type { Transport } from '../../../clients/transports/createTransport.js'
@@ -6,13 +7,16 @@ import type { BaseError } from '../../../errors/base.js'
 import { ChainNotFoundError } from '../../../errors/chain.js'
 import type { ErrorType } from '../../../errors/utils.js'
 import type { Account, GetAccountParameter } from '../../../types/account.js'
-import type { Chain, GetChainParameter } from '../../../types/chain.js'
+import type { Chain, DeriveChain } from '../../../types/chain.js'
+import type { ContractFunctionParameters } from '../../../types/contract.js'
 import type {
   WalletCapabilities,
   WalletSendCallsParameters,
 } from '../../../types/eip1193.js'
 import type { Hex } from '../../../types/misc.js'
-import type { OneOf } from '../../../types/utils.js'
+import type { GetMulticallContractParameters } from '../../../types/multicall.js'
+import type { MaybeRequired, OneOf, Prettify } from '../../../types/utils.js'
+import { encodeFunctionData } from '../../../utils/abi/encodeFunctionData.js'
 import type { RequestErrorType } from '../../../utils/buildRequest.js'
 import { numberToHex } from '../../../utils/encoding/toHex.js'
 import { getTransactionError } from '../../../utils/errors/getTransactionError.js'
@@ -21,23 +25,17 @@ export type SendCallsParameters<
   chain extends Chain | undefined = Chain | undefined,
   account extends Account | undefined = Account | undefined,
   chainOverride extends Chain | undefined = Chain | undefined,
+  calls extends readonly unknown[] = readonly unknown[],
+  //
+  _chain extends Chain | undefined = DeriveChain<chain, chainOverride>,
 > = {
-  calls: OneOf<
-    | {
-        to: Hex
-        data?: Hex | undefined
-        value?: bigint | undefined
-      }
-    | {
-        data: Hex
-      }
-  >[]
+  chain?: chainOverride | Chain | undefined
+  calls: Calls<Narrow<calls>, _chain>
   capabilities?:
     | WalletSendCallsParameters<WalletCapabilities>[number]['capabilities']
     | undefined
   version?: WalletSendCallsParameters[number]['version'] | undefined
-} & GetAccountParameter<account> &
-  GetChainParameter<chain, chainOverride>
+} & GetAccountParameter<account>
 
 export type SendCallsReturnType = string
 
@@ -76,16 +74,16 @@ export type SendCallsErrorType = RequestErrorType | ErrorType
  * })
  */
 export async function sendCalls<
+  const calls extends readonly unknown[],
   chain extends Chain | undefined,
   account extends Account | undefined = undefined,
   chainOverride extends Chain | undefined = undefined,
 >(
   client: Client<Transport, chain, account>,
-  parameters: SendCallsParameters<chain, account, chainOverride>,
+  parameters: SendCallsParameters<chain, account, chainOverride, calls>,
 ): Promise<SendCallsReturnType> {
   const {
     account: account_ = client.account,
-    calls,
     capabilities,
     chain = client.chain,
     version = '1.0',
@@ -97,7 +95,27 @@ export async function sendCalls<
     })
   const account = parseAccount(account_)
 
-  if (!chain) throw new ChainNotFoundError()
+  const calls = parameters.calls.map((call_: unknown) => {
+    const call = call_ as Call
+
+    const chainId = call.chain?.id ?? call.chainId ?? chain?.id
+    if (!chainId) throw new ChainNotFoundError()
+
+    const data = call.abi
+      ? encodeFunctionData({
+          abi: call.abi,
+          functionName: call.functionName,
+          args: call.args,
+        })
+      : call.data
+
+    return {
+      chainId: numberToHex(chainId),
+      data,
+      to: call.to,
+      value: call.value ? numberToHex(call.value) : undefined,
+    }
+  })
 
   try {
     return await client.request(
@@ -105,10 +123,7 @@ export async function sendCalls<
         method: 'wallet_sendCalls',
         params: [
           {
-            calls: calls.map((call) => ({
-              ...call,
-              value: call.value ? numberToHex(call.value) : undefined,
-            })) as any,
+            calls,
             capabilities,
             chainId: numberToHex(chain!.id),
             from: account.address,
@@ -126,3 +141,74 @@ export async function sendCalls<
     })
   }
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+type RawCall = { data?: Hex; to?: Address; value?: bigint }
+
+type Call<
+  chain extends Chain | undefined = Chain | undefined,
+  contractFunctionParameters = Omit<ContractFunctionParameters, 'address'>,
+> = OneOf<
+  | (contractFunctionParameters & {
+      to: Address
+      value?: bigint | undefined
+    })
+  | RawCall
+> &
+  OneOf<
+    | MaybeRequired<
+        { chain?: Chain | undefined },
+        chain extends Chain ? false : true
+      >
+    | MaybeRequired<{ chainId?: number }, chain extends Chain ? false : true>
+  >
+
+type Calls<
+  calls extends readonly unknown[],
+  chain extends Chain | undefined,
+  ///
+  result extends readonly any[] = [],
+> = calls extends readonly [] // no calls, return empty
+  ? readonly []
+  : calls extends readonly [infer call] // one call left before returning `result`
+    ? readonly [
+        ...result,
+        Prettify<
+          Call<
+            chain,
+            Omit<
+              GetMulticallContractParameters<call, AbiStateMutability>,
+              'address'
+            >
+          >
+        >,
+      ]
+    : calls extends readonly [infer call, ...infer rest] // grab first call and recurse through `rest`
+      ? Calls<
+          [...rest],
+          chain,
+          [
+            ...result,
+            Prettify<
+              Call<
+                chain,
+                Omit<
+                  GetMulticallContractParameters<call, AbiStateMutability>,
+                  'address'
+                >
+              >
+            >,
+          ]
+        >
+      : readonly unknown[] extends calls
+        ? calls
+        : // If `calls` is *some* array but we couldn't assign `unknown[]` to it, then it must hold some known/homogenous type!
+          // use this to infer the param types in the case of Array.map() argument
+          calls extends readonly (infer call extends Call<
+              chain,
+              Omit<ContractFunctionParameters, 'address'>
+            >)[]
+          ? readonly Prettify<call>[]
+          : // Fallback
+            readonly Call<chain, Omit<ContractFunctionParameters, 'address'>>[]

package/experimental/eip5792/actions/writeContracts.ts

@@ -50,6 +50,8 @@ export type WriteContractsErrorType =
   | ErrorType
 
 /**
+ * @deprecated Use {@link sendCalls} instead. See https://viem.sh/experimental/eip5792/sendCalls#contract-calls.
+ *
  * Requests for the wallet to sign and broadcast a batch of write contract calls (transactions) to the network.
  *
  * - Docs: https://viem.sh/experimental/eip5792/writeContracts

package/op-stack/actions/getTimeToFinalize.ts

@@ -128,11 +128,18 @@ export async function getTimeToFinalize<
     return { period: Number(period), seconds, timestamp }
   }
 
+  const numProofSubmitters = await readContract(client, {
+    abi: portal2Abi,
+    address: portalAddress,
+    functionName: 'numProofSubmitters',
+    args: [withdrawalHash],
+  }).catch(() => 1n)
+
   const proofSubmitter = await readContract(client, {
     abi: portal2Abi,
     address: portalAddress,
     functionName: 'proofSubmitters',
-    args: [withdrawalHash, 0n],
+    args: [withdrawalHash, numProofSubmitters - 1n],
   }).catch(() => undefined)
 
   const [[_disputeGameProxy, proveTimestamp], proofMaturityDelaySeconds] =

package/op-stack/actions/getWithdrawalStatus.ts

@@ -197,11 +197,18 @@ export async function getWithdrawalStatus<
     return seconds > 0 ? 'waiting-to-finalize' : 'ready-to-finalize'
   }
 
+  const numProofSubmitters = await readContract(client, {
+    abi: portal2Abi,
+    address: portalAddress,
+    functionName: 'numProofSubmitters',
+    args: [withdrawal.withdrawalHash],
+  }).catch(() => 1n)
+
   const proofSubmitter = await readContract(client, {
     abi: portal2Abi,
     address: portalAddress,
     functionName: 'proofSubmitters',
-    args: [withdrawal.withdrawalHash, 0n],
+    args: [withdrawal.withdrawalHash, numProofSubmitters - 1n],
   }).catch(() => withdrawal.sender)
 
   const [disputeGameResult, checkWithdrawalResult, finalizedResult] =

package/package.json

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

package/types/eip1193.ts

@@ -207,18 +207,15 @@ export type WalletSendCallsParameters<
   quantity extends Quantity | bigint = Quantity,
 > = [
   {
-    calls: OneOf<
-      | {
-          to: Address
-          data?: Hex | undefined
-          value?: quantity | undefined
-        }
-      | {
-          data: Hex
-        }
-    >[]
+    calls: readonly {
+      chainId?: chainId | undefined
+      to?: Address | undefined
+      data?: Hex | undefined
+      value?: quantity | undefined
+    }[]
     capabilities?: capabilities | undefined
-    chainId: chainId
+    /** @deprecated Use `chainId` on `calls` instead. */
+    chainId?: chainId | undefined
     from: Address
     version: string
   },