Lint

ChainSafe · Sep 21, 2024 · 9389539 · 9389539
1 parent a26e140
commit 9389539
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts b/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts
@@ -302,7 +302,8 @@ export async function verifyBlockExecutionPayload(
       ? (block.message.body as deneb.BeaconBlockBody).blobKzgCommitments.map(kzgCommitmentToVersionedHash)
       : undefined;
   const parentBlockRoot = ForkSeq[fork] >= ForkSeq.deneb ? block.message.parentRoot : undefined;
-  const executionRequests = ForkSeq[fork] >= ForkSeq.electra ? (block.message.body as electra.BeaconBlockBody).executionRequests : undefined;
+  const executionRequests =
+    ForkSeq[fork] >= ForkSeq.electra ? (block.message.body as electra.BeaconBlockBody).executionRequests : undefined;
 
   const logCtx = {slot: block.message.slot, executionBlock: executionPayloadEnabled.blockNumber};
   chain.logger.debug("Call engine api newPayload", logCtx);
@@ -311,7 +312,7 @@ export async function verifyBlockExecutionPayload(
     executionPayloadEnabled,
     versionedHashes,
     parentBlockRoot,
-    executionRequests,
+    executionRequests
   );
   chain.logger.debug("Receive engine api newPayload result", {...logCtx, status: execResult.status});
 

diff --git a/packages/beacon-node/src/execution/engine/http.ts b/packages/beacon-node/src/execution/engine/http.ts
@@ -1,5 +1,5 @@
 import {ExecutionPayload, ExecutionRequests, Root, RootHex, Wei} from "@lodestar/types";
-import {SLOTS_PER_EPOCH, ForkName, ForkSeq, isForkPostElectra} from "@lodestar/params";
+import {SLOTS_PER_EPOCH, ForkName, ForkSeq} from "@lodestar/params";
 import {Logger} from "@lodestar/logger";
 import {
   ErrorJsonRpcResponse,
@@ -409,7 +409,7 @@ export class ExecutionEngineHttp implements IExecutionEngine {
     executionPayload: ExecutionPayload;
     executionPayloadValue: Wei;
     blobsBundle?: BlobsBundle;
-    executionRequests?: ExecutionRequests,
+    executionRequests?: ExecutionRequests;
     shouldOverrideBuilder?: boolean;
   }> {
     const method =

diff --git a/packages/beacon-node/src/execution/engine/interface.ts b/packages/beacon-node/src/execution/engine/interface.ts
@@ -172,7 +172,7 @@ export interface IExecutionEngine {
     executionPayload: ExecutionPayload;
     executionPayloadValue: Wei;
     blobsBundle?: BlobsBundle;
-    executionRequests?: ExecutionRequests,
+    executionRequests?: ExecutionRequests;
     shouldOverrideBuilder?: boolean;
   }>;
 

diff --git a/packages/beacon-node/src/execution/engine/types.ts b/packages/beacon-node/src/execution/engine/types.ts
@@ -251,8 +251,6 @@ export function serializeExecutionPayload(fork: ForkName, data: ExecutionPayload
   }
 
   // No changes in Electra
-  if (ForkSeq[fork] >= ForkSeq.electra) {
-  }
 
   return payload;
 }
@@ -344,8 +342,6 @@ export function parseExecutionPayload(
   }
 
   // No changes in Electra
-  if (ForkSeq[fork] >= ForkSeq.electra) {
-  }
 
   return {executionPayload, executionPayloadValue, blobsBundle, executionRequests, shouldOverrideBuilder};
 }

diff --git a/packages/beacon-node/test/sim/electra-interop.test.ts b/packages/beacon-node/test/sim/electra-interop.test.ts
@@ -208,6 +208,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
     await sleep(1000);
     const payloadAndBlockValue = await executionEngine.getPayload(ForkName.electra, payloadId2);
     const payload = payloadAndBlockValue.executionPayload as electra.ExecutionPayload;
+    const depositRequests = payloadAndBlockValue.executionRequests?.deposits;
 
     if (payload.transactions.length !== 1) {
       throw Error(`Number of transactions mismatched. Expected: 1, actual: ${payload.transactions.length}`);
@@ -219,11 +220,11 @@ describe("executionEngine / ExecutionEngineHttp", function () {
       }
     }
 
-    if (payload.depositRequests.length !== 1) {
-      throw Error(`Number of depositRequests mismatched. Expected: 1, actual: ${payload.depositRequests.length}`);
+    if (depositRequests === undefined || depositRequests.length !== 1) {
+      throw Error(`Number of depositRequests mismatched. Expected: 1, actual: ${depositRequests?.length}`);
     }
 
-    const actualDepositRequest = payload.depositRequests[0];
+    const actualDepositRequest = depositRequests[0];
     assert.deepStrictEqual(
       actualDepositRequest,
       depositRequestB,