@lodestar/beacon-node 1.39.0-dev.d4a47659a5 → 1.39.0-dev.f4236afdba

package/src/execution/engine/mock.ts

@@ -11,7 +11,6 @@ import {
 import {ExecutionPayload, RootHex, bellatrix, deneb, ssz} from "@lodestar/types";
 import {fromHex, toRootHex} from "@lodestar/utils";
 import {ZERO_HASH_HEX} from "../../constants/index.js";
-import {quantityToNum} from "../../eth1/provider/utils.js";
 import {INTEROP_BLOCK_HASH} from "../../node/utils/interop/state.js";
 import {kzgCommitmentToVersionedHash} from "../../util/blobs.js";
 import {kzg} from "../../util/kzg.js";
@@ -29,7 +28,7 @@ import {
   serializeExecutionPayload,
   serializeExecutionRequests,
 } from "./types.js";
-import {JsonRpcBackend} from "./utils.js";
+import {JsonRpcBackend, quantityToNum} from "./utils.js";
 
 const INTEROP_GAS_LIMIT = 30e6;
 const PRUNE_PAYLOAD_ID_AFTER_MS = 5000;

package/src/execution/engine/payloadIdCache.ts

@@ -1,7 +1,7 @@
 import {SLOTS_PER_EPOCH} from "@lodestar/params";
 import {pruneSetToMax} from "@lodestar/utils";
-import {DATA, QUANTITY} from "../../eth1/provider/utils.js";
 import {PayloadAttributesRpc} from "./types.js";
+import {DATA, QUANTITY} from "./utils.js";
 
 // Idealy this only need to be set to the max head reorgs number
 const MAX_PAYLOAD_IDS = SLOTS_PER_EPOCH;

package/src/execution/engine/types.ts

@@ -23,6 +23,14 @@ import {
 } from "@lodestar/types";
 import {BlobAndProof} from "@lodestar/types/deneb";
 import {BlobAndProofV2} from "@lodestar/types/fulu";
+import {
+  ExecutionPayloadStatus,
+  ExecutionRequestType,
+  PayloadAttributes,
+  VersionedHashes,
+  isExecutionRequestType,
+} from "./interface.js";
+import {WithdrawalV1} from "./payloadIdCache.js";
 import {
   DATA,
   QUANTITY,
@@ -32,15 +40,7 @@ import {
   numToQuantity,
   quantityToBigint,
   quantityToNum,
-} from "../../eth1/provider/utils.js";
-import {
-  ExecutionPayloadStatus,
-  ExecutionRequestType,
-  PayloadAttributes,
-  VersionedHashes,
-  isExecutionRequestType,
-} from "./interface.js";
-import {WithdrawalV1} from "./payloadIdCache.js";
+} from "./utils.js";
 
 export type EngineApiRpcParamTypes = {
   /**

package/src/execution/engine/utils.ts

@@ -1,14 +1,120 @@
-import {isErrorAborted, isFetchError} from "@lodestar/utils";
-import {IJson, RpcPayload} from "../../eth1/interface.js";
+import {bigIntToBytes, bytesToBigInt, fromHex, fromHexInto, isErrorAborted, isFetchError, toHex} from "@lodestar/utils";
+import {isQueueErrorAborted} from "../../util/queue/errors.js";
+import {ExecutionEngineState, ExecutionPayloadStatus} from "./interface.js";
 import {
   ErrorJsonRpcResponse,
   HttpRpcError,
   IJsonRpcHttpClient,
   JsonRpcHttpClientEvent,
   JsonRpcHttpClientEventEmitter,
-} from "../../eth1/provider/jsonRpcHttpClient.js";
-import {isQueueErrorAborted} from "../../util/queue/errors.js";
-import {ExecutionEngineState, ExecutionPayloadStatus} from "./interface.js";
+} from "./jsonRpcHttpClient.js";
+
+/** QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API */
+export type QUANTITY = string;
+/** DATA as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API */
+export type DATA = string;
+
+export const rootHexRegex = /^0x[a-fA-F0-9]{64}$/;
+
+export type IJson = string | number | boolean | undefined | IJson[] | {[key: string]: IJson};
+
+export interface RpcPayload<P = IJson[]> {
+  method: string;
+  params: P;
+}
+
+/**
+ * QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API
+ *
+ * When encoding QUANTITIES (integers, numbers): encode as hex, prefix with “0x”, the most compact representation (slight exception: zero should be represented as “0x0”). Examples:
+ * - 0x41 (65 in decimal)
+ * - 0x400 (1024 in decimal)
+ * - WRONG: 0x (should always have at least one digit - zero is “0x0”)
+ * - WRONG: 0x0400 (no leading zeroes allowed)
+ * - WRONG: ff (must be prefixed 0x)
+ */
+export function numToQuantity(num: number | bigint): QUANTITY {
+  return "0x" + num.toString(16);
+}
+
+/**
+ * QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API
+ */
+export function quantityToNum(hex: QUANTITY, id = ""): number {
+  const num = parseInt(hex, 16);
+  if (Number.isNaN(num) || num < 0) throw Error(`Invalid hex decimal ${id} '${hex}'`);
+  return num;
+}
+
+/**
+ * QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API.
+ * Typesafe fn to convert hex string to bigint. The BigInt constructor param is any
+ */
+export function quantityToBigint(hex: QUANTITY, id = ""): bigint {
+  try {
+    return BigInt(hex);
+  } catch (e) {
+    throw Error(`Invalid hex bigint ${id} '${hex}': ${(e as Error).message}`);
+  }
+}
+
+/**
+ * QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API.
+ */
+export function quantityToBytes(hex: QUANTITY): Uint8Array {
+  const bn = quantityToBigint(hex);
+  return bigIntToBytes(bn, 32, "le");
+}
+
+/**
+ * QUANTITY as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API.
+ * Compress a 32 ByteVector into a QUANTITY
+ */
+export function bytesToQuantity(bytes: Uint8Array): QUANTITY {
+  const bn = bytesToBigInt(bytes, "le");
+  return numToQuantity(bn);
+}
+
+/**
+ * DATA as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API
+ *
+ * When encoding UNFORMATTED DATA (byte arrays, account addresses, hashes, bytecode arrays): encode as hex, prefix with
+ * “0x”, two hex digits per byte. Examples:
+ *
+ * - 0x41 (size 1, “A”)
+ * - 0x004200 (size 3, “\0B\0”)
+ * - 0x (size 0, “”)
+ * - WRONG: 0xf0f0f (must be even number of digits)
+ * - WRONG: 004200 (must be prefixed 0x)
+ */
+export function bytesToData(bytes: Uint8Array): DATA {
+  return toHex(bytes);
+}
+
+/**
+ * DATA as defined in ethereum execution layer JSON RPC https://eth.wiki/json-rpc/API
+ */
+export function dataToBytes(hex: DATA, fixedLength: number | null): Uint8Array {
+  try {
+    const bytes = fromHex(hex);
+    if (fixedLength != null && bytes.length !== fixedLength) {
+      throw Error(`Wrong data length ${bytes.length} expected ${fixedLength}`);
+    }
+    return bytes;
+  } catch (e) {
+    (e as Error).message = `Invalid hex string: ${(e as Error).message}`;
+    throw e;
+  }
+}
+
+/**
+ * Convert DATA into a preallocated buffer
+ * fromHexInto will throw if buffer's length is not the same as the decoded hex length
+ */
+export function dataIntoBytes(hex: DATA, buffer: Uint8Array): Uint8Array {
+  fromHexInto(hex, buffer);
+  return buffer;
+}
 
 export type JsonRpcBackend = {
   // biome-ignore lint/suspicious/noExplicitAny: We need to use `any` type here

package/src/index.ts

@@ -2,11 +2,10 @@
 
 export type {RestApiServerMetrics, RestApiServerModules, RestApiServerOpts} from "./api/rest/base.js";
 export {RestApiServer} from "./api/rest/base.js";
-export {checkAndPersistAnchorState, initStateFromDb, initStateFromEth1} from "./chain/index.js";
+export {checkAndPersistAnchorState, initStateFromDb} from "./chain/index.js";
 export {DbCPStateDatastore} from "./chain/stateCache/datastore/db.js";
 export {FileCPStateDatastore} from "./chain/stateCache/datastore/file.js";
 export {BeaconDb, type IBeaconDb} from "./db/index.js";
-export {Eth1Provider, type IEth1Provider} from "./eth1/index.js";
 // Export metrics utilities to de-duplicate validator metrics
 export {
   type HttpMetricsServer,

package/src/metrics/metrics/lodestar.ts

@@ -1619,98 +1619,6 @@ export function createLodestarMetrics(
       }),
     },
 
-    eth1: {
-      depositTrackerIsCaughtup: register.gauge({
-        name: "lodestar_eth1_deposit_tracker_is_caughtup",
-        help: "Eth1 deposit is caught up 0=false 1=true",
-      }),
-      depositTrackerUpdateErrors: register.gauge({
-        name: "lodestar_eth1_deposit_tracker_update_errors_total",
-        help: "Eth1 deposit update loop errors total",
-      }),
-      remoteHighestBlock: register.gauge({
-        name: "lodestar_eth1_remote_highest_block",
-        help: "Eth1 current highest block number",
-      }),
-      depositEventsFetched: register.gauge({
-        name: "lodestar_eth1_deposit_events_fetched_total",
-        help: "Eth1 deposit events fetched total",
-      }),
-      lastProcessedDepositBlockNumber: register.gauge({
-        name: "lodestar_eth1_last_processed_deposit_block_number",
-        help: "Eth1 deposit tracker lastProcessedDepositBlockNumber",
-      }),
-      blocksFetched: register.gauge({
-        name: "lodestar_eth1_blocks_fetched_total",
-        help: "Eth1 blocks fetched total",
-      }),
-      lastFetchedBlockBlockNumber: register.gauge({
-        name: "lodestar_eth1_last_fetched_block_block_number",
-        help: "Eth1 deposit tracker last fetched block's block number",
-      }),
-      lastFetchedBlockTimestamp: register.gauge({
-        name: "lodestar_eth1_last_fetched_block_timestamp",
-        help: "Eth1 deposit tracker last fetched block's timestamp",
-      }),
-      eth1FollowDistanceSecondsConfig: register.gauge({
-        name: "lodestar_eth1_follow_distance_seconds_config",
-        help: "Constant with value = SECONDS_PER_ETH1_BLOCK * ETH1_FOLLOW_DISTANCE",
-      }),
-      eth1FollowDistanceDynamic: register.gauge({
-        name: "lodestar_eth1_follow_distance_dynamic",
-        help: "Eth1 dynamic follow distance changed by the deposit tracker if blocks are slow",
-      }),
-      eth1GetBlocksBatchSizeDynamic: register.gauge({
-        name: "lodestar_eth1_blocks_batch_size_dynamic",
-        help: "Dynamic batch size to fetch blocks",
-      }),
-      eth1GetLogsBatchSizeDynamic: register.gauge({
-        name: "lodestar_eth1_logs_batch_size_dynamic",
-        help: "Dynamic batch size to fetch deposit logs",
-      }),
-    },
-
-    eth1HttpClient: {
-      requestTime: register.histogram<{routeId: string}>({
-        name: "lodestar_eth1_http_client_request_time_seconds",
-        help: "eth1 JsonHttpClient - histogram or roundtrip request times",
-        labelNames: ["routeId"],
-        // Provide max resolution on problematic values around 1 second
-        buckets: [0.1, 0.5, 1, 2, 5, 15],
-      }),
-      streamTime: register.histogram<{routeId: string}>({
-        name: "lodestar_eth1_http_client_stream_time_seconds",
-        help: "eth1 JsonHttpClient - streaming time by routeId",
-        labelNames: ["routeId"],
-        // Provide max resolution on problematic values around 1 second
-        buckets: [0.1, 0.5, 1, 2, 5, 15],
-      }),
-      requestErrors: register.gauge<{routeId: string}>({
-        name: "lodestar_eth1_http_client_request_errors_total",
-        help: "eth1 JsonHttpClient - total count of request errors",
-        labelNames: ["routeId"],
-      }),
-      retryCount: register.gauge<{routeId: string}>({
-        name: "lodestar_eth1_http_client_request_retries_total",
-        help: "eth1 JsonHttpClient - total count of request retries",
-        labelNames: ["routeId"],
-      }),
-      requestUsedFallbackUrl: register.gauge<{routeId: string}>({
-        name: "lodestar_eth1_http_client_request_used_fallback_url_total",
-        help: "eth1 JsonHttpClient - total count of requests on fallback url(s)",
-        labelNames: ["routeId"],
-      }),
-      activeRequests: register.gauge<{routeId: string}>({
-        name: "lodestar_eth1_http_client_active_requests",
-        help: "eth1 JsonHttpClient - current count of active requests",
-        labelNames: ["routeId"],
-      }),
-      configUrlsCount: register.gauge({
-        name: "lodestar_eth1_http_client_config_urls_count",
-        help: "eth1 JsonHttpClient - static config urls count",
-      }),
-    },
-
     executionEnginerHttpClient: {
       requestTime: register.histogram<{routeId: string}>({
         name: "lodestar_execution_engine_http_client_request_time_seconds",

package/src/node/nodejs.ts

@@ -13,7 +13,6 @@ import {BeaconRestApiServer, getApi} from "../api/index.js";
 import {BeaconChain, IBeaconChain, initBeaconMetrics} from "../chain/index.js";
 import {ValidatorMonitor, createValidatorMonitor} from "../chain/validatorMonitor.js";
 import {IBeaconDb} from "../db/index.js";
-import {initializeEth1ForBlockProduction} from "../eth1/index.js";
 import {initializeExecutionBuilder, initializeExecutionEngine} from "../execution/index.js";
 import {HttpMetricsServer, Metrics, createMetrics, getHttpMetricsServer} from "../metrics/index.js";
 import {MonitoringService} from "../monitoring/index.js";
@@ -68,7 +67,6 @@ enum LoggerModule {
   api = "api",
   backfill = "backfill",
   chain = "chain",
-  eth1 = "eth1",
   execution = "execution",
   metrics = "metrics",
   monitoring = "monitoring",
@@ -199,6 +197,17 @@ export class BeaconNode {
     // TODO: Should this call be awaited?
     await db.pruneHotDb();
 
+    // Delete deprecated eth1 data to free up disk space for users
+    logger.debug("Deleting deprecated eth1 data from database");
+    const startTime = Date.now();
+    db.deleteDeprecatedEth1Data()
+      .then(() => {
+        logger.debug("Deleted deprecated eth1 data", {durationMs: Date.now() - startTime});
+      })
+      .catch((e) => {
+        logger.error("Failed to delete deprecated eth1 data", {}, e);
+      });
+
     const monitoring = opts.monitoring.endpoint
       ? new MonitoringService(
           "beacon",
@@ -220,13 +229,6 @@ export class BeaconNode {
       validatorMonitor,
       anchorState,
       isAnchorStateFinalized,
-      eth1: initializeEth1ForBlockProduction(opts.eth1, {
-        config,
-        db,
-        metrics,
-        logger: logger.child({module: LoggerModule.eth1}),
-        signal,
-      }),
       executionEngine: initializeExecutionEngine(opts.executionEngine, {
         metrics,
         signal,

package/src/node/options.ts

@@ -2,7 +2,6 @@ import {ApiOptions, defaultApiOptions} from "../api/options.js";
 import {ArchiveMode, DEFAULT_ARCHIVE_MODE, IChainOptions, defaultChainOptions} from "../chain/options.js";
 import {ValidatorMonitorOpts, defaultValidatorMonitorOpts} from "../chain/validatorMonitor.js";
 import {DatabaseOptions, defaultDbOptions} from "../db/options.js";
-import {Eth1Options, defaultEth1Options} from "../eth1/options.js";
 import {
   ExecutionBuilderOpts,
   ExecutionEngineOpts,
@@ -26,7 +25,6 @@ export interface IBeaconNodeOptions {
   api: ApiOptions;
   chain: IChainOptions;
   db: DatabaseOptions;
-  eth1: Eth1Options;
   executionEngine: ExecutionEngineOpts;
   executionBuilder: ExecutionBuilderOpts;
   metrics: MetricsOptions;
@@ -40,7 +38,6 @@ export const defaultOptions: IBeaconNodeOptions = {
   api: defaultApiOptions,
   chain: defaultChainOptions,
   db: defaultDbOptions,
-  eth1: defaultEth1Options,
   executionEngine: defaultExecutionEngineOpts,
   executionBuilder: defaultExecutionBuilderOpts,
   metrics: defaultMetricsOptions,

package/src/node/utils/interop/deposits.ts

@@ -1,5 +1,6 @@
 import {digest} from "@chainsafe/as-sha256";
 import {Tree, toGindex} from "@chainsafe/persistent-merkle-tree";
+import {ByteVectorType, CompositeViewDU, ListCompositeType} from "@chainsafe/ssz";
 import {ChainConfig} from "@lodestar/config";
 import {
   BLS_WITHDRAWAL_PREFIX,
@@ -9,7 +10,8 @@ import {
 } from "@lodestar/params";
 import {ZERO_HASH, computeDomain, computeSigningRoot, interopSecretKeys} from "@lodestar/state-transition";
 import {phase0, ssz} from "@lodestar/types";
-import {DepositTree} from "../../../db/repositories/depositDataRoot.js";
+
+export type DepositTree = CompositeViewDU<ListCompositeType<ByteVectorType>>;
 
 /**
  * Compute and return deposit data from other validators.

package/src/node/utils/interop/state.ts

@@ -6,7 +6,7 @@ import {
   initializeBeaconStateFromEth1,
 } from "@lodestar/state-transition";
 import {Bytes32, TimeSeconds, phase0, ssz, sszTypesFor} from "@lodestar/types";
-import {DepositTree} from "../../../db/repositories/depositDataRoot.js";
+import {DepositTree} from "./deposits.js";
 
 export const INTEROP_BLOCK_HASH = Buffer.alloc(32, "B");
 export const INTEROP_TIMESTAMP = Math.pow(2, 40);

package/src/node/utils/state.ts

@@ -1,7 +1,6 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {BeaconStateAllForks} from "@lodestar/state-transition";
-import {phase0, ssz} from "@lodestar/types";
-import {IBeaconDb} from "../../db/index.js";
+import {ssz} from "@lodestar/types";
 import {interopDeposits} from "./interop/deposits.js";
 import {InteropStateOpts, getInteropState} from "./interop/state.js";
 
@@ -12,26 +11,12 @@ export function initDevState(
   config: ChainForkConfig,
   validatorCount: number,
   interopStateOpts: InteropStateOpts
-): {deposits: phase0.Deposit[]; state: BeaconStateAllForks} {
+): BeaconStateAllForks {
   const deposits = interopDeposits(
     config,
     ssz.phase0.DepositDataRootList.defaultViewDU(),
     validatorCount,
     interopStateOpts
   );
-  const state = getInteropState(config, interopStateOpts, deposits);
-  return {deposits, state};
-}
-
-export async function writeDeposits(db: IBeaconDb, deposits: phase0.Deposit[]): Promise<void> {
-  for (let i = 0; i < deposits.length; i++) {
-    await Promise.all([
-      db.depositEvent.put(i, {
-        blockNumber: i,
-        index: i,
-        depositData: deposits[i].data,
-      }),
-      db.depositDataRoot.put(i, ssz.phase0.DepositData.hashTreeRoot(deposits[i].data)),
-    ]);
-  }
+  return getInteropState(config, interopStateOpts, deposits);
 }

package/lib/chain/genesis/genesis.d.ts

@@ -1,51 +0,0 @@
-import { ChainForkConfig } from "@lodestar/config";
-import { BeaconStateAllForks, CachedBeaconStateAllForks } from "@lodestar/state-transition";
-import { Logger } from "@lodestar/utils";
-import { DepositTree } from "../../db/repositories/depositDataRoot.js";
-import { IEth1Provider } from "../../eth1/index.js";
-import { GenesisResult, IGenesisBuilder } from "./interface.js";
-export type GenesisBuilderKwargs = {
-    config: ChainForkConfig;
-    eth1Provider: IEth1Provider;
-    logger: Logger;
-    /** Use to restore pending progress */
-    pendingStatus?: {
-        state: BeaconStateAllForks;
-        depositTree: DepositTree;
-        lastProcessedBlockNumber: number;
-    };
-    signal?: AbortSignal;
-    maxBlocksPerPoll?: number;
-};
-export declare class GenesisBuilder implements IGenesisBuilder {
-    readonly state: CachedBeaconStateAllForks;
-    readonly depositTree: DepositTree;
-    /** Is null if no block has been processed yet */
-    lastProcessedBlockNumber: number | null;
-    private readonly config;
-    private readonly eth1Provider;
-    private readonly logger;
-    private readonly signal?;
-    private readonly eth1Params;
-    private readonly depositCache;
-    private readonly fromBlock;
-    private readonly logEvery;
-    private lastLog;
-    /** Current count of active validators in the state */
-    private activatedValidatorCount;
-    constructor({ config, eth1Provider, logger, signal, pendingStatus, maxBlocksPerPoll }: GenesisBuilderKwargs);
-    /**
-     * Get eth1 deposit events and blocks and apply to this.state until we found genesis.
-     */
-    waitForGenesis(): Promise<GenesisResult>;
-    /**
-     * First phase of waiting for genesis.
-     * Stream deposits events in batches as big as possible without querying block data
-     * @returns Block number at which there are enough active validators is state for genesis
-     */
-    private waitForGenesisValidators;
-    private applyDeposits;
-    /** Throttle genesis generation status log to prevent spamming */
-    private throttledLog;
-}
-//# sourceMappingURL=genesis.d.ts.map

package/lib/chain/genesis/genesis.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"genesis.d.ts","sourceRoot":"","sources":["../../../src/chain/genesis/genesis.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EAS1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAGlD,OAAO,EAAC,aAAa,EAAE,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,eAAe,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IAEf,sCAAsC;IACtC,aAAa,CAAC,EAAE;QACd,KAAK,EAAE,mBAAmB,CAAC;QAC3B,WAAW,EAAE,WAAW,CAAC;QACzB,wBAAwB,EAAE,MAAM,CAAC;KAClC,CAAC;IAEF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,qBAAa,cAAe,YAAW,eAAe;IAEpD,QAAQ,CAAC,KAAK,EAAE,yBAAyB,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,iDAAiD;IACjD,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,OAAO,CAAK;IACpB,sDAAsD;IACtD,OAAO,CAAC,uBAAuB,CAAS;gBAE5B,EAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAC,EAAE,oBAAoB;IAmCzG;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,aAAa,CAAC;IAsC9C;;;;OAIG;YACW,wBAAwB;IAoBtC,OAAO,CAAC,aAAa;IAuBrB,iEAAiE;IACjE,OAAO,CAAC,YAAY;CAMrB"}

package/lib/chain/genesis/genesis.js

@@ -1,123 +0,0 @@
-import { Tree, toGindex } from "@chainsafe/persistent-merkle-tree";
-import { GENESIS_EPOCH, GENESIS_SLOT } from "@lodestar/params";
-import { applyDeposits, applyEth1BlockHash, applyTimestamp, createCachedBeaconState, createEmptyEpochCacheImmutableData, getActiveValidatorIndices, getGenesisBeaconState, getTemporaryBlockHeader, } from "@lodestar/state-transition";
-import { ssz } from "@lodestar/types";
-import { getDepositsAndBlockStreamForGenesis, getDepositsStream } from "../../eth1/stream.js";
-export class GenesisBuilder {
-    // Expose state to persist on error
-    state;
-    depositTree;
-    /** Is null if no block has been processed yet */
-    lastProcessedBlockNumber = null;
-    config;
-    eth1Provider;
-    logger;
-    signal;
-    eth1Params;
-    depositCache = new Set();
-    fromBlock;
-    logEvery = 30 * 1000;
-    lastLog = 0;
-    /** Current count of active validators in the state */
-    activatedValidatorCount;
-    constructor({ config, eth1Provider, logger, signal, pendingStatus, maxBlocksPerPoll }) {
-        // at genesis builder, there is no genesis validator so we don't have a real BeaconConfig
-        // but we need BeaconConfig to temporarily create CachedBeaconState, the cast here is safe since we don't use any getDomain here
-        // the use of state as CachedBeaconState is just for convenient, GenesisResult returns TreeView anyway
-        this.eth1Provider = eth1Provider;
-        this.logger = logger;
-        this.signal = signal;
-        this.eth1Params = {
-            ...config,
-            maxBlocksPerPoll: maxBlocksPerPoll ?? 10000,
-        };
-        let stateView;
-        if (pendingStatus) {
-            this.logger.info("Restoring pending genesis state", { block: pendingStatus.lastProcessedBlockNumber });
-            stateView = pendingStatus.state;
-            this.depositTree = pendingStatus.depositTree;
-            this.fromBlock = Math.max(pendingStatus.lastProcessedBlockNumber + 1, this.eth1Provider.deployBlock);
-        }
-        else {
-            stateView = getGenesisBeaconState(config, ssz.phase0.Eth1Data.defaultValue(), getTemporaryBlockHeader(config, config.getForkTypes(GENESIS_SLOT).BeaconBlock.defaultValue()));
-            this.depositTree = ssz.phase0.DepositDataRootList.defaultViewDU();
-            this.fromBlock = this.eth1Provider.deployBlock;
-        }
-        // TODO - PENDING: Ensure EpochCacheImmutableData is created only once
-        this.state = createCachedBeaconState(stateView, createEmptyEpochCacheImmutableData(config, stateView));
-        this.config = this.state.config;
-        this.activatedValidatorCount = getActiveValidatorIndices(stateView, GENESIS_EPOCH).length;
-    }
-    /**
-     * Get eth1 deposit events and blocks and apply to this.state until we found genesis.
-     */
-    async waitForGenesis() {
-        await this.eth1Provider.validateContract();
-        // Load data from data from this.db.depositData, this.db.depositDataRoot
-        // And start from a more recent fromBlock
-        const blockNumberValidatorGenesis = await this.waitForGenesisValidators();
-        const depositsAndBlocksStream = getDepositsAndBlockStreamForGenesis(blockNumberValidatorGenesis, this.eth1Provider, this.eth1Params, this.signal);
-        for await (const [depositEvents, block] of depositsAndBlocksStream) {
-            this.applyDeposits(depositEvents);
-            applyTimestamp(this.config, this.state, block.timestamp);
-            applyEth1BlockHash(this.state, block.blockHash);
-            this.lastProcessedBlockNumber = block.blockNumber;
-            if (this.state.genesisTime >= this.config.MIN_GENESIS_TIME &&
-                this.activatedValidatorCount >= this.config.MIN_GENESIS_ACTIVE_VALIDATOR_COUNT) {
-                this.logger.info("Found genesis state", { blockNumber: block.blockNumber });
-                return {
-                    state: this.state,
-                    depositTree: this.depositTree,
-                    block,
-                };
-            }
-            this.throttledLog(`Waiting for min genesis time ${block.timestamp} / ${this.config.MIN_GENESIS_TIME}`);
-        }
-        throw Error("depositsStream stopped without a valid genesis state");
-    }
-    /**
-     * First phase of waiting for genesis.
-     * Stream deposits events in batches as big as possible without querying block data
-     * @returns Block number at which there are enough active validators is state for genesis
-     */
-    async waitForGenesisValidators() {
-        const depositsStream = getDepositsStream(this.fromBlock, this.eth1Provider, this.eth1Params, this.signal);
-        for await (const { depositEvents, blockNumber } of depositsStream) {
-            this.applyDeposits(depositEvents);
-            this.lastProcessedBlockNumber = blockNumber;
-            if (this.activatedValidatorCount >= this.config.MIN_GENESIS_ACTIVE_VALIDATOR_COUNT) {
-                this.logger.info("Found enough genesis validators", { blockNumber });
-                return blockNumber;
-            }
-            this.throttledLog(`Found ${this.state.validators.length} / ${this.config.MIN_GENESIS_ACTIVE_VALIDATOR_COUNT} validators to genesis`);
-        }
-        throw Error("depositsStream stopped without a valid genesis state");
-    }
-    applyDeposits(depositEvents) {
-        const newDeposits = depositEvents
-            .filter((depositEvent) => !this.depositCache.has(depositEvent.index))
-            .map((depositEvent) => {
-            this.depositCache.add(depositEvent.index);
-            this.depositTree.push(ssz.phase0.DepositData.hashTreeRoot(depositEvent.depositData));
-            const gindex = toGindex(this.depositTree.type.depth, BigInt(depositEvent.index));
-            // Apply changes from the push above
-            this.depositTree.commit();
-            const depositTreeNode = this.depositTree.node;
-            return {
-                proof: new Tree(depositTreeNode).getSingleProof(gindex),
-                data: depositEvent.depositData,
-            };
-        });
-        const { activatedValidatorCount } = applyDeposits(this.config, this.state, newDeposits, this.depositTree);
-        this.activatedValidatorCount += activatedValidatorCount;
-        // TODO: If necessary persist deposits here to this.db.depositData, this.db.depositDataRoot
-    }
-    /** Throttle genesis generation status log to prevent spamming */
-    throttledLog(message) {
-        if (Date.now() - this.lastLog > this.logEvery) {
-            this.lastLog = Date.now();
-            this.logger.info(message);
-        }
-    }
-}
-//# sourceMappingURL=genesis.js.map

package/lib/chain/genesis/genesis.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"genesis.js","sourceRoot":"","sources":["../../../src/chain/genesis/genesis.ts"],"names":[],"mappings":"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"}

package/lib/chain/genesis/interface.d.ts

@@ -1,13 +0,0 @@
-import { CompositeViewDU, VectorCompositeType } from "@chainsafe/ssz";
-import { CachedBeaconStateAllForks } from "@lodestar/state-transition";
-import { ssz } from "@lodestar/types";
-import { Eth1Block } from "../../eth1/interface.js";
-export type GenesisResult = {
-    state: CachedBeaconStateAllForks;
-    depositTree: CompositeViewDU<VectorCompositeType<typeof ssz.Root>>;
-    block: Eth1Block;
-};
-export interface IGenesisBuilder {
-    waitForGenesis: () => Promise<GenesisResult>;
-}
-//# sourceMappingURL=interface.d.ts.map

package/lib/chain/genesis/interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/chain/genesis/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAC,yBAAyB,EAAC,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAElD,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,yBAAyB,CAAC;IACjC,WAAW,EAAE,eAAe,CAAC,mBAAmB,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;CAC9C"}

package/lib/chain/genesis/interface.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=interface.js.map

package/lib/chain/genesis/interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/chain/genesis/interface.ts"],"names":[],"mappings":""}