viem 2.23.3 → 2.23.4

package/op-stack/actions/getWithdrawalStatus.ts

@@ -1,3 +1,4 @@
+import type { Address } from 'abitype'
 import {
   type ReadContractErrorType,
   readContract,
@@ -12,6 +13,7 @@ import type {
   DeriveChain,
   GetChainParameter,
 } from '../../types/chain.js'
+import type { Hash } from '../../types/misc.js'
 import type { TransactionReceipt } from '../../types/transaction.js'
 import type { OneOf } from '../../types/utils.js'
 import { portal2Abi, portalAbi } from '../abis.js'
@@ -62,13 +64,33 @@ export type GetWithdrawalStatusParameters<
      * @default 100
      */
     gameLimit?: number
-    /**
-     * The relative index of the withdrawal in the transaction receipt logs.
-     * @default 0
-     */
-    logIndex?: number
-    receipt: TransactionReceipt
-  }
+  } & OneOf<
+    | {
+        /**
+         * The relative index of the withdrawal in the transaction receipt logs.
+         * @default 0
+         */
+        logIndex?: number
+        /**
+         * The transaction receipt of the withdrawal.
+         */
+        receipt: TransactionReceipt
+      }
+    | {
+        /**
+         * The L2 block number of the withdrawal.
+         */
+        l2BlockNumber: bigint
+        /**
+         * The sender of the withdrawal.
+         */
+        sender: Address
+        /**
+         * The hash of the withdrawal.
+         */
+        withdrawalHash: Hash
+      }
+  >
 export type GetWithdrawalStatusReturnType =
   | 'waiting-to-prove'
   | 'ready-to-prove'
@@ -138,12 +160,22 @@ export async function getWithdrawalStatus<
     return Object.values(targetChain.contracts.portal)[0].address
   })()
 
-  const withdrawal = getWithdrawals(receipt)[logIndex]
+  const l2BlockNumber = receipt?.blockNumber ?? parameters.l2BlockNumber
 
-  if (!withdrawal)
-    throw new ReceiptContainsNoWithdrawalsError({
-      hash: receipt.transactionHash,
-    })
+  const withdrawal = (() => {
+    if (receipt) {
+      const withdrawal = getWithdrawals({ logs: receipt.logs })[logIndex]
+      if (!withdrawal)
+        throw new ReceiptContainsNoWithdrawalsError({
+          hash: receipt.transactionHash,
+        })
+      return withdrawal
+    }
+    return {
+      sender: parameters.sender,
+      withdrawalHash: parameters.withdrawalHash,
+    }
+  })()
 
   const portalVersion = await getPortalVersion(
     client,
@@ -156,7 +188,7 @@ export async function getWithdrawalStatus<
       await Promise.allSettled([
         getL2Output(client, {
           ...parameters,
-          l2BlockNumber: receipt.blockNumber,
+          l2BlockNumber,
         } as GetL2OutputParameters),
         readContract(client, {
           abi: portalAbi,
@@ -221,7 +253,7 @@ export async function getWithdrawalStatus<
     await Promise.allSettled([
       getGame(client, {
         ...parameters,
-        l2BlockNumber: receipt.blockNumber,
+        l2BlockNumber,
         limit: gameLimit,
       } as GetGameParameters),
       readContract(client, {

package/package.json

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

package/types/eip1193.ts

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