Lint

ChainSafe · Sep 19, 2024 · 42e2cd0 · 42e2cd0
1 parent 04fb9c1
commit 42e2cd0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/packages/beacon-node/src/execution/engine/http.ts b/packages/beacon-node/src/execution/engine/http.ts
@@ -197,7 +197,7 @@ export class ExecutionEngineHttp implements IExecutionEngine {
     executionPayload: ExecutionPayload,
     versionedHashes?: VersionedHashes,
     parentBlockRoot?: Root,
-    executionRequests?: ExecutionRequests,
+    executionRequests?: ExecutionRequests
   ): Promise<ExecutePayloadResponse> {
     const method =
       ForkSeq[fork] >= ForkSeq.electra
@@ -229,7 +229,12 @@ export class ExecutionEngineHttp implements IExecutionEngine {
         const serializedExecutionRequests = serializeExecutionRequests(executionRequests);
         engineRequest = {
           method: "engine_newPayloadV4",
-          params: [serializedExecutionPayload, serializedVersionedHashes, parentBeaconBlockRoot, serializedExecutionRequests],
+          params: [
+            serializedExecutionPayload,
+            serializedVersionedHashes,
+            parentBeaconBlockRoot,
+            serializedExecutionRequests,
+          ],
           methodOpts: notifyNewPayloadOpts,
         };
       } else {

diff --git a/packages/beacon-node/src/execution/engine/types.ts b/packages/beacon-node/src/execution/engine/types.ts
@@ -176,10 +176,10 @@ export type WithdrawalRpc = {
 };
 
 export type ExecutionRequestsRpc = {
-  deposits: DepositRequestRpc[],
-  withdrawals: WithdrawalRequestRpc[],
-  consolidations: ConsolidationRequestRpc[],
-}
+  deposits: DepositRequestRpc[];
+  withdrawals: WithdrawalRequestRpc[];
+  consolidations: ConsolidationRequestRpc[];
+};
 
 export type DepositRequestRpc = {
   pubkey: DATA;
@@ -361,15 +361,13 @@ export function parseExecutionPayload(
     //   );
     // }
     // (executionPayload as electra.ExecutionPayload).depositRequests = depositRequests.map(deserializeDepositRequest);
-
     // if (withdrawalRequests == null) {
     //   throw Error(
     //     `withdrawalRequests missing for ${fork} >= electra executionPayload number=${executionPayload.blockNumber} hash=${data.blockHash}`
     //   );
     // }
     // (executionPayload as electra.ExecutionPayload).withdrawalRequests =
     //   withdrawalRequests.map(deserializeWithdrawalRequest);
-
     // if (consolidationRequests == null) {
     //   throw Error(
     //     `consolidationRequests missing for ${fork} >= electra executionPayload number=${executionPayload.blockNumber} hash=${data.blockHash}`
@@ -482,19 +480,15 @@ function deserializeWithdrawalRequest(withdrawalRequest: WithdrawalRequestRpc):
   };
 }
 
-function serializeConsolidationRequest(
-  consolidationRequest: electra.ConsolidationRequest
-): ConsolidationRequestRpc {
+function serializeConsolidationRequest(consolidationRequest: electra.ConsolidationRequest): ConsolidationRequestRpc {
   return {
     sourceAddress: bytesToData(consolidationRequest.sourceAddress),
     sourcePubkey: bytesToData(consolidationRequest.sourcePubkey),
     targetPubkey: bytesToData(consolidationRequest.targetPubkey),
   };
 }
 
-function deserializeConsolidationRequest(
-  consolidationRequest: ConsolidationRequestRpc
-): electra.ConsolidationRequest {
+function deserializeConsolidationRequest(consolidationRequest: ConsolidationRequestRpc): electra.ConsolidationRequest {
   return {
     sourceAddress: dataToBytes(consolidationRequest.sourceAddress, 20),
     sourcePubkey: dataToBytes(consolidationRequest.sourcePubkey, 48),
@@ -507,7 +501,7 @@ export function serializeExecutionRequests(executionRequests: ExecutionRequests)
   return {
     deposits: deposits.map(serializeDepositRequest),
     withdrawals: withdrawals.map(serializeWithdrawalRequest),
-    consolidations: consolidations.map(serializeConsolidationRequest), 
+    consolidations: consolidations.map(serializeConsolidationRequest),
   };
 }
 

diff --git a/packages/beacon-node/test/unit/chain/lightclient/upgradeLightClientHeader.test.ts b/packages/beacon-node/test/unit/chain/lightclient/upgradeLightClientHeader.test.ts
@@ -28,7 +28,7 @@ describe("UpgradeLightClientHeader", function () {
       capella: ssz.capella.LightClientHeader.defaultValue(),
       bellatrix: ssz.altair.LightClientHeader.defaultValue(),
       deneb: ssz.deneb.LightClientHeader.defaultValue(),
-      electra: ssz.electra.LightClientHeader.defaultValue(),
+      electra: ssz.deneb.LightClientHeader.defaultValue(),
     };
 
     testSlots = {

diff --git a/packages/state-transition/src/util/execution.ts b/packages/state-transition/src/util/execution.ts
@@ -2,7 +2,6 @@ import {
   bellatrix,
   capella,
   deneb,
-  electra,
   isBlindedBeaconBlockBody,
   ssz,
   BeaconBlock,

diff --git a/packages/types/src/electra/sszTypes.ts b/packages/types/src/electra/sszTypes.ts
@@ -8,7 +8,6 @@ import {
 } from "@chainsafe/ssz";
 import {
   HISTORICAL_ROOTS_LIMIT,
-  BLOCK_BODY_EXECUTION_PAYLOAD_DEPTH as EXECUTION_PAYLOAD_DEPTH,
   EPOCHS_PER_SYNC_COMMITTEE_PERIOD,
   SLOTS_PER_EPOCH,
   MAX_DEPOSIT_REQUESTS_PER_PAYLOAD,

diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
@@ -1,4 +1,12 @@
-import {ForkAll, ForkBlobs, ForkExecution, ForkLightClient, ForkName, ForkPostElectra, ForkPreBlobs} from "@lodestar/params";
+import {
+  ForkAll,
+  ForkBlobs,
+  ForkExecution,
+  ForkLightClient,
+  ForkName,
+  ForkPostElectra,
+  ForkPreBlobs,
+} from "@lodestar/params";
 import {ts as phase0} from "./phase0/index.js";
 import {ts as altair} from "./altair/index.js";
 import {ts as bellatrix} from "./bellatrix/index.js";