client: fix the getpayloadv4 with a deposit tx and expected deposit r…

…equests (#3410)

* client: fix the getpayloadv4 with a deposit tx and expected deposit requests

* expected response

* set the deposit contract to default mainnet address

* debug and fix the request root generation and get the spec working

packages/block/src/block.ts

@@ -422,7 +422,6 @@ export class Block {
       feeRecipient: coinbase,
       transactions,
       withdrawals: withdrawalsData,
-      requestsRoot,
       depositRequests,
       withdrawalRequests,
       executionWitness,
@@ -444,7 +443,6 @@ export class Block {
       }
     }
 
-    const reqRoot = requestsRoot === null ? undefined : requestsRoot
     const transactionsTrie = await Block.genTransactionsTrieRoot(
       txs,
       new Trie({ common: opts?.common })
@@ -453,16 +451,6 @@ export class Block {
     const withdrawalsRoot = withdrawals
       ? await Block.genWithdrawalsTrieRoot(withdrawals, new Trie({ common: opts?.common }))
       : undefined
-    const header: HeaderData = {
-      ...payload,
-      number,
-      receiptTrie,
-      transactionsTrie,
-      withdrawalsRoot,
-      mixHash,
-      coinbase,
-      requestsRoot: reqRoot,
-    }
 
     const hasDepositRequests = depositRequests !== undefined && depositRequests !== null
     const hasWithdrawalRequests = withdrawalRequests !== undefined && withdrawalRequests !== null
@@ -480,6 +468,21 @@ export class Block {
       }
     }
 
+    const requestsRoot = requests
+      ? await Block.genRequestsTrieRoot(requests, new Trie({ common: opts?.common }))
+      : undefined
+
+    const header: HeaderData = {
+      ...payload,
+      number,
+      receiptTrie,
+      transactionsTrie,
+      withdrawalsRoot,
+      mixHash,
+      coinbase,
+      requestsRoot,
+    }
+
     // we are not setting setHardfork as common is already set to the correct hf
     const block = Block.fromBlockData(
       { header, transactions: txs, withdrawals, executionWitness, requests },

packages/block/src/from-beacon-payload.ts

@@ -46,7 +46,7 @@ export type BeaconPayloadJson = {
   excess_blob_gas?: PrefixedHexString
   parent_beacon_block_root?: PrefixedHexString
   // requests data
-  deposit_receipts?: BeaconDepositRequest[]
+  deposit_requests?: BeaconDepositRequest[]
   withdrawal_requests?: BeaconWithdrawalRequest[]
 
   // the casing of VerkleExecutionWitness remains same camel case for now
@@ -148,8 +148,8 @@ export function executionPayloadFromBeaconPayload(payload: BeaconPayloadJson): E
   }
 
   // requests
-  if (payload.deposit_receipts !== undefined && payload.deposit_receipts !== null) {
-    executionPayload.depositRequests = payload.deposit_receipts.map((breq) => ({
+  if (payload.deposit_requests !== undefined && payload.deposit_requests !== null) {
+    executionPayload.depositRequests = payload.deposit_requests.map((breq) => ({
       pubkey: breq.pubkey,
       withdrawalCredentials: breq.withdrawal_credentials,
       amount: breq.amount,

packages/block/src/types.ts

@@ -305,7 +305,6 @@ export type ExecutionPayload = {
   parentBeaconBlockRoot?: PrefixedHexString | string // QUANTITY, 64 Bits
   // VerkleExecutionWitness is already a hex serialized object
   executionWitness?: VerkleExecutionWitness | null // QUANTITY, 64 Bits, null implies not available
-  requestsRoot?: PrefixedHexString | string | null // DATA, 32 bytes, null implies EIP 7685 not active yet
   depositRequests?: DepositRequestV1[] // Array of 6110 deposit requests
   withdrawalRequests?: WithdrawalRequestV1[] // Array of 7002 withdrawal requests
 }

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

@@ -285,6 +285,13 @@ export class Engine {
       () => this.connectionManager.updateStatus()
     )
 
+    this.getPayloadV4 = cmMiddleware(
+      middleware(callWithStackTrace(this.getPayloadV4.bind(this), this._rpcDebug), 1, [
+        [validators.bytes8],
+      ]),
+      () => this.connectionManager.updateStatus()
+    )
+
     /**
      * exchangeTransitionConfiguration
      */