Log chainId, blockNumber, blockTag to ContractFunctionExecutionError and siblings

[Rubilmax]

It is helpful to quickly isolate and reproduce failing rpc calls in an environment with a high workload.

Here is the patch we currently use to include these debug values ourselves, on viem@2.46.2:

diff --git a/_cjs/actions/public/estimateContractGas.js b/_cjs/actions/public/estimateContractGas.js
index e33ea8ed4ddd25f804cc565602d02d8ebe976186..a99359cd574194bf4b777eea8322bb7dbc6dff10 100644
--- a/_cjs/actions/public/estimateContractGas.js
+++ b/_cjs/actions/public/estimateContractGas.js
@@ -29,6 +29,9 @@ async function estimateContractGas(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: request.blockNumber,
+            blockTag: request.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/estimateContractGas',
             functionName,
             sender: account?.address,
diff --git a/_cjs/actions/public/multicall.js b/_cjs/actions/public/multicall.js
index 966a22bc1ceb4dd7daf292c61be84b3f7226aff0..cee42b209023d560f03f4537fb037426a9be55e4 100644
--- a/_cjs/actions/public/multicall.js
+++ b/_cjs/actions/public/multicall.js
@@ -59,6 +59,9 @@ async function multicall(client, parameters) {
                 abi,
                 address,
                 args,
+                blockNumber,
+                blockTag,
+                chainId: client.chain?.id,
                 docsPath: '/docs/contract/multicall',
                 functionName,
                 sender: account,
@@ -127,6 +130,9 @@ async function multicall(client, parameters) {
                     abi,
                     address,
                     args,
+                    blockNumber,
+                    blockTag,
+                    chainId: client.chain?.id,
                     docsPath: '/docs/contract/multicall',
                     functionName,
                 });
diff --git a/_cjs/actions/public/readContract.js b/_cjs/actions/public/readContract.js
index c8f057fa4a2a6dee6acc4404a6948719b63d02f2..bc4d5aef7d83f678bf6a26a0c25e7a62b4527685 100644
--- a/_cjs/actions/public/readContract.js
+++ b/_cjs/actions/public/readContract.js
@@ -31,6 +31,9 @@ async function readContract(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: rest.blockNumber,
+            blockTag: rest.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/readContract',
             functionName,
         });
diff --git a/_cjs/actions/public/simulateBlocks.js b/_cjs/actions/public/simulateBlocks.js
index d06e42c32a0b77ea00b4c1a8ae7f174eeec7caa0..6aff439ff209ef4372fff76030bd18beb2d50205 100644
--- a/_cjs/actions/public/simulateBlocks.js
+++ b/_cjs/actions/public/simulateBlocks.js
@@ -87,6 +87,9 @@ async function simulateBlocks(client, parameters) {
                         abi: (abi ?? []),
                         address: to ?? '0x',
                         args,
+                        blockNumber,
+                        blockTag,
+                        chainId: client.chain?.id,
                         functionName: functionName ?? '<unknown>',
                     });
                 })();
diff --git a/_cjs/actions/public/simulateContract.js b/_cjs/actions/public/simulateContract.js
index c759b850428638d4fdbff2d6832eaf3de8e1a27e..761a8654d64ec04c27ad68728b8abe6b14dd81d0 100644
--- a/_cjs/actions/public/simulateContract.js
+++ b/_cjs/actions/public/simulateContract.js
@@ -48,6 +48,9 @@ async function simulateContract(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: callRequest.blockNumber,
+            blockTag: callRequest.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/simulateContract',
             functionName,
             sender: account?.address,
diff --git a/_cjs/errors/contract.js b/_cjs/errors/contract.js
index c09be42f92fcc50e11ca75f36ba3b313aff21d7c..2341fdeb9139884592c9ca6b9f756407b9aec7d8 100644
--- a/_cjs/errors/contract.js
+++ b/_cjs/errors/contract.js
@@ -55,7 +55,7 @@ class CallExecutionError extends base_js_1.BaseError {
 }
 exports.CallExecutionError = CallExecutionError;
 class ContractFunctionExecutionError extends base_js_1.BaseError {
-    constructor(cause, { abi, args, contractAddress, docsPath, functionName, sender, }) {
+    constructor(cause, { abi, args, blockNumber, blockTag, chainId, contractAddress, docsPath, functionName, sender, }) {
         const abiItem = (0, getAbiItem_js_1.getAbiItem)({ abi, args, name: functionName });
         const formattedArgs = abiItem
             ? (0, formatAbiItemWithArgs_js_1.formatAbiItemWithArgs)({
@@ -69,6 +69,9 @@ class ContractFunctionExecutionError extends base_js_1.BaseError {
             ? (0, formatAbiItem_js_1.formatAbiItem)(abiItem, { includeName: true })
             : undefined;
         const prettyArgs = (0, transaction_js_1.prettyPrint)({
+            chainId: chainId && `${chainId}`,
+            blockNumber: blockNumber && `${blockNumber}`,
+            blockTag,
             address: contractAddress && (0, utils_js_1.getContractAddress)(contractAddress),
             function: functionWithParams,
             args: formattedArgs &&
@@ -133,7 +136,10 @@ class ContractFunctionExecutionError extends base_js_1.BaseError {
         });
         this.abi = abi;
         this.args = args;
+        this.blockNumber = blockNumber;
+        this.blockTag = blockTag;
         this.cause = cause;
+        this.chainId = chainId;
         this.contractAddress = contractAddress;
         this.functionName = functionName;
         this.sender = sender;
diff --git a/_cjs/utils/errors/getContractError.js b/_cjs/utils/errors/getContractError.js
index d9c40ff8b56a3911875ecc884d556d68fa31e8d9..bd95b66bc36fd03932b1cb7f658f6fa739a316fb 100644
--- a/_cjs/utils/errors/getContractError.js
+++ b/_cjs/utils/errors/getContractError.js
@@ -7,7 +7,7 @@ const contract_js_1 = require("../../errors/contract.js");
 const request_js_1 = require("../../errors/request.js");
 const rpc_js_1 = require("../../errors/rpc.js");
 const EXECUTION_REVERTED_ERROR_CODE = 3;
-function getContractError(err, { abi, address, args, docsPath, functionName, sender, }) {
+function getContractError(err, { abi, address, args, blockNumber, blockTag, chainId, docsPath, functionName, sender, }) {
     const error = (err instanceof contract_js_1.RawContractError
         ? err
         : err instanceof base_js_1.BaseError
@@ -36,6 +36,9 @@ function getContractError(err, { abi, address, args, docsPath, functionName, sen
     return new contract_js_1.ContractFunctionExecutionError(cause, {
         abi,
         args,
+        blockNumber,
+        blockTag,
+        chainId,
         contractAddress: address,
         docsPath,
         functionName,
diff --git a/_esm/actions/public/estimateContractGas.js b/_esm/actions/public/estimateContractGas.js
index cbae21c06e28a395ec3419174e7bcf4d60d8ffa1..68a4576a54fb3c75f0bf2da9ff7a0a4dc49eaf62 100644
--- a/_esm/actions/public/estimateContractGas.js
+++ b/_esm/actions/public/estimateContractGas.js
@@ -53,6 +53,9 @@ export async function estimateContractGas(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: request.blockNumber,
+            blockTag: request.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/estimateContractGas',
             functionName,
             sender: account?.address,
diff --git a/_esm/actions/public/multicall.js b/_esm/actions/public/multicall.js
index 9cdee6f91ca09a2ac68d5aab3bfd098788560c29..0f888f402b518e510df6ff6b86dd486add92dc11 100644
--- a/_esm/actions/public/multicall.js
+++ b/_esm/actions/public/multicall.js
@@ -100,6 +100,9 @@ export async function multicall(client, parameters) {
                 abi,
                 address,
                 args,
+                blockNumber,
+                blockTag,
+                chainId: client.chain?.id,
                 docsPath: '/docs/contract/multicall',
                 functionName,
                 sender: account,
@@ -175,6 +178,9 @@ export async function multicall(client, parameters) {
                     abi,
                     address,
                     args,
+                    blockNumber,
+                    blockTag,
+                    chainId: client.chain?.id,
                     docsPath: '/docs/contract/multicall',
                     functionName,
                 });
diff --git a/_esm/actions/public/readContract.js b/_esm/actions/public/readContract.js
index a0f39f85243959822d21305c8db6e50efc539ca3..2c9534e58a3515c454f5ad7ffc4de77b8de1c198 100644
--- a/_esm/actions/public/readContract.js
+++ b/_esm/actions/public/readContract.js
@@ -59,6 +59,9 @@ export async function readContract(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: rest.blockNumber,
+            blockTag: rest.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/readContract',
             functionName,
         });
diff --git a/_esm/actions/public/simulateBlocks.js b/_esm/actions/public/simulateBlocks.js
index 86bf4d95316b7b06c4c689e6452e77ee3bb676a1..b6cbbd234bbfee3e56eadc9067ba218dc7a36c01 100644
--- a/_esm/actions/public/simulateBlocks.js
+++ b/_esm/actions/public/simulateBlocks.js
@@ -127,6 +127,9 @@ export async function simulateBlocks(client, parameters) {
                         abi: (abi ?? []),
                         address: to ?? '0x',
                         args,
+                        blockNumber,
+                        blockTag,
+                        chainId: client.chain?.id,
                         functionName: functionName ?? '<unknown>',
                     });
                 })();
diff --git a/_esm/actions/public/simulateContract.js b/_esm/actions/public/simulateContract.js
index f3b814b6730895aa9a9370bd5df9af0c4ad30005..e7cdab8bd087a010a5309ef228fb29c5aad5b5ff 100644
--- a/_esm/actions/public/simulateContract.js
+++ b/_esm/actions/public/simulateContract.js
@@ -76,6 +76,9 @@ export async function simulateContract(client, parameters) {
             abi,
             address,
             args,
+            blockNumber: callRequest.blockNumber,
+            blockTag: callRequest.blockTag,
+            chainId: client.chain?.id,
             docsPath: '/docs/contract/simulateContract',
             functionName,
             sender: account?.address,
diff --git a/_esm/errors/contract.js b/_esm/errors/contract.js
index 7423f725bdd5f7b218377070970f4a3c223eb969..15e0d81056665e0976f5b5be170bc5339ff21c10 100644
--- a/_esm/errors/contract.js
+++ b/_esm/errors/contract.js
@@ -51,7 +51,7 @@ export class CallExecutionError extends BaseError {
     }
 }
 export class ContractFunctionExecutionError extends BaseError {
-    constructor(cause, { abi, args, contractAddress, docsPath, functionName, sender, }) {
+    constructor(cause, { abi, args, blockNumber, blockTag, chainId, contractAddress, docsPath, functionName, sender, }) {
         const abiItem = getAbiItem({ abi, args, name: functionName });
         const formattedArgs = abiItem
             ? formatAbiItemWithArgs({
@@ -65,6 +65,9 @@ export class ContractFunctionExecutionError extends BaseError {
             ? formatAbiItem(abiItem, { includeName: true })
             : undefined;
         const prettyArgs = prettyPrint({
+            chainId: chainId && `${chainId}`,
+            blockNumber: blockNumber && `${blockNumber}`,
+            blockTag,
             address: contractAddress && getContractAddress(contractAddress),
             function: functionWithParams,
             args: formattedArgs &&
@@ -129,7 +132,10 @@ export class ContractFunctionExecutionError extends BaseError {
         });
         this.abi = abi;
         this.args = args;
+        this.blockNumber = blockNumber;
+        this.blockTag = blockTag;
         this.cause = cause;
+        this.chainId = chainId;
         this.contractAddress = contractAddress;
         this.functionName = functionName;
         this.sender = sender;
diff --git a/_esm/utils/errors/getContractError.js b/_esm/utils/errors/getContractError.js
index 51b84a8568e32a9c80012412990270c3eca1bbf5..27d9051192774e338253f7a1c3bf78702259ee9e 100644
--- a/_esm/utils/errors/getContractError.js
+++ b/_esm/utils/errors/getContractError.js
@@ -4,7 +4,7 @@ import { ContractFunctionExecutionError, ContractFunctionRevertedError, Contract
 import { RpcRequestError } from '../../errors/request.js';
 import { InternalRpcError, InvalidInputRpcError } from '../../errors/rpc.js';
 const EXECUTION_REVERTED_ERROR_CODE = 3;
-export function getContractError(err, { abi, address, args, docsPath, functionName, sender, }) {
+export function getContractError(err, { abi, address, args, blockNumber, blockTag, chainId, docsPath, functionName, sender, }) {
     const error = (err instanceof RawContractError
         ? err
         : err instanceof BaseError
@@ -33,6 +33,9 @@ export function getContractError(err, { abi, address, args, docsPath, functionNa
     return new ContractFunctionExecutionError(cause, {
         abi,
         args,
+        blockNumber,
+        blockTag,
+        chainId,
         contractAddress: address,
         docsPath,
         functionName,
diff --git a/actions/public/estimateContractGas.ts b/actions/public/estimateContractGas.ts
index a79cdcf915df88ae2fb69609d9ef2f5e5866562a..eab56a5efb502eeef68db45f2e3b421ed3528b14 100644
--- a/actions/public/estimateContractGas.ts
+++ b/actions/public/estimateContractGas.ts
@@ -139,6 +139,9 @@ export async function estimateContractGas<
       abi,
       address,
       args,
+      blockNumber: request.blockNumber,
+      blockTag: request.blockTag,
+      chainId: client.chain?.id,
       docsPath: '/docs/contract/estimateContractGas',
       functionName,
       sender: account?.address,
diff --git a/actions/public/multicall.ts b/actions/public/multicall.ts
index abd853285aa0434e4b264e83f7bf3d95b7364e25..cc82f625848d29de81866c8f565b3c32f1a1532c 100644
--- a/actions/public/multicall.ts
+++ b/actions/public/multicall.ts
@@ -207,6 +207,9 @@ export async function multicall<
         abi,
         address,
         args,
+        blockNumber,
+        blockTag,
+        chainId: client.chain?.id,
         docsPath: '/docs/contract/multicall',
         functionName,
         sender: account,
@@ -294,6 +297,9 @@ export async function multicall<
           abi,
           address,
           args,
+          blockNumber,
+          blockTag,
+          chainId: client.chain?.id,
           docsPath: '/docs/contract/multicall',
           functionName,
         })
diff --git a/actions/public/readContract.ts b/actions/public/readContract.ts
index 352400848f0cae53925702d72e207fcbd24a000a..98d5c0015fabebaab7b15f0eb3ab24409959bc6f 100644
--- a/actions/public/readContract.ts
+++ b/actions/public/readContract.ts
@@ -139,6 +139,9 @@ export async function readContract<
       abi,
       address,
       args,
+      blockNumber: rest.blockNumber,
+      blockTag: rest.blockTag,
+      chainId: client.chain?.id,
       docsPath: '/docs/contract/readContract',
       functionName,
     })
diff --git a/actions/public/simulateBlocks.ts b/actions/public/simulateBlocks.ts
index 7f33e9e5f7fcc59c0c4176a7a098b6b869457b0b..654b7a27d92bfef4fc2517643dd143e85c249743 100644
--- a/actions/public/simulateBlocks.ts
+++ b/actions/public/simulateBlocks.ts
@@ -271,6 +271,9 @@ export async function simulateBlocks<
             abi: (abi ?? []) as Abi,
             address: to ?? '0x',
             args,
+            blockNumber,
+            blockTag,
+            chainId: client.chain?.id,
             functionName: functionName ?? '<unknown>',
           })
         })()
diff --git a/actions/public/simulateContract.ts b/actions/public/simulateContract.ts
index 8af4ed927db7cd53a219a04e49a6ccc0190c5985..c82ce911b2f321c5178049e3d3a4c54737719a41 100644
--- a/actions/public/simulateContract.ts
+++ b/actions/public/simulateContract.ts
@@ -317,6 +317,9 @@ export async function simulateContract<
       abi,
       address,
       args,
+      blockNumber: callRequest.blockNumber,
+      blockTag: callRequest.blockTag,
+      chainId: client.chain?.id,
       docsPath: '/docs/contract/simulateContract',
       functionName,
       sender: account?.address,
diff --git a/errors/contract.ts b/errors/contract.ts
index b85be5ec046b8c8205c96fe0b8635b14ae08484e..0b7855c7f05441541cfd1870e9e5f130a06e4144 100644
--- a/errors/contract.ts
+++ b/errors/contract.ts
@@ -92,7 +92,10 @@ export type ContractFunctionExecutionErrorType =
 export class ContractFunctionExecutionError extends BaseError {
   abi: Abi
   args?: unknown[] | undefined
+  blockNumber?: bigint | undefined
+  blockTag?: string | undefined
   override cause: BaseError
+  chainId?: number | undefined
   contractAddress?: Address | undefined
   formattedArgs?: string | undefined
   functionName: string
@@ -103,6 +106,9 @@ export class ContractFunctionExecutionError extends BaseError {
     {
       abi,
       args,
+      blockNumber,
+      blockTag,
+      chainId,
       contractAddress,
       docsPath,
       functionName,
@@ -110,6 +116,9 @@ export class ContractFunctionExecutionError extends BaseError {
     }: {
       abi: Abi
       args?: any | undefined
+      blockNumber?: bigint | undefined
+      blockTag?: string | undefined
+      chainId?: number | undefined
       contractAddress?: Address | undefined
       docsPath?: string | undefined
       functionName: string
@@ -130,6 +139,9 @@ export class ContractFunctionExecutionError extends BaseError {
       : undefined
 
     const prettyArgs = prettyPrint({
+      chainId: chainId && `${chainId}`,
+      blockNumber: blockNumber && `${blockNumber}`,
+      blockTag,
       address: contractAddress && getContractAddress(contractAddress),
       function: functionWithParams,
       args:
@@ -157,7 +169,10 @@ export class ContractFunctionExecutionError extends BaseError {
     )
     this.abi = abi
     this.args = args
+    this.blockNumber = blockNumber
+    this.blockTag = blockTag
     this.cause = cause
+    this.chainId = chainId
     this.contractAddress = contractAddress
     this.functionName = functionName
     this.sender = sender
diff --git a/utils/errors/getContractError.ts b/utils/errors/getContractError.ts
index 849e57751c1633e0e48e7cd39004251118f47be8..4f15ccf318e490dbb7db1001302b973b8c59a2ee 100644
--- a/utils/errors/getContractError.ts
+++ b/utils/errors/getContractError.ts
@@ -33,6 +33,9 @@ export function getContractError<err extends ErrorType<string>>(
     abi,
     address,
     args,
+    blockNumber,
+    blockTag,
+    chainId,
     docsPath,
     functionName,
     sender,
@@ -40,6 +43,9 @@ export function getContractError<err extends ErrorType<string>>(
     abi: Abi
     args: any
     address?: Address | undefined
+    blockNumber?: bigint | undefined
+    blockTag?: string | undefined
+    chainId?: number | undefined
     docsPath?: string | undefined
     functionName: string
     sender?: Address | undefined
@@ -81,6 +87,9 @@ export function getContractError<err extends ErrorType<string>>(
   return new ContractFunctionExecutionError(cause as BaseError, {
     abi,
     args,
+    blockNumber,
+    blockTag,
+    chainId,
     contractAddress: address,
     docsPath,
     functionName,