@chainsafe/lodestar 1.50.0-dev.9c3f7bebe9 → 1.50.0-dev.9c7f3c203f

package/src/cmds/beacon/handler.ts

@@ -4,11 +4,10 @@ import {SignableENR} from "@chainsafe/enr";
 import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
 import {hasher} from "@chainsafe/persistent-merkle-tree";
 import {BeaconDb, BeaconNode} from "@lodestar/beacon-node";
-import {ChainForkConfig, createBeaconConfig} from "@lodestar/config";
+import {ChainForkConfig} from "@lodestar/config";
 import {LevelDbController} from "@lodestar/db/controller/level";
 import {LoggerNode, getNodeLogger} from "@lodestar/logger/node";
-import {ACTIVE_PRESET, MAX_PENDING_DEPOSITS_PER_EPOCH, PresetName, SLOTS_PER_EPOCH} from "@lodestar/params";
-import {createBeaconStateView} from "@lodestar/state-transition";
+import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
 import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {BeaconNodeOptions, getBeaconConfigFromArgs} from "../../config/index.js";
@@ -28,6 +27,7 @@ import {initBeaconState} from "./initBeaconState.js";
 import {initPrivateKeyAndEnr} from "./initPeerIdAndEnr.js";
 import {BeaconArgs} from "./options.js";
 import {getBeaconPaths} from "./paths.js";
+import {savePubkeysFile} from "./pubkeysFile.js";
 
 const DEFAULT_RETENTION_SSZ_OBJECTS_HOURS = 15 * 24;
 const HOURS_TO_MS = 3600 * 1000;
@@ -77,20 +77,9 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
   try {
     const {
       anchorState,
-      stateBytes: anchorStateBytes,
+      config: beaconConfig,
       isFinalized,
-    } = await initBeaconState(args, beaconPaths.dataDir, config, db, logger);
-    const beaconConfig = createBeaconConfig(config, anchorState.genesisValidatorsRoot);
-    // Reserve 3 months of worst-case registry growth (MAX_PENDING_DEPOSITS_PER_EPOCH per epoch),
-    // over a year at organic rates, to avoid routine cache reallocations. Cache growth is protected
-    // by its native lock; if this headroom is exceeded, it grows by the same fixed step.
-    const headroomEpochs = (90 * 24 * 60 * 60) / (config.SECONDS_PER_SLOT * SLOTS_PER_EPOCH);
-    const pubkeyCacheHeadroom = MAX_PENDING_DEPOSITS_PER_EPOCH * Math.ceil(headroomEpochs);
-    pubkeyCache.ensureCapacity(anchorState.validators.length + pubkeyCacheHeadroom);
-    pubkeyCache.syncPubkeys(anchorState.validators.getAllReadonlyValues());
-    const anchorStateView = args["chain.nativeStateView"]
-      ? createBeaconStateView({useNative: true, stateBytes: anchorStateBytes})
-      : createBeaconStateView({useNative: false, anchorState, config: beaconConfig, pubkeyCache});
+    } = await initBeaconState(args, beaconPaths.dataDir, beaconPaths.pubkeysFile, config, db, logger);
 
     const node = await BeaconNode.init({
       opts: options,
@@ -103,7 +92,7 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
       dataDir: beaconPaths.dataDir,
       dataColumnDir: beaconPaths.dataColumnDir,
       peerStoreDir: beaconPaths.peerStoreDir,
-      anchorState: anchorStateView,
+      anchorState,
       isAnchorStateFinalized: isFinalized,
     });
 
@@ -151,21 +140,21 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
     abortController.signal.addEventListener(
       "abort",
       async () => {
+        let exitCode = 0;
         try {
           await node.close();
           logger.debug("Beacon node closed");
-          // Explicitly exit until active handles issue is resolved
-          // See https://github.com/ChainSafe/lodestar/issues/5642
-          process.exit(0);
         } catch (e) {
           // If we start from unfinalized state, we don't have checkpoint state so there is this error
           // "No state in cache for finalized checkpoint state epoch"
           logger.warn("Error closing beacon node", {}, e as Error);
           // Make sure db is always closed gracefully
           await db.close();
-          // Must explicitly exit process due to potential active handles
-          process.exit(1);
+          exitCode = 1;
         }
+        savePubkeysFile(pubkeyCache, beaconPaths.pubkeysFile, logger);
+        // Explicitly exit process due to potential active handles
+        process.exit(exitCode);
       },
       {once: true}
     );
@@ -241,6 +230,12 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
   // Render final options
   const options = beaconNodeOptions.getWithDefaults();
 
+  if (options.chain.nativeStateTransition && config.GLOAS_FORK_EPOCH !== Infinity) {
+    throw Error(
+      `--chain.nativeStateTransition does not support Gloas, which is scheduled at epoch ${config.GLOAS_FORK_EPOCH}`
+    );
+  }
+
   return {config, options, beaconPaths, network, version, commit, privateKey, logger};
 }
 

package/src/cmds/beacon/initBeaconState.ts

@@ -1,18 +1,24 @@
-import {IBeaconDb, getStateTypeFromBytes} from "@lodestar/beacon-node";
-import {ChainForkConfig} from "@lodestar/config";
+import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
+import {IBeaconDb} from "@lodestar/beacon-node";
+import {BeaconConfig, ChainForkConfig} from "@lodestar/config";
+import {MAX_PENDING_DEPOSITS_PER_EPOCH, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {
-  BeaconStateAllForks,
+  IBeaconStateView,
   computeWeakSubjectivitySummaryFromStateBytes,
+  createBeaconStateView,
+  getValidatorCountFromStateBytes,
   isWithinWeakSubjectivityPeriodFromSummary,
   readBeaconStateBytesMetadata,
 } from "@lodestar/state-transition";
 import {Logger, formatBytes} from "@lodestar/utils";
 import {GlobalArgs} from "../../options/globalOptions.js";
 import {BeaconArgs} from "./options.js";
+import {loadPubkeysFile} from "./pubkeysFile.js";
 import {StateInitializationError, StateInitializationErrorCode} from "./stateInitialization/errors.js";
+import {prepareGenesisInitialization} from "./stateInitialization/genesisState.js";
 import {
   prepareArchivedStateInitialization,
-  prepareCheckpointOrGenesisInitialization,
+  prepareCheckpointSourceInitialization,
 } from "./stateInitialization/prepareStateInitialization.js";
 import {
   ArchivedStateBytes,
@@ -21,15 +27,22 @@ import {
   StatePreparationContext,
 } from "./stateInitialization/types.js";
 
-/** Select serialized anchor bytes before constructing the state used for validation, persistence, and return. */
+type InitBeaconStateResult = {anchorState: IBeaconStateView; config: BeaconConfig; isFinalized: boolean};
+
+/**
+ * Select serialized anchor bytes before constructing the state used for validation, persistence, and return.
+ * Populates the global `pubkeyCache` with the anchor state's validators, reusing `pubkeysFile` if it matches.
+ */
 export async function initBeaconState(
   args: BeaconArgs & GlobalArgs,
   dataDir: string,
+  pubkeysFile: string,
   chainForkConfig: ChainForkConfig,
   db: IBeaconDb,
   logger: Logger
-): Promise<{anchorState: BeaconStateAllForks; stateBytes: Uint8Array; isFinalized: boolean}> {
+): Promise<InitBeaconStateResult> {
   const options: StateInitializationOptions = args;
+  const nativeStateTransition = options["chain.nativeStateTransition"] ?? false;
   if (
     options.forceCheckpointSync &&
     !(options.checkpointState || options.checkpointSyncUrl || options.unsafeCheckpointState)
@@ -55,11 +68,23 @@ export async function initBeaconState(
         options.lastPersistedCheckpointState
     );
     if (!options.forceCheckpointSync && (!hasCheckpointSource || archived.isWithinWeakSubjectivityPeriod)) {
-      return executeStateInitialization(prepareArchivedStateInitialization(archived, context));
+      return executeStateInitialization(
+        prepareArchivedStateInitialization(archived, context),
+        nativeStateTransition,
+        pubkeysFile,
+        logger
+      );
     }
   }
-  const stateInit = await prepareCheckpointOrGenesisInitialization(options, archived, context);
-  return executeStateInitialization(stateInit);
+  let stateInit = await prepareCheckpointSourceInitialization(options, archived, context);
+  if (stateInit === null) {
+    // Without a usable checkpoint state, resume from the db as if no checkpoint source was set instead of genesis
+    stateInit =
+      archived !== null
+        ? prepareArchivedStateInitialization(archived, context)
+        : await prepareGenesisInitialization(options, context);
+  }
+  return executeStateInitialization(stateInit, nativeStateTransition, pubkeysFile, logger);
 }
 
 /**
@@ -87,7 +112,7 @@ async function readLatestArchivedStateBytes({
   if (weakSubjectivity === null) {
     throw new StateInitializationError(
       {code: StateInitializationErrorCode.MALFORMED_STATE_BYTES},
-      "Cannot extract weak subjectivity summary from archived state bytes"
+      `Cannot extract weak subjectivity summary from archived state bytes, expected ${chainForkConfig.getForkName(metadata.slot)} state at slot ${metadata.slot}, possible fork or network mismatch`
     );
   }
   return {
@@ -103,12 +128,31 @@ async function readLatestArchivedStateBytes({
  * Validate before persistence, and log success only after any required writes succeed.
  */
 async function executeStateInitialization(
-  stateInit: StateInitialization
-): Promise<{anchorState: BeaconStateAllForks; stateBytes: Uint8Array; isFinalized: boolean}> {
-  const stateType = getStateTypeFromBytes(stateInit.config, stateInit.stateBytes);
-  const anchorState = stateType.deserializeToViewDU(stateInit.stateBytes);
+  stateInit: StateInitialization,
+  nativeStateTransition: boolean,
+  pubkeysFile: string,
+  logger: Logger
+): Promise<InitBeaconStateResult> {
+  const {config, stateBytes} = stateInit;
+  const validatorCount = getValidatorCountFromStateBytes(config, stateBytes);
+  if (validatorCount === null) {
+    throw new StateInitializationError(
+      {code: StateInitializationErrorCode.MALFORMED_STATE_BYTES},
+      "Cannot read validator count from selected state bytes"
+    );
+  }
+  // Reserve 3 months of worst-case registry growth (MAX_PENDING_DEPOSITS_PER_EPOCH per epoch),
+  // over a year at organic rates, to avoid routine cache reallocations. Cache growth is protected
+  // by its native lock; if this headroom is exceeded, it grows by the same fixed step.
+  // The view syncs pubkeys during construction, so capacity must be reserved first.
+  const headroomEpochs = (90 * 24 * 60 * 60) / (config.SECONDS_PER_SLOT * SLOTS_PER_EPOCH);
+  const pubkeyCacheCapacity = validatorCount + MAX_PENDING_DEPOSITS_PER_EPOCH * Math.ceil(headroomEpochs);
+  loadPubkeysFile(pubkeyCache, pubkeysFile, pubkeyCacheCapacity, config, stateBytes, validatorCount, logger);
+  // unilaterally expand capacity after best-effort pubkey file loading
+  pubkeyCache.ensureCapacity(pubkeyCacheCapacity);
+  const anchorState = createBeaconStateView({nativeStateTransition, config, stateBytes});
   stateInit.validate(anchorState);
-  await stateInit.persist?.(anchorState, stateInit.stateBytes);
-  stateInit.log(anchorState);
-  return {anchorState, stateBytes: stateInit.stateBytes, isFinalized: stateInit.isFinalized};
+  await stateInit.persist?.(anchorState, stateBytes);
+  stateInit.log(anchorState, nativeStateTransition);
+  return {anchorState, config, isFinalized: stateInit.isFinalized};
 }

package/src/cmds/beacon/options.ts

@@ -4,7 +4,6 @@ import {LogArgs, logOptions} from "../../options/logOptions.js";
 import {BeaconPaths, defaultBeaconPaths} from "./paths.js";
 
 type BeaconExtraArgs = {
-  forceGenesis?: boolean;
   genesisStateFile?: string;
   configFile?: string;
   bootnodesFile?: string;
@@ -22,6 +21,7 @@ type BeaconExtraArgs = {
   persistInvalidSszObjectsRetentionHours?: number;
   persistOrphanedBlocksDir?: string;
   peerStoreDir?: string;
+  pubkeysFile?: string;
   persistNetworkIdentity?: boolean;
   private?: boolean;
   validatorMonitorLogs?: boolean;
@@ -30,12 +30,6 @@ type BeaconExtraArgs = {
 };
 
 export const beaconExtraOptions: CliCommandOptions<BeaconExtraArgs> = {
-  forceGenesis: {
-    description: "Force beacon to create genesis without file",
-    type: "boolean",
-    hidden: true,
-  },
-
   genesisStateFile: {
     description: "Path or URL to download a genesis state file in ssz-encoded format",
     type: "string",
@@ -148,6 +142,13 @@ export const beaconExtraOptions: CliCommandOptions<BeaconExtraArgs> = {
     type: "string",
   },
 
+  pubkeysFile: {
+    hidden: true,
+    description: "Pubkey cache file, loaded on startup and saved on graceful shutdown",
+    defaultDescription: defaultBeaconPaths.pubkeysFile,
+    type: "string",
+  },
+
   persistNetworkIdentity: {
     description:
       "Whether to reuse the same peer-id across restarts. Validator custody requires custody group count to persist relative to a given ENR. Setting to false will reset ENR and validator custody requirements on restarts.",

package/src/cmds/beacon/paths.ts

@@ -9,6 +9,7 @@ export type BeaconPathsPartial = Partial<{
   dataColumnDir: string;
   persistInvalidSszObjectsDir: string;
   persistOrphanedBlocksDir?: string;
+  pubkeysFile: string;
 }>;
 
 export type BeaconPaths = {
@@ -18,6 +19,7 @@ export type BeaconPaths = {
   dataColumnDir: string;
   persistInvalidSszObjectsDir: string;
   persistOrphanedBlocksDir: string;
+  pubkeysFile: string;
 };
 
 /**
@@ -29,6 +31,7 @@ export type BeaconPaths = {
  *     ├── beacon.config.json
  *     ├── peer-id.json
  *     ├── enr
+ *     ├── pubkeys
  *     ├── chain-db
  *     └── beacon.log
  * ```
@@ -48,6 +51,7 @@ export function getBeaconPaths(
   const persistInvalidSszObjectsDir = args.persistInvalidSszObjectsDir ?? path.join(beaconDir, "invalidSszObjects");
   const peerStoreDir = args.peerStoreDir ?? path.join(beaconDir, "peerstore");
   const persistOrphanedBlocksDir = args.persistOrphanedBlocksDir ?? path.join(beaconDir, "orphaned_blocks");
+  const pubkeysFile = args.pubkeysFile ?? path.join(beaconDir, "pubkeys");
 
   return {
     ...globalPaths,
@@ -57,6 +61,7 @@ export function getBeaconPaths(
     persistInvalidSszObjectsDir,
     peerStoreDir,
     persistOrphanedBlocksDir,
+    pubkeysFile,
   };
 }
 

package/src/cmds/beacon/pubkeysFile.ts

@@ -0,0 +1,50 @@
+import {type PubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
+import {ChainForkConfig} from "@lodestar/config";
+import {getValidatorPubkeyFromStateBytes} from "@lodestar/state-transition";
+import {Logger, byteArrayEquals} from "@lodestar/utils";
+
+/**
+ * Best effort load of a trusted pubkey cache saved by a previous run, to skip decompressing every validator
+ * pubkey on boot. Must be called before any worker uses the cache.
+ */
+export function loadPubkeysFile(
+  pubkeyCache: PubkeyCache,
+  filepath: string,
+  maxCapacity: number,
+  config: ChainForkConfig,
+  anchorStateBytes: Uint8Array,
+  anchorValidatorCount: number,
+  logger: Logger
+): void {
+  const start = Date.now();
+  try {
+    pubkeyCache.load(filepath, maxCapacity);
+  } catch (e) {
+    logger.debug("Unable to load pubkeys file", {filepath}, e as Error);
+    return;
+  }
+
+  // load() only checks framing and checksum, so reject a file from another chain. Checking the endpoints
+  // suffices since the registry is append-only.
+  const overlap = Math.min(pubkeyCache.size, anchorValidatorCount);
+  for (const index of overlap > 0 ? [0, overlap - 1] : []) {
+    const anchorPubkey = getValidatorPubkeyFromStateBytes(config, anchorStateBytes, index);
+    if (anchorPubkey === null || !byteArrayEquals(pubkeyCache.getPubkeyBytesOrThrow(index), anchorPubkey)) {
+      pubkeyCache.reset();
+      logger.debug("Discarded pubkeys file not matching anchor state", {filepath, index});
+      return;
+    }
+  }
+
+  logger.debug("Loaded pubkeys file", {filepath, count: pubkeyCache.size, durationMs: Date.now() - start});
+}
+
+export function savePubkeysFile(pubkeyCache: PubkeyCache, filepath: string, logger: Logger): void {
+  const start = Date.now();
+  try {
+    pubkeyCache.save(filepath);
+    logger.debug("Saved pubkeys file", {filepath, count: pubkeyCache.size, durationMs: Date.now() - start});
+  } catch (e) {
+    logger.debug("Unable to save pubkeys file", {filepath}, e as Error);
+  }
+}

package/src/cmds/beacon/stateInitialization/checkpointState.ts

@@ -1,13 +1,10 @@
 import {DbCPStateDatastore, FileCPStateDatastore, persistAnchorState} from "@lodestar/beacon-node";
 import {createBeaconConfig} from "@lodestar/config";
 import {
-  BeaconStateAllForks,
-  computeAnchorCheckpoint,
-  computeCheckpointEpochAtStateSlot,
+  IBeaconStateView,
   computeEpochAtSlot,
   computeWeakSubjectivitySummaryFromStateBytes,
   getCurrentSlot,
-  getLatestBlockRoot,
   isWithinWeakSubjectivityPeriodFromSummary,
   readBeaconStateBytesMetadata,
 } from "@lodestar/state-transition";
@@ -181,7 +178,7 @@ function prepareCheckpointInitialization(
   if (weakSubjectivity === null) {
     throw new StateInitializationError(
       {code: StateInitializationErrorCode.MALFORMED_STATE_BYTES},
-      `Cannot extract weak subjectivity summary from ${candidate.source}`
+      `Cannot extract weak subjectivity summary from ${candidate.source}, expected ${chainForkConfig.getForkName(metadata.slot)} state at slot ${metadata.slot}, possible fork or network mismatch`
     );
   }
   const expectedCheckpoint = useArchived ? null : candidate.expectedCheckpoint;
@@ -189,6 +186,16 @@ function prepareCheckpointInitialization(
   const {isFinalized, ignoreWeakSubjectivityCheck} = policy;
   const config = createBeaconConfig(chainForkConfig, metadata.genesisValidatorsRoot);
   const archivedWithinWeakSubjectivityPeriod = useArchived ? archived.isWithinWeakSubjectivityPeriod : null;
+  const passedValidation =
+    archivedWithinWeakSubjectivityPeriod ?? isWithinWeakSubjectivityPeriodFromSummary(config, weakSubjectivity);
+  // Fast-fail stale checkpoints before deserializing the state or reserving pubkey-cache capacity.
+  if (!passedValidation && !ignoreWeakSubjectivityCheck) {
+    const clockEpoch = computeEpochAtSlot(getCurrentSlot(config, weakSubjectivity.genesisTime));
+    throw new StateInitializationError(
+      {code: StateInitializationErrorCode.STALE_CHECKPOINT},
+      `The selected state with epoch ${weakSubjectivity.checkpointEpoch} is not within weak subjectivity period of ${weakSubjectivity.period} epochs from the current epoch ${clockEpoch}. Please verify your checkpoint source`
+    );
+  }
   // DB-selected anchors need no persistence, including at slot zero.
   const shouldPersist = isFinalized && !useArchived;
   return {
@@ -198,17 +205,8 @@ function prepareCheckpointInitialization(
     validate(state) {
       // A supplied checkpoint must match even when the period check is ignored.
       if (expectedCheckpoint !== null) assertStateMatchesCheckpoint(state, expectedCheckpoint);
-      const passedValidation =
-        archivedWithinWeakSubjectivityPeriod ?? isWithinWeakSubjectivityPeriodFromSummary(config, weakSubjectivity);
-      if (!passedValidation && !ignoreWeakSubjectivityCheck) {
-        const clockEpoch = computeEpochAtSlot(getCurrentSlot(config, weakSubjectivity.genesisTime));
-        throw new StateInitializationError(
-          {code: StateInitializationErrorCode.STALE_CHECKPOINT},
-          `The selected state with epoch ${weakSubjectivity.checkpointEpoch} is not within weak subjectivity period of ${weakSubjectivity.period} epochs from the current epoch ${clockEpoch}. Please verify your checkpoint source`
-        );
-      }
+      assertAnchorStateForkMatchesConfig(config, state);
       if (isFinalized) {
-        assertAnchorStateForkMatchesConfig(config, state);
         const source = useArchived ? "db" : "checkpoint";
         const logData = {
           slot: state.slot,
@@ -226,8 +224,8 @@ function prepareCheckpointInitialization(
       }
     },
     persist: shouldPersist ? (state, bytes) => persistAnchorState(config, db, state, bytes) : null,
-    log(state) {
-      const {checkpoint} = computeAnchorCheckpoint(config, state);
+    log(state, nativeStateTransition) {
+      const {checkpoint} = state.computeAnchorCheckpoint();
       logger.info("Initialized checkpoint state", {
         source,
         slot: state.slot,
@@ -236,15 +234,15 @@ function prepareCheckpointInitialization(
         stateRoot: toRootHex(state.hashTreeRoot()),
         checkpointRoot: toRootHex(checkpoint.root),
         isFinalized,
+        nativeStateTransition,
         ...(isFinalized ? {} : {lastProcessedSlot: state.latestBlockHeader.slot}),
       });
     },
   };
 }
 
-function assertStateMatchesCheckpoint(state: BeaconStateAllForks, checkpoint: Checkpoint): void {
-  const stateEpoch = computeCheckpointEpochAtStateSlot(state.slot);
-  const blockRoot = getLatestBlockRoot(state);
+function assertStateMatchesCheckpoint(state: IBeaconStateView, checkpoint: Checkpoint): void {
+  const {root: blockRoot, epoch: stateEpoch} = state.computeAnchorCheckpoint().checkpoint;
   if (!ssz.Root.equals(blockRoot, checkpoint.root)) {
     throw new StateInitializationError(
       {code: StateInitializationErrorCode.CHECKPOINT_ROOT_MISMATCH},

package/src/cmds/beacon/stateInitialization/genesisState.ts

@@ -15,11 +15,11 @@ import {StateInitialization, StateInitializationOptions, StatePreparationContext
 import {assertAnchorStateForkMatchesConfig} from "./validation.js";
 
 export async function prepareGenesisInitialization(
-  options: Pick<StateInitializationOptions, "genesisStateFile" | "network" | "forceGenesis">,
+  options: Pick<StateInitializationOptions, "genesisStateFile" | "network">,
   {chainForkConfig, db, logger}: StatePreparationContext
 ): Promise<StateInitialization> {
   const source = options.genesisStateFile || getGenesisFileUrl(options.network || defaultNetwork);
-  if (!source || options.forceGenesis) {
+  if (!source) {
     throw new StateInitializationError(
       {code: StateInitializationErrorCode.MISSING_INITIALIZATION_SOURCE},
       "Failed to initialize beacon state, please provide a genesis state file or use checkpoint sync"
@@ -40,7 +40,7 @@ export async function prepareGenesisInitialization(
   if (weakSubjectivity === null) {
     throw new StateInitializationError(
       {code: StateInitializationErrorCode.MALFORMED_STATE_BYTES},
-      "Cannot extract weak subjectivity summary from genesis state bytes"
+      `Cannot extract weak subjectivity summary from genesis state bytes, expected ${chainForkConfig.getForkName(metadata.slot)} state at slot ${metadata.slot}, possible fork or network mismatch`
     );
   }
   const config = createBeaconConfig(chainForkConfig, metadata.genesisValidatorsRoot);
@@ -74,11 +74,12 @@ export async function prepareGenesisInitialization(
       }
     },
     persist: (state, bytes) => persistAnchorState(config, db, state, bytes),
-    log(state) {
+    log(state, nativeStateTransition) {
       logger.info("Initialized genesis state", {
         slot: state.slot,
         stateRoot: toRootHex(state.hashTreeRoot()),
         isFinalized: true,
+        nativeStateTransition,
       });
     },
   };

package/src/cmds/beacon/stateInitialization/prepareStateInitialization.ts

@@ -6,7 +6,6 @@ import {
   prepareCheckpointFileInitialization,
   prepareUnfinalizedCheckpointInitialization,
 } from "./checkpointState.js";
-import {prepareGenesisInitialization} from "./genesisState.js";
 import {ArchivedStateBytes, StateInitialization, StateInitializationOptions, StatePreparationContext} from "./types.js";
 import {assertAnchorStateForkMatchesConfig} from "./validation.js";
 
@@ -36,22 +35,23 @@ export function prepareArchivedStateInitialization(
       }
     },
     persist: null,
-    log(state) {
+    log(state, nativeStateTransition) {
       logger.info("Initialized state from db", {
         slot: state.slot,
         epoch: computeEpochAtSlot(state.slot),
         stateRoot: toRootHex(state.hashTreeRoot()),
         isFinalized: true,
+        nativeStateTransition,
       });
     },
   };
 }
 
-export async function prepareCheckpointOrGenesisInitialization(
+export async function prepareCheckpointSourceInitialization(
   options: StateInitializationOptions,
   archived: ArchivedStateBytes | null,
   context: StatePreparationContext
-): Promise<StateInitialization> {
+): Promise<StateInitialization | null> {
   if (options.checkpointState) {
     return prepareCheckpointFileInitialization(options.checkpointState, options, archived, context);
   }
@@ -59,8 +59,7 @@ export async function prepareCheckpointOrGenesisInitialization(
     return prepareCheckpointApiInitialization(options.checkpointSyncUrl, options, archived, context);
   }
   if (options.lastPersistedCheckpointState || options.unsafeCheckpointState) {
-    const stateInit = await prepareUnfinalizedCheckpointInitialization(options, archived, context);
-    if (stateInit !== null) return stateInit;
+    return prepareUnfinalizedCheckpointInitialization(options, archived, context);
   }
-  return prepareGenesisInitialization(options, context);
+  return null;
 }

package/src/cmds/beacon/stateInitialization/types.ts

@@ -1,6 +1,6 @@
 import {IBeaconDb} from "@lodestar/beacon-node";
 import {BeaconConfig, ChainForkConfig} from "@lodestar/config";
-import {BeaconStateAllForks, StateBytesMetadata, WeakSubjectivitySummary} from "@lodestar/state-transition";
+import {IBeaconStateView, StateBytesMetadata, WeakSubjectivitySummary} from "@lodestar/state-transition";
 import {Checkpoint} from "@lodestar/types/phase0";
 import {Logger} from "@lodestar/utils";
 import {GlobalArgs} from "../../../options/globalOptions.js";
@@ -16,9 +16,9 @@ export type StateInitializationOptions = Pick<
   | "wssCheckpoint"
   | "forceCheckpointSync"
   | "ignoreWeakSubjectivityCheck"
-  | "forceGenesis"
   | "network"
   | "chain.nHistoricalStatesFileDataStore"
+  | "chain.nativeStateTransition"
 >;
 
 export type StatePreparationContext = {
@@ -52,7 +52,7 @@ export type StateInitialization = {
   stateBytes: Uint8Array;
   config: BeaconConfig;
   isFinalized: boolean;
-  validate: (state: BeaconStateAllForks) => void;
-  persist: ((state: BeaconStateAllForks, stateBytes: Uint8Array) => Promise<void>) | null;
-  log: (state: BeaconStateAllForks) => void;
+  validate: (state: IBeaconStateView) => void;
+  persist: ((state: IBeaconStateView, stateBytes: Uint8Array) => Promise<void>) | null;
+  log: (state: IBeaconStateView, nativeStateTransition: boolean) => void;
 };

package/src/cmds/beacon/stateInitialization/validation.ts

@@ -1,9 +1,9 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {BeaconStateAllForks, computeStartSlotAtEpoch} from "@lodestar/state-transition";
+import {IBeaconStateView, computeStartSlotAtEpoch} from "@lodestar/state-transition";
 import {toHex} from "@lodestar/utils";
 import {StateInitializationError, StateInitializationErrorCode} from "./errors.js";
 
-export function assertAnchorStateForkMatchesConfig(config: ChainForkConfig, anchorState: BeaconStateAllForks): void {
+export function assertAnchorStateForkMatchesConfig(config: ChainForkConfig, anchorState: IBeaconStateView): void {
   const expectedFork = config.getForkInfo(computeStartSlotAtEpoch(anchorState.fork.epoch));
   const expectedForkVersion = toHex(expectedFork.version);
   const stateFork = toHex(anchorState.fork.currentVersion);

package/src/cmds/dev/handler.ts

@@ -31,7 +31,7 @@ export async function devHandler(args: IDevArgs & GlobalArgs): Promise<void> {
 
   // Note: defaults to network "dev", to all paths are custom and don't conflict with networks.
   // Flag --reset cleans up the custom dirs on dev stop
-  const beaconDbDir = getBeaconPaths(args, network).dbDir;
+  const {dbDir: beaconDbDir, pubkeysFile} = getBeaconPaths(args, network);
   const validatorsDbDir = getValidatorPaths(args, network).validatorsDbDir;
 
   // Remove slashing protection db. Otherwise the validators won't be able to propose nor attest
@@ -39,6 +39,8 @@ export async function devHandler(args: IDevArgs & GlobalArgs): Promise<void> {
   if (args.genesisTime === undefined) {
     await rimraf(beaconDbDir);
     await rimraf(validatorsDbDir);
+    // Validators deposited in the previous run do not exist on the new chain
+    await rimraf(pubkeysFile);
   }
 
   mkdir(beaconDbDir);

package/src/networks/index.ts

@@ -182,11 +182,20 @@ export async function fetchWeakSubjectivityStateBytes(
       GET_STATE_LOG_INTERVAL
     );
     const wsStateBytes = response.ssz();
+    const {version} = response.meta();
 
     const wsSlot = getStateSlotFromBytes(wsStateBytes);
     const logData = {stateId, size: formatBytes(wsStateBytes.length)};
     logger.info("Download completed", typeof stateId === "number" ? logData : {...logData, slot: wsSlot});
 
+    const expectedFork = config.getForkName(wsSlot);
+    if (version !== expectedFork) {
+      throw new LodestarError(
+        {code: "CHECKPOINT_FORK_MISMATCH"},
+        `Checkpoint sync server returned ${version} state at slot ${wsSlot} but local config expects ${expectedFork}, verify --network or the chain config`
+      );
+    }
+
     return {
       stateBytes: new Uint8Array(wsStateBytes.buffer, wsStateBytes.byteOffset, wsStateBytes.byteLength),
       expectedCheckpoint: wsCheckpoint,