fix: propagate account downstream

Author: jxom

src/actions/public/estimateGas.test.ts

@@ -13,6 +13,7 @@ import { encodeFunctionData } from '../../utils/index.js'
 import { parseEther } from '../../utils/unit/parseEther.js'
 import { parseGwei } from '../../utils/unit/parseGwei.js'
 import { reset } from '../test/reset.js'
+import * as prepareTransactionRequestModule from '../wallet/prepareTransactionRequest.js'
 import { signAuthorization } from '../wallet/signAuthorization.js'
 import { estimateGas } from './estimateGas.js'
 import * as getBlock from './getBlock.js'
@@ -190,6 +191,26 @@ test('args: override', async () => {
   ).toMatchInlineSnapshot('51594n')
 })
 
+test('args: prepare', async () => {
+  const prepareTransactionRequestSpy = vi.spyOn(
+    prepareTransactionRequestModule,
+    'prepareTransactionRequest',
+  )
+
+  expect(
+    await estimateGas(client, {
+      account: accounts[0].address,
+      to: accounts[1].address,
+      value: parseEther('1'),
+      prepare: false,
+    }),
+  ).toMatchInlineSnapshot('21000n')
+
+  expect(prepareTransactionRequestSpy).not.toHaveBeenCalled()
+
+  vi.restoreAllMocks()
+})
+
 test('error: cannot infer `to` from `authorizationList`', async () => {
   await expect(() =>
     estimateGas(client, {

src/actions/public/estimateGas.ts

@@ -38,13 +38,18 @@ import {
 } from '../../utils/transaction/assertRequest.js'
 import {
   type PrepareTransactionRequestParameters,
+  type PrepareTransactionRequestParameterType,
   prepareTransactionRequest,
 } from '../wallet/prepareTransactionRequest.js'
 
 export type EstimateGasParameters<
   chain extends Chain | undefined = Chain | undefined,
 > = UnionOmit<FormattedEstimateGas<chain>, 'from'> & {
   account?: Account | Address | undefined
+  prepare?:
+    | boolean
+    | readonly PrepareTransactionRequestParameterType[]
+    | undefined
   stateOverride?: StateOverride | undefined
 } & (
     | {
@@ -106,7 +111,7 @@ export async function estimateGas<
   client: Client<Transport, chain, account>,
   args: EstimateGasParameters<chain>,
 ): Promise<EstimateGasReturnType> {
-  const { account: account_ = client.account } = args
+  const { account: account_ = client.account, prepare = true } = args
   const account = account_ ? parseAccount(account_) : undefined
 
   try {
@@ -127,13 +132,16 @@ export async function estimateGas<
       value,
       stateOverride,
       ...rest
-    } = (await prepareTransactionRequest(client, {
-      ...args,
-      parameters:
-        // Some RPC Providers do not compute versioned hashes from blobs. We will need
-        // to compute them.
-        account?.type === 'local' ? undefined : ['blobVersionedHashes'],
-    } as PrepareTransactionRequestParameters)) as EstimateGasParameters
+    } = prepare
+      ? ((await prepareTransactionRequest(client, {
+          ...args,
+          parameters:
+            prepare ??
+            // Some RPC Providers do not compute versioned hashes from blobs. We will need
+            // to compute them.
+            (account?.type === 'local' ? undefined : ['blobVersionedHashes']),
+        } as PrepareTransactionRequestParameters)) as EstimateGasParameters)
+      : args
 
     const blockNumberHex =
       typeof blockNumber === 'bigint' ? numberToHex(blockNumber) : undefined

src/actions/wallet/prepareTransactionRequest.ts

@@ -421,9 +421,8 @@ export async function prepareTransactionRequest<
       'estimateGas',
     )({
       ...request,
-      account: account
-        ? { address: account.address, type: 'json-rpc' }
-        : account,
+      account,
+      prepare: account?.type === 'local' ? [] : ['blobVersionedHashes'],
     } as EstimateGasParameters)
 
   assertRequest(request as AssertRequestParameters)