cleanups

ChainSafe · Jul 27, 2023 · 5fa7e0f · 5fa7e0f
1 parent 26bbbe4
commit 5fa7e0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/beacon-node/src/chain/blocks/types.ts b/packages/beacon-node/src/chain/blocks/types.ts
@@ -1,9 +1,9 @@
+import {toHexString} from "@chainsafe/ssz";
 import {CachedBeaconStateAllForks, computeEpochAtSlot, DataAvailableStatus} from "@lodestar/state-transition";
 import {MaybeValidExecutionStatus} from "@lodestar/fork-choice";
 import {allForks, deneb, Slot, RootHex} from "@lodestar/types";
 import {ForkSeq, MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS} from "@lodestar/params";
 import {ChainForkConfig} from "@lodestar/config";
-import {toHexString} from "@chainsafe/ssz";
 import {pruneSetToMax} from "@lodestar/utils";
 
 export enum BlockInputType {

diff --git a/packages/beacon-node/src/sync/range/chain.ts b/packages/beacon-node/src/sync/range/chain.ts
@@ -400,12 +400,15 @@ export class SyncChain {
 
       if (!res.err) {
         batch.downloadingSuccess(res.result);
-        const blobs = res.result.reduce(
-          (acc, blockInput) => acc + (blockInput.type === BlockInputType.postDeneb ? blockInput.blobs.length : 0),
-          0
-        );
+        let hasPostDenebBlocks = false;
+        const blobs = res.result.reduce((acc, blockInput) => {
+          hasPostDenebBlocks ||= blockInput.type === BlockInputType.postDeneb;
+          return hasPostDenebBlocks
+            ? acc + (blockInput.type === BlockInputType.postDeneb ? blockInput.blobs.length : 0)
+            : 0;
+        }, 0);
         const downloadInfo = {blocks: res.result.length};
-        if (blobs > 0) {
+        if (hasPostDenebBlocks) {
           Object.assign(downloadInfo, {blobs});
         }
         this.logger.debug("Downloaded batch", {id: this.logId, ...batch.getMetadata(), ...downloadInfo});

diff --git a/packages/beacon-node/test/spec/presets/finality.ts b/packages/beacon-node/test/spec/presets/finality.ts
@@ -1,8 +1,8 @@
 import {
   BeaconStateAllForks,
+  DataAvailableStatus,
   ExecutionPayloadStatus,
   stateTransition,
-  DataAvailableStatus,
 } from "@lodestar/state-transition";
 import {altair, bellatrix, ssz} from "@lodestar/types";
 import {ForkName} from "@lodestar/params";