From 69a6713f6f1dea1ae03a8b88ed5c81dbc7cfabec Mon Sep 17 00:00:00 2001
From: Nazar Hussain <nazarhussain@gmail.com>
Date: Thu, 24 Oct 2024 14:50:56 +0200
Subject: [PATCH] Improve the logging

---
 .../operations/putHistoricalState.ts          |  2 +-
 .../src/chain/historicalState/utils/diff.ts   | 48 ++++++++++++-------
 packages/cli/src/cmds/beacon/handler.ts       |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/beacon-node/src/chain/historicalState/operations/putHistoricalState.ts b/packages/beacon-node/src/chain/historicalState/operations/putHistoricalState.ts
index d816bd990d9..8ffe9bf578e 100644
--- a/packages/beacon-node/src/chain/historicalState/operations/putHistoricalState.ts
+++ b/packages/beacon-node/src/chain/historicalState/operations/putHistoricalState.ts
@@ -16,7 +16,7 @@ export async function putHistoricalState(
 ): Promise<void> {
   const epoch = computeEpochAtSlot(slot);
   const storageType = hierarchicalLayers.getStorageType(slot, stateArchiveMode);
-  logger.info("Archiving historical state", {epoch, slot, slotType: storageType});
+  logger.info("Archiving historical state", {epoch, slot, storageType});
 
   switch (storageType) {
     case HistoricalStateStorageType.Full: {
diff --git a/packages/beacon-node/src/chain/historicalState/utils/diff.ts b/packages/beacon-node/src/chain/historicalState/utils/diff.ts
index 6f68be5511e..fe68488ef96 100644
--- a/packages/beacon-node/src/chain/historicalState/utils/diff.ts
+++ b/packages/beacon-node/src/chain/historicalState/utils/diff.ts
@@ -6,7 +6,7 @@ import {HistoricalStateRegenMetrics, IStateDiffCodec, RegenErrorType} from "../t
 import {IBeaconDb} from "../../../db/interface.js";
 import {HierarchicalLayers} from "./hierarchicalLayers.js";
 import {getSnapshotStateArchiveWithFallback} from "./snapshot.js";
-import {applyDiffArchive} from "./stateArchive.js";
+import {applyDiffArchive, getLastStoredStateArchive} from "./stateArchive.js";
 import {StateArchive, StateArchiveSSZType} from "../../../db/repositories/hierarchicalStateArchive.js";
 
 export async function replayStateDiffs(
@@ -47,38 +47,50 @@ export async function getDiffStateArchive(
   const diffSlots = hierarchicalLayers.getArchiveLayers(slot);
   const processableDiffs = [...diffSlots];
 
-  // Remove the snapshot slot
-  let snapshotSlot = processableDiffs.shift();
+  if (processableDiffs.length < 1) {
+    logger?.error("Error detecting the diff layers", {slot, skipSlotDiff, diffSlots: diffSlots.join(",")});
+    return {diffSlots, stateArchive: null};
+  }
 
+  // Remove the snapshot slot
+  let expectedSnapshotSlot = processableDiffs.shift() as number;
   if (skipSlotDiff && processableDiffs[processableDiffs.length - 1] === slot) {
     processableDiffs.pop();
   }
 
-  if (snapshotSlot === undefined) {
-    logger?.error("Missing the snapshot state", {snapshotSlot});
-    metrics?.regenErrorCount.inc({reason: RegenErrorType.loadState});
-    return {diffSlots, stateArchive: null};
-  }
-
   const snapshotArchive = await getSnapshotStateArchiveWithFallback({
-    slot: snapshotSlot,
+    slot: expectedSnapshotSlot,
     db,
-    fallbackTillSlot: hierarchicalLayers.getPreviousSlotForLayer(snapshotSlot, 0),
+    fallbackTillSlot: hierarchicalLayers.getPreviousSlotForLayer(expectedSnapshotSlot - 1, 0),
+  }).then((state) => {
+    if (!state) return getLastStoredStateArchive({db, snapshot: true});
+
+    return null;
   });
 
   if (!snapshotArchive) {
-    logger?.error("Missing the snapshot state", {snapshotSlot});
+    logger?.error("Missing the snapshot state", {snapshotSlot: expectedSnapshotSlot});
     metrics?.regenErrorCount.inc({reason: RegenErrorType.loadState});
     return {diffSlots, stateArchive: null};
   }
 
-  if (snapshotArchive.slot !== snapshotSlot) {
+  const availableSnapshotSlot = snapshotArchive.slot;
+
+  if (availableSnapshotSlot >= slot) {
+    logger?.debug("Found snapshot at higher or same slot", {
+      expectedSnapshotSlot,
+      availableSnapshotSlot,
+    });
+    return {diffSlots, stateArchive: null};
+  }
+
+  if (availableSnapshotSlot !== expectedSnapshotSlot) {
     // Possibly because of checkpoint sync
     logger?.warn("Last archived snapshot is not at expected slot", {
-      expectedSnapshotSlot: snapshotSlot,
+      expectedSnapshotSlot,
       availableSnapshotSlot: snapshotArchive.slot,
     });
-    snapshotSlot = snapshotArchive.slot;
+    expectedSnapshotSlot = snapshotArchive.slot;
   }
 
   // Get all diffs except the first one which was a snapshot layer
@@ -98,7 +110,7 @@ export async function getDiffStateArchive(
     logger?.warn("Missing some diff states", {
       epoch,
       slot,
-      snapshotSlot,
+      snapshotSlot: expectedSnapshotSlot,
       diffPath: diffSlots.join(","),
       availableDiffs: nonEmptyDiffs.map((d) => d.slot).join(","),
     });
@@ -109,7 +121,7 @@ export async function getDiffStateArchive(
     logger?.verbose("Replaying state diffs", {
       epoch,
       slot,
-      snapshotSlot,
+      snapshotSlot: expectedSnapshotSlot,
       diffPath: diffSlots.join(","),
       availableDiffs: nonEmptyDiffs.map((d) => d.slot).join(","),
     });
@@ -124,7 +136,7 @@ export async function getDiffStateArchive(
   } catch (err) {
     logger?.error(
       "Can not compute the diff state",
-      {epoch, slot, snapshotSlot, diffPath: diffSlots.join(",")},
+      {epoch, slot, snapshotSlot: expectedSnapshotSlot, diffPath: diffSlots.join(",")},
       err as Error
     );
     metrics?.regenErrorCount.inc({reason: RegenErrorType.loadState});
diff --git a/packages/cli/src/cmds/beacon/handler.ts b/packages/cli/src/cmds/beacon/handler.ts
index 2a0238fede2..c7486b24735 100644
--- a/packages/cli/src/cmds/beacon/handler.ts
+++ b/packages/cli/src/cmds/beacon/handler.ts
@@ -62,6 +62,7 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
 
   const db = new BeaconDb(config, await LevelDbController.create(options.db, {metrics: null, logger}));
   logger.info("Connected to LevelDB database", {path: options.db.name});
+  logger.info("Initializing state processing", {stateArchiveMode: options.chain.stateArchiveMode});
 
   // BeaconNode setup
   try {