@lodestar/beacon-node 1.41.0-rc.2 → 1.42.0-dev.04e52d162f

package/src/chain/stateCache/datastore/types.ts

@@ -1,11 +1,12 @@
 import {phase0} from "@lodestar/types";
 
-// With db implementation, persistedKey is serialized data of a checkpoint
+// With db implementation, persistedKey is serialized data of a checkpoint + 1
+// ie a fixed size of `ssz.phase0.Checkpoint.minSize + 1`
 export type DatastoreKey = Uint8Array;
 
 // Make this generic to support testing
 export interface CPStateDatastore {
-  write: (cpKey: phase0.Checkpoint, stateBytes: Uint8Array) => Promise<DatastoreKey>;
+  write: (cpKey: phase0.Checkpoint, stateBytes: Uint8Array, payloadPresent: boolean) => Promise<DatastoreKey>;
   remove: (key: DatastoreKey) => Promise<void>;
   read: (key: DatastoreKey) => Promise<Uint8Array | null>;
   readLatestSafe: () => Promise<Uint8Array | null>;

package/src/chain/stateCache/fifoBlockStateCache.ts

@@ -1,5 +1,5 @@
 import {routes} from "@lodestar/api";
-import {CachedBeaconStateAllForks} from "@lodestar/state-transition";
+import {IBeaconStateView} from "@lodestar/state-transition";
 import {RootHex} from "@lodestar/types";
 import {toRootHex} from "@lodestar/utils";
 import {Metrics} from "../../metrics/index.js";
@@ -20,6 +20,11 @@ export type FIFOBlockStateCacheOpts = {
  *                                                                                             clock slot
  */
 export const DEFAULT_MAX_BLOCK_STATES = 64;
+/**
+ * For Gloas (ePBS), each block can have two states: block state and payload state.
+ * Double the cache size to maintain the same effective block depth.
+ */
+export const DEFAULT_MAX_BLOCK_STATES_GLOAS = 128;
 
 /**
  * New implementation of BlockStateCache that keeps the most recent n states consistently
@@ -41,12 +46,9 @@ export const DEFAULT_MAX_BLOCK_STATES = 64;
  * The maintained key order would be: 11 -> 13 -> 12 -> 10, and state 10 will be pruned first.
  */
 export class FIFOBlockStateCache implements BlockStateCache {
-  /**
-   * Max number of states allowed in the cache
-   */
-  readonly maxStates: number;
+  private maxStates: number;
 
-  private readonly cache: MapTracker<string, CachedBeaconStateAllForks>;
+  private readonly cache: MapTracker<string, IBeaconStateView>;
   /**
    * Key order to implement FIFO cache
    */
@@ -66,7 +68,7 @@ export class FIFOBlockStateCache implements BlockStateCache {
   /**
    * Set a state as head, happens when importing a block and head block is changed.
    */
-  setHeadState(item: CachedBeaconStateAllForks | null): void {
+  setHeadState(item: IBeaconStateView | null): void {
     if (item !== null) {
       this.add(item, true);
     }
@@ -77,7 +79,7 @@ export class FIFOBlockStateCache implements BlockStateCache {
    * base merkle tree for all BeaconState objects across application.
    * See packages/state-transition/src/util/loadState/loadState.ts for more detail
    */
-  getSeedState(): CachedBeaconStateAllForks {
+  getSeedState(): IBeaconStateView {
     const firstValue = this.cache.values().next();
     if (firstValue.done) {
       // should not happen
@@ -92,7 +94,7 @@ export class FIFOBlockStateCache implements BlockStateCache {
   /**
    * Get a state from this cache given a state root hex.
    */
-  get(rootHex: RootHex): CachedBeaconStateAllForks | null {
+  get(rootHex: RootHex): IBeaconStateView | null {
     this.metrics?.lookups.inc();
     const item = this.cache.get(rootHex);
     if (!item) {
@@ -110,7 +112,7 @@ export class FIFOBlockStateCache implements BlockStateCache {
    * @param isHead if true, move it to the head of the list. Otherwise add to the 2nd position.
    * In importBlock() steps, normally it'll call add() with isHead = false first. Then call setHeadState() to set the head.
    */
-  add(item: CachedBeaconStateAllForks, isHead = false): void {
+  add(item: IBeaconStateView, isHead = false): void {
     const key = toRootHex(item.hashTreeRoot());
     if (this.cache.get(key) != null) {
       if (!this.keyOrder.has(key)) {
@@ -170,6 +172,10 @@ export class FIFOBlockStateCache implements BlockStateCache {
     }
   }
 
+  upgradeToGloas(): void {
+    this.maxStates = DEFAULT_MAX_BLOCK_STATES_GLOAS;
+  }
+
   /**
    * No need for this implementation
    * This is only to conform to the old api
@@ -194,7 +200,7 @@ export class FIFOBlockStateCache implements BlockStateCache {
     }));
   }
 
-  getStates(): IterableIterator<CachedBeaconStateAllForks> {
+  getStates(): IterableIterator<IBeaconStateView> {
     return this.cache.values();
   }