Add definition of remaining engine API

Author: ensi321

packages/beacon-node/src/execution/engine/http.ts

@@ -473,8 +473,8 @@ export class ExecutionEngineHttp implements IExecutionEngine {
     this.payloadIdCache.prune();
   }
 
-  async getPayloadBodiesByHash(_fork: ForkName, blockHashes: RootHex[]): Promise<(ExecutionPayloadBody | null)[]> {
-    const method = "engine_getPayloadBodiesByHashV1";
+  async getPayloadBodiesByHash(fork: ForkName, blockHashes: RootHex[]): Promise<(ExecutionPayloadBody | null)[]> {
+    const method = ForkSeq[fork] >= ForkSeq.gloas ? "engine_getPayloadBodiesByHashV2" : "engine_getPayloadBodiesByHashV1";
     assertReqSizeLimit(blockHashes.length, 32);
     const response = await this.rpc.fetchWithRetries<
       EngineApiRpcReturnTypes[typeof method],
@@ -484,11 +484,12 @@ export class ExecutionEngineHttp implements IExecutionEngine {
   }
 
   async getPayloadBodiesByRange(
-    _fork: ForkName,
+    fork: ForkName,
     startBlockNumber: number,
     blockCount: number
   ): Promise<(ExecutionPayloadBody | null)[]> {
-    const method = "engine_getPayloadBodiesByRangeV1";
+    const method =
+      ForkSeq[fork] >= ForkSeq.gloas ? "engine_getPayloadBodiesByRangeV2" : "engine_getPayloadBodiesByRangeV1";
     assertReqSizeLimit(blockCount, 32);
     const start = numToQuantity(startBlockNumber);
     const count = numToQuantity(blockCount);

packages/beacon-node/src/execution/engine/mock.ts

@@ -144,7 +144,9 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
       engine_getPayloadV5: this.getPayloadV5.bind(this),
       engine_getPayloadV6: this.getPayloadV5.bind(this),
       engine_getPayloadBodiesByHashV1: this.getPayloadBodiesByHash.bind(this),
+      engine_getPayloadBodiesByHashV2: this.getPayloadBodiesByHash.bind(this),
       engine_getPayloadBodiesByRangeV1: this.getPayloadBodiesByRange.bind(this),
+      engine_getPayloadBodiesByRangeV2: this.getPayloadBodiesByRange.bind(this),
       engine_getClientVersionV1: this.getClientVersionV1.bind(this),
       engine_getBlobsV1: this.getBlobs.bind(this),
       engine_getBlobsV2: this.getBlobsV2.bind(this),

packages/beacon-node/src/execution/engine/types.ts

@@ -87,12 +87,14 @@ export type EngineApiRpcParamTypes = {
    * 1. Array of DATA - Array of block_hash field values of the ExecutionPayload structure
    *  */
   engine_getPayloadBodiesByHashV1: DATA[][];
+  engine_getPayloadBodiesByHashV2: DATA[][];
 
   /**
    *  1. start: QUANTITY, 64 bits - Starting block number
    *  2. count: QUANTITY, 64 bits - Number of blocks to return
    */
   engine_getPayloadBodiesByRangeV1: [start: QUANTITY, count: QUANTITY];
+  engine_getPayloadBodiesByRangeV2: [start: QUANTITY, count: QUANTITY];
 
   /**
    * Object - Instance of ClientVersion
@@ -146,8 +148,10 @@ export type EngineApiRpcReturnTypes = {
   engine_getPayloadV6: ExecutionPayloadResponse;
 
   engine_getPayloadBodiesByHashV1: (ExecutionPayloadBodyRpc | null)[];
+  engine_getPayloadBodiesByHashV2: (ExecutionPayloadBodyRpc | null)[];
 
   engine_getPayloadBodiesByRangeV1: (ExecutionPayloadBodyRpc | null)[];
+  engine_getPayloadBodiesByRangeV2: (ExecutionPayloadBodyRpc | null)[];
 
   engine_getClientVersionV1: ClientVersionRpc[];
 
@@ -168,11 +172,13 @@ type ExecutionPayloadResponse = ExecutionPayloadRpcWithValue;
 export type ExecutionPayloadBodyRpc = {
   transactions: DATA[];
   withdrawals: WithdrawalV1[] | null | undefined;
+  blockAccessList?: DATA | null; // GLOAS:EIP-7928
 };
 
 export type ExecutionPayloadBody = {
   transactions: bellatrix.Transaction[];
   withdrawals: capella.Withdrawals | null;
+  blockAccessList?: Uint8Array | null; // GLOAS:EIP-7928
 };
 
 export type ExecutionPayloadRpc = {
@@ -605,21 +611,27 @@ export function deserializeExecutionRequests(serialized: ExecutionRequestsRpc):
 }
 
 export function deserializeExecutionPayloadBody(data: ExecutionPayloadBodyRpc | null): ExecutionPayloadBody | null {
-  return data
-    ? {
-        transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
-        withdrawals: data.withdrawals ? data.withdrawals.map(deserializeWithdrawal) : null,
-      }
-    : null;
+  if (data == null) return null;
+  const body: ExecutionPayloadBody = {
+    transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
+    withdrawals: data.withdrawals ? data.withdrawals.map(deserializeWithdrawal) : null,
+  };
+  if (data.blockAccessList != null) {
+    body.blockAccessList = dataToBytes(data.blockAccessList, null);
+  }
+  return body;
 }
 
 export function serializeExecutionPayloadBody(data: ExecutionPayloadBody | null): ExecutionPayloadBodyRpc | null {
-  return data
-    ? {
-        transactions: data.transactions.map((tran) => bytesToData(tran)),
-        withdrawals: data.withdrawals ? data.withdrawals.map(serializeWithdrawal) : null,
-      }
-    : null;
+  if (data == null) return null;
+  const body: ExecutionPayloadBodyRpc = {
+    transactions: data.transactions.map((tran) => bytesToData(tran)),
+    withdrawals: data.withdrawals ? data.withdrawals.map(serializeWithdrawal) : null,
+  };
+  if (data.blockAccessList != null) {
+    body.blockAccessList = bytesToData(data.blockAccessList);
+  }
+  return body;
 }
 
 export function deserializeBlobAndProofs(data: BlobAndProofRpc | null): BlobAndProof | null {