@lodestar/beacon-node 1.38.0 → 1.39.0-dev.39dac0f03d

package/src/execution/engine/mock.ts

@@ -9,9 +9,8 @@ import {
   ForkSeq,
 } from "@lodestar/params";
 import {ExecutionPayload, RootHex, bellatrix, deneb, ssz} from "@lodestar/types";
-import {fromHex, toHex, toRootHex} from "@lodestar/utils";
+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;
@@ -70,7 +69,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
   finalizedBlockHash = ZERO_HASH_HEX;
   readonly payloadIdCache = new PayloadIdCache();
 
-  /** Known valid blocks, both pre-merge and post-merge */
+  /** Known valid blocks */
   private readonly validBlocks = new Map<RootHex, ExecutionBlock>();
   /** Preparing payloads to be retrieved via engine_getPayloadV1 */
   private readonly preparingPayloads = new Map<number, PreparedPayload>();
@@ -135,18 +134,6 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
     return [] as ExecutionPayloadBodyRpc[];
   }
 
-  /**
-   * Mock manipulator to add more known blocks to this mock.
-   */
-  addPowBlock(powBlock: bellatrix.PowBlock): void {
-    this.validBlocks.set(toHex(powBlock.blockHash), {
-      parentHash: toHex(powBlock.parentHash),
-      blockHash: toHex(powBlock.blockHash),
-      timestamp: 0,
-      blockNumber: 0,
-    });
-  }
-
   /**
    * Mock manipulator to add predefined responses before execution engine client calls
    */
@@ -258,7 +245,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
     //    section of the EIP. Additionally, if this validation fails, client software MUST NOT update the forkchoice
     //    state and MUST NOT begin a payload build process.
     //
-    // > TODO
+    // > N/A: All networks have completed the merge transition
 
     // 4. Before updating the forkchoice state, client software MUST ensure the validity of the payload referenced by
     //    forkchoiceState.headBlockHash, and MAY validate the payload while processing the call. The validation process

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,150 +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",
-      }),
-
-      // Merge Search info
-      eth1MergeStatus: register.gauge({
-        name: "lodestar_eth1_merge_status",
-        help: "Eth1 Merge Status 0 PRE_MERGE 1 SEARCHING 2 FOUND 3 POST_MERGE",
-      }),
-      eth1MergeTDFactor: register.gauge({
-        name: "lodestar_eth1_merge_td_factor",
-        help: "TTD set for the merge",
-      }),
-      eth1MergeTTD: register.gauge({
-        name: "lodestar_eth1_merge_ttd",
-        help: "TTD set for the merge scaled down by td_factor",
-      }),
-
-      eth1PollMergeBlockErrors: register.gauge({
-        name: "lodestar_eth1_poll_merge_block_errors_total",
-        help: "Total count of errors polling merge block",
-      }),
-      getTerminalPowBlockPromiseCacheHit: register.gauge({
-        name: "lodestar_eth1_get_terminal_pow_block_promise_cache_hit_total",
-        help: "Total count of skipped runs in poll merge block, because a previous promise existed",
-      }),
-      eth1ParentBlocksFetched: register.gauge({
-        name: "lodestar_eth1_parent_blocks_fetched_total",
-        help: "Total count of parent blocks fetched searching for merge block",
-      }),
-
-      // Latest block details
-      eth1LatestBlockTD: register.gauge({
-        name: "lodestar_eth1_latest_block_ttd",
-        help: "Eth1 latest Block td scaled down by td_factor",
-      }),
-      eth1LatestBlockNumber: register.gauge({
-        name: "lodestar_eth1_latest_block_number",
-        help: "Eth1 latest block number",
-      }),
-      eth1LatestBlockTimestamp: register.gauge({
-        name: "lodestar_eth1_latest_block_timestamp",
-        help: "Eth1 latest block timestamp",
-      }),
-
-      // Merge details
-      eth1MergeBlockDetails: register.gauge<{
-        terminalBlockHash: string;
-        terminalBlockNumber: string;
-        terminalBlockTD: string;
-      }>({
-        name: "lodestar_eth1_merge_block_details",
-        help: "If found then 1 with terminal block details",
-        labelNames: ["terminalBlockHash", "terminalBlockNumber", "terminalBlockTD"],
-      }),
-    },
-
-    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/network/core/events.ts

@@ -2,7 +2,7 @@ import EventEmitter from "node:events";
 import {ResponseIncoming, ResponseOutgoing} from "@lodestar/reqresp";
 import {AsyncIterableEventBus, IteratorEvent, RequestEvent} from "../../util/asyncIterableToEvents.js";
 import {StrictEventEmitterSingleArg} from "../../util/strictEvents.js";
-import {EventDirection} from "../../util/workerEvents.js";
+import {EventDirection} from "../events.js";
 import {IncomingRequestArgs, OutgoingRequestArgs} from "../reqresp/types.js";
 
 export enum ReqRespBridgeEvent {

package/src/network/events.ts

@@ -3,7 +3,6 @@ import {PeerId, TopicValidatorResult} from "@libp2p/interface";
 import {CustodyIndex, Status} from "@lodestar/types";
 import {PeerIdStr} from "../util/peerId.js";
 import {StrictEventEmitterSingleArg} from "../util/strictEvents.js";
-import {EventDirection} from "../util/workerEvents.js";
 import {PendingGossipsubMessage} from "./processor/types.js";
 import {RequestTypedContainer} from "./reqresp/ReqRespBeaconNode.js";
 
@@ -38,6 +37,13 @@ export type NetworkEventData = {
   };
 };
 
+export enum EventDirection {
+  workerToMain,
+  mainToWorker,
+  /** Event not emitted through worker boundary */
+  none,
+}
+
 export const networkEventDirection: Record<NetworkEvent, EventDirection> = {
   [NetworkEvent.peerConnected]: EventDirection.workerToMain,
   [NetworkEvent.peerDisconnected]: EventDirection.workerToMain,

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/notifier.ts

@@ -36,7 +36,6 @@ export async function runNodeNotifier(modules: NodeNotifierModules): Promise<voi
   const {network, chain, sync, config, logger, signal} = modules;
 
   const headSlotTimeSeries = new TimeSeries({maxPoints: 10});
-  const tdTimeSeries = new TimeSeries({maxPoints: 50});
 
   const SLOTS_PER_SYNC_COMMITTEE_PERIOD = SLOTS_PER_EPOCH * EPOCHS_PER_SYNC_COMMITTEE_PERIOD;
   let hasLowPeerCount = false;
@@ -87,21 +86,6 @@ export async function runNodeNotifier(modules: NodeNotifierModules): Promise<voi
       const executionInfo = getHeadExecutionInfo(config, clockEpoch, headState, headInfo);
       const finalizedCheckpointRow = `finalized: ${prettyBytes(finalizedRoot)}:${finalizedEpoch}`;
 
-      // Log in TD progress in separate line to not clutter regular status update.
-      // This line will only exist between BELLATRIX_FORK_EPOCH and TTD, a window of some days / weeks max.
-      // Notifier log lines must be kept at a reasonable max width otherwise it's very hard to read
-      const tdProgress = chain.eth1.getTDProgress();
-      if (tdProgress !== null && !tdProgress.ttdHit) {
-        tdTimeSeries.addPoint(tdProgress.tdDiffScaled, tdProgress.timestamp);
-
-        const timestampTDD = tdTimeSeries.computeY0Point();
-        // It is possible to get ttd estimate with an error at imminent merge
-        const secToTTD = Math.max(Math.floor(timestampTDD - Date.now() / 1000), 0);
-        const timeLeft = Number.isFinite(secToTTD) ? prettyTimeDiffSec(secToTTD) : "?";
-
-        logger.info(`TTD in ${timeLeft} current TD ${tdProgress.td} / ${tdProgress.ttd}`);
-      }
-
       let nodeState: string[];
       switch (sync.state) {
         case SyncState.SyncingFinalized:

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/src/sync/backfill/backfill.ts

@@ -750,7 +750,13 @@ export class BackfillSync extends (EventEmitter as {new (): BackfillSyncEmitter}
 
     // GENESIS_SLOT doesn't has valid signature
     if (anchorBlock.message.slot === GENESIS_SLOT) return;
-    await verifyBlockProposerSignature(this.chain.bls, this.chain.getHeadState(), [anchorBlock]);
+    await verifyBlockProposerSignature(
+      this.chain.config,
+      this.chain.index2pubkey,
+      this.chain.bls,
+      this.chain.getHeadState(),
+      [anchorBlock]
+    );
 
     // We can write to the disk if this is ahead of prevFinalizedCheckpointBlock otherwise
     // we will need to go make checks on the top of sync loop before writing as it might
@@ -815,7 +821,13 @@ export class BackfillSync extends (EventEmitter as {new (): BackfillSyncEmitter}
 
     // If any of the block's proposer signature fail, we can't trust this peer at all
     if (verifiedBlocks.length > 0) {
-      await verifyBlockProposerSignature(this.chain.bls, this.chain.getHeadState(), verifiedBlocks);
+      await verifyBlockProposerSignature(
+        this.chain.config,
+        this.chain.index2pubkey,
+        this.chain.bls,
+        this.chain.getHeadState(),
+        verifiedBlocks
+      );
 
       // This is bad, like super bad. Abort the backfill
       if (!nextAnchor)

package/src/sync/backfill/verify.ts

@@ -1,6 +1,11 @@
 import {BeaconConfig} from "@lodestar/config";
 import {GENESIS_SLOT} from "@lodestar/params";
-import {CachedBeaconStateAllForks, ISignatureSet, getBlockProposerSignatureSet} from "@lodestar/state-transition";
+import {
+  CachedBeaconStateAllForks,
+  ISignatureSet,
+  Index2PubkeyCache,
+  getBlockProposerSignatureSet,
+} from "@lodestar/state-transition";
 import {Root, SignedBeaconBlock, Slot, ssz} from "@lodestar/types";
 import {IBlsVerifier} from "../../chain/bls/index.js";
 import {BackfillSyncError, BackfillSyncErrorCode} from "./errors.js";
@@ -41,6 +46,8 @@ export function verifyBlockSequence(
 }
 
 export async function verifyBlockProposerSignature(
+  config: BeaconConfig,
+  index2pubkey: Index2PubkeyCache,
   bls: IBlsVerifier,
   state: CachedBeaconStateAllForks,
   blocks: SignedBeaconBlock[]
@@ -48,7 +55,8 @@ export async function verifyBlockProposerSignature(
   if (blocks.length === 1 && blocks[0].message.slot === GENESIS_SLOT) return;
   const signatures = blocks.reduce((sigs: ISignatureSet[], block) => {
     // genesis block doesn't have valid signature
-    if (block.message.slot !== GENESIS_SLOT) sigs.push(getBlockProposerSignatureSet(state, block));
+    if (block.message.slot !== GENESIS_SLOT)
+      sigs.push(getBlockProposerSignatureSet(config, index2pubkey, state, block));
     return sigs;
   }, []);