modify code to correctly patch generated requests on getpayload/build/pending block

Author: g11tech

packages/client/src/miner/miner.ts

@@ -332,7 +332,7 @@ export class Miner {
     }
     if (interrupt) return
     // Build block, sealing it
-    const block = await blockBuilder.build(this.nextSolution)
+    const { block } = await blockBuilder.build(this.nextSolution)
     if (this.config.saveReceipts) {
       await this.execution.receiptsManager?.saveReceipts(block, receipts)
     }

packages/client/src/miner/pendingBlock.ts

@@ -19,7 +19,7 @@ import type { Config } from '../config.js'
 import type { TxPool } from '../service/txpool.js'
 import type { Block, HeaderData } from '@ethereumjs/block'
 import type { TypedTransaction } from '@ethereumjs/tx'
-import type { PrefixedHexString, WithdrawalData } from '@ethereumjs/util'
+import type { CLRequest, CLRequestType, PrefixedHexString, WithdrawalData } from '@ethereumjs/util'
 import type { BlockBuilder, TxReceipt, VM } from '@ethereumjs/vm'
 
 interface PendingBlockOpts {
@@ -239,7 +239,16 @@ export class PendingBlock {
    */
   async build(
     payloadIdBytes: Uint8Array | string,
-  ): Promise<void | [block: Block, receipts: TxReceipt[], value: bigint, blobs?: BlobsBundle]> {
+  ): Promise<
+    | void
+    | [
+        block: Block,
+        receipts: TxReceipt[],
+        value: bigint,
+        blobs?: BlobsBundle,
+        requests?: CLRequest<CLRequestType>[],
+      ]
+  > {
     const payloadId =
       typeof payloadIdBytes !== 'string' ? bytesToHex(payloadIdBytes) : payloadIdBytes
     const builder = this.pendingPayloads.get(payloadId)
@@ -283,7 +292,7 @@ export class PendingBlock {
 
     const { skippedByAddErrors, blobTxs } = await this.addTransactions(builder, txs)
 
-    const block = await builder.build()
+    const { block, requests } = await builder.build()
 
     // Construct blobs bundle
     const blobs = block.common.isActivatedEIP(4844)
@@ -301,7 +310,7 @@ export class PendingBlock {
       )}`,
     )
 
-    return [block, builder.transactionReceipts, builder.minerValue, blobs]
+    return [block, builder.transactionReceipts, builder.minerValue, blobs, requests]
   }
 
   private async addTransactions(builder: BlockBuilder, txs: TypedTransaction[]) {

packages/client/src/rpc/modules/engine/util/getPayload.ts

@@ -1,22 +1,24 @@
-import { bigIntToHex } from '@ethereumjs/util'
+import { bigIntToHex, bytesToHex } from '@ethereumjs/util'
 
 import type { BlobsBundle } from '../../../../miner/index.js'
 import type { BlobsBundleV1 } from '../types.js'
 import type { Block, ExecutionPayload } from '@ethereumjs/block'
+import type { CLRequest, CLRequestType } from '@ethereumjs/util'
 
 /**
  * Formats a block to {@link ExecutionPayloadV1}.
  */
-export const blockToExecutionPayload = (block: Block, value: bigint, bundle?: BlobsBundle) => {
+export const blockToExecutionPayload = (
+  block: Block,
+  value: bigint,
+  bundle?: BlobsBundle,
+  requests?: CLRequest<CLRequestType>[],
+) => {
   const executionPayload: ExecutionPayload = block.toExecutionPayload()
   // parentBeaconBlockRoot is not part of the CL payload
   if (executionPayload.parentBeaconBlockRoot !== undefined) {
     delete executionPayload.parentBeaconBlockRoot
   }
-  const { executionRequests } = executionPayload
-  if (executionPayload.executionRequests !== undefined) {
-    delete executionPayload.executionRequests
-  }
 
   const blobsBundle: BlobsBundleV1 | undefined = bundle ? bundle : undefined
 
@@ -25,7 +27,7 @@ export const blockToExecutionPayload = (block: Block, value: bigint, bundle?: Bl
   const shouldOverrideBuilder = false
   return {
     executionPayload,
-    executionRequests,
+    executionRequests: requests?.map((req) => bytesToHex(req.bytes)),
     blockValue: bigIntToHex(value),
     blobsBundle,
     shouldOverrideBuilder,

packages/client/test/rpc/helpers.ts

@@ -308,7 +308,7 @@ export async function runBlockWithTxs(
   for (const tx of txs) {
     await blockBuilder.addTransaction(tx, { skipHardForkValidation: true })
   }
-  const block = await blockBuilder.build()
+  const { block } = await blockBuilder.build()
 
   // put block into chain and run execution
   await chain.putBlocks([block], fromEngine)