client/block: ensure BlockBodies requests get properly propagated (#3673)

Author: jochem-brouwer

packages/block/src/types.ts

@@ -160,7 +160,7 @@ export type BlockBodyBytes = [
   TransactionsBytes,
   UncleHeadersBytes,
   WithdrawalsBytes?,
-  RequestBytes?,
+  RequestsBytes?,
 ]
 /**
  * TransactionsBytes can be an array of serialized txs for Typed Transactions or an array of Uint8Array Arrays for legacy transactions.

packages/client/src/sync/fetcher/blockfetcher.ts

@@ -73,7 +73,7 @@ export class BlockFetcher extends BlockFetcherBase<Block[], Block> {
         `Requested blocks=${blocksRange} from ${peerInfo} (received: ${headers.length} headers / ${bodies.length} bodies)`,
       )
     const blocks: Block[] = []
-    for (const [i, [txsData, unclesData, withdrawalsData]] of bodies.entries()) {
+    for (const [i, [txsData, unclesData, withdrawalsData, requestsData]] of bodies.entries()) {
       const header = headers[i]
       if (
         (!equalsBytes(header.transactionsTrie, KECCAK256_RLP) && txsData.length === 0) ||
@@ -92,6 +92,9 @@ export class BlockFetcher extends BlockFetcherBase<Block[], Block> {
       if (withdrawalsData !== undefined) {
         values.push(withdrawalsData)
       }
+      if (requestsData !== undefined) {
+        values.push(requestsData)
+      }
       // Supply the common from the corresponding block header already set on correct fork
       const block = createBlockFromBytesArray(values, { common: headers[i].common })
       // Only validate the data integrity