@lodestar/validator 1.46.0-dev.ba5ee9aff0 → 1.46.0-dev.c65aaefd91

package/src/services/syncCommittee.ts

@@ -1,11 +1,12 @@
 import {ApiClient} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {ForkName, isForkPostAltair} from "@lodestar/params";
+import {IClock} from "@lodestar/state-transition";
 import {CommitteeIndex, Root, Slot, altair} from "@lodestar/types";
 import {sleep} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {ChainHeaderTracker} from "./chainHeaderTracker.js";
 import {ValidatorEventEmitter} from "./emitter.js";
 import {SyncCommitteeDutiesService, SyncDutyAndProofs} from "./syncCommitteeDuties.js";
@@ -66,7 +67,16 @@ export class SyncCommitteeService {
         return;
       }
 
-      // Fetch info first so a potential delay is absorbed by the sleep() below
+      // An optimistic validator MUST NOT participate in sync committees, since it has not
+      // fully verified the execution payload of the head block it would sign over.
+      // https://github.com/ethereum/consensus-specs/blob/v1.6.1/sync/optimistic.md#participating-in-sync-committees
+      if (this.syncingStatusTracker.isNodeOptimistic() === true) {
+        this.logger.debug("Skipping sync committee duties while node is optimistic", {slot});
+        return;
+      }
+
+      // Fetch info first so a potential delay is absorbed by the sleep() below.
+      // This signs selection proofs, so keep it after the optimistic-node gate above.
       const dutiesAtSlot = await this.dutiesService.getDutiesAtSlot(slot);
       if (dutiesAtSlot.length === 0) {
         return;
@@ -82,9 +92,15 @@ export class SyncCommitteeService {
       ]);
       this.metrics?.syncCommitteeStepCallProduceMessage.observe(this.clock.secFromSlot(slot) - syncMessageDueMs / 1000);
 
-      // Step 1. Download, sign and publish an `SyncCommitteeMessage` for each validator.
+      const head = await this.getHeadForSyncCommitteeMessage(slot);
+      if (head.executionOptimistic) {
+        this.logger.debug("Skipping sync committee duties while head is optimistic", {slot});
+        return;
+      }
+
+      // Step 1. Sign and publish a `SyncCommitteeMessage` for each validator.
       //         Differs from AttestationService, `SyncCommitteeMessage` are equal for all
-      const beaconBlockRoot = await this.produceAndPublishSyncCommittees(fork, slot, dutiesAtSlot);
+      const beaconBlockRoot = await this.produceAndPublishSyncCommittees(fork, slot, head.root, dutiesAtSlot);
 
       // Step 2. If an attestation was produced, make an aggregate.
       // First, wait until the `CONTRIBUTION_DUE_BPS` of the slot
@@ -126,6 +142,7 @@ export class SyncCommitteeService {
   private async produceAndPublishSyncCommittees(
     fork: ForkName,
     slot: Slot,
+    blockRoot: Root,
     duties: SyncDutyAndProofs[]
   ): Promise<Root> {
     const logCtx = {slot};
@@ -136,10 +153,6 @@ export class SyncCommitteeService {
     // Spec: the validator should prepare a SyncCommitteeMessage for the previous slot (slot - 1)
     // as soon as they have determined the head block of slot - 1
 
-    const blockRoot: Uint8Array =
-      this.chainHeaderTracker.getCurrentChainHead(slot) ??
-      (await this.api.beacon.getBlockRoot({blockId: "head"})).value().root;
-
     const signatures: altair.SyncCommitteeMessage[] = [];
 
     await Promise.all(
@@ -182,6 +195,16 @@ export class SyncCommitteeService {
     return blockRoot;
   }
 
+  private async getHeadForSyncCommitteeMessage(slot: Slot): Promise<{root: Root; executionOptimistic: boolean}> {
+    const cachedHead = this.chainHeaderTracker.getCurrentChainHeadData(slot);
+    if (cachedHead) {
+      return cachedHead;
+    }
+
+    const res = await this.api.beacon.getBlockRoot({blockId: "head"});
+    return {root: res.value().root, executionOptimistic: res.meta().executionOptimistic};
+  }
+
   /**
    * Performs the second step of the attesting process: downloading an aggregated `SyncCommittee`,
    * converting it into a `SignedAggregateAndProof` and returning it to the BN.

package/src/services/syncCommitteeDuties.ts

@@ -2,6 +2,7 @@ import {ApiClient, routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SYNC_COMMITTEE_SUBNET_SIZE} from "@lodestar/params";
 import {
+  IClock,
   computeEpochAtSlot,
   computeSyncPeriodAtEpoch,
   computeSyncPeriodAtSlot,
@@ -12,7 +13,7 @@ import {BLSSignature, Epoch, Slot, SyncPeriod, ValidatorIndex} from "@lodestar/t
 import {toPubkeyHex} from "@lodestar/utils";
 import {Metrics} from "../metrics.js";
 import {PubkeyHex} from "../types.js";
-import {IClock, LoggerVc} from "../util/index.js";
+import {LoggerVc} from "../util/index.js";
 import {SyncingStatusTracker} from "./syncingStatusTracker.js";
 import {syncCommitteeIndicesToSubnets} from "./utils.js";
 import {ValidatorStore} from "./validatorStore.js";

package/src/services/syncingStatusTracker.ts

@@ -1,8 +1,8 @@
 import {ApiClient, routes} from "@lodestar/api";
+import {IClock} from "@lodestar/state-transition";
 import {Slot} from "@lodestar/types";
 import {Logger} from "@lodestar/utils";
 import {BeaconHealth, Metrics} from "../metrics.js";
-import {IClock} from "../util/clock.js";
 
 export type SyncingStatus = routes.node.SyncingStatus;
 
@@ -35,6 +35,20 @@ export class SyncingStatusTracker {
     this.fns.push(fn);
   }
 
+  /**
+   * Whether the node is currently optimistic (i.e. the head block's execution payload
+   * has not yet been validated) based on the last successful syncing status check.
+   *
+   * Returns `undefined` if the status is not yet known (never fetched or last check
+   * errored); callers should not assume the node is optimistic in that case.
+   */
+  isNodeOptimistic(): boolean | undefined {
+    if (this.prevSyncingStatus === undefined || this.prevSyncingStatus instanceof Error) {
+      return undefined;
+    }
+    return this.prevSyncingStatus.isOptimistic;
+  }
+
   private checkSyncingStatus = async (slot: Slot, signal: AbortSignal): Promise<void> => {
     try {
       const syncingStatus = (await this.api.node.getSyncingStatus()).value();

package/src/services/validatorStore.ts

@@ -738,7 +738,7 @@ export class ValidatorStore {
       proposalSlot: duty.slot,
       validatorIndex: duty.validatorIndex,
       feeRecipient: fromHex(feeRecipient),
-      targetGasLimit: gasLimit,
+      targetGasLimit: BigInt(gasLimit),
     };
 
     const signingSlot = duty.slot;

package/src/util/index.ts

@@ -1,5 +1,4 @@
 export * from "./batch.js";
-export * from "./clock.js";
 export * from "./difference.js";
 export * from "./logger.js";
 export * from "./url.js";

package/src/util/logger.ts

@@ -1,6 +1,6 @@
 import {ApiError} from "@lodestar/api";
+import {IClock} from "@lodestar/state-transition";
 import {LogData, Logger, isErrorAborted} from "@lodestar/utils";
-import {IClock} from "./clock.js";
 
 export type LoggerVc = Logger & {
   isSyncing(e: Error): void;

package/src/validator.ts

@@ -6,7 +6,7 @@ import {
   assertEqualParams,
   createBeaconConfig,
 } from "@lodestar/config";
-import {computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
+import {Clock, ClockOptions, IClock, computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
 import {BLSPubkey, phase0, ssz} from "@lodestar/types";
 import {Genesis} from "@lodestar/types/phase0";
 import {Logger, toPrintableUrl, toRootHex} from "@lodestar/utils";
@@ -29,7 +29,6 @@ import {SyncingStatusTracker} from "./services/syncingStatusTracker.js";
 import {Signer, ValidatorProposerConfig, ValidatorStore, defaultOptions} from "./services/validatorStore.js";
 import {ISlashingProtection, Interchange, InterchangeFormatVersion} from "./slashingProtection/index.js";
 import {LodestarValidatorDatabaseController, ProcessShutdownCallback, PubkeyHex} from "./types.js";
-import {Clock, ClockOptions, IClock} from "./util/clock.js";
 import {getLoggerVc} from "./util/index.js";
 
 export type ValidatorModules = {
@@ -362,7 +361,7 @@ export class Validator {
 
     const res = await api.config.getSpec();
     assertEqualParams(config, res.value());
-    logger.info("Verified connected beacon node and validator have same the config");
+    logger.info("Verified connected beacon node and validator have the same config");
 
     await assertEqualGenesis(opts, genesis);
     logger.info("Verified connected beacon node and validator have the same genesisValidatorRoot");

package/lib/util/clock.d.ts

@@ -1,55 +0,0 @@
-import { ChainForkConfig } from "@lodestar/config";
-import { Epoch, Slot, TimeSeconds } from "@lodestar/types";
-import { Logger } from "@lodestar/utils";
-type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
-export type ClockOptions = {
-    skipSlots?: boolean;
-};
-export interface IClock {
-    readonly genesisTime: number;
-    readonly secondsPerSlot: number;
-    readonly currentEpoch: number;
-    start(signal: AbortSignal): void;
-    runEverySlot(fn: (slot: Slot, signal: AbortSignal) => Promise<void>): void;
-    runEveryEpoch(fn: (epoch: Epoch, signal: AbortSignal) => Promise<void>): void;
-    msToSlot(slot: Slot): number;
-    msFromSlot(slot: Slot): number;
-    secFromSlot(slot: Slot): number;
-    getCurrentSlot(): Slot;
-    getCurrentEpoch(): Epoch;
-}
-export declare enum TimeItem {
-    Slot = 0,
-    Epoch = 1
-}
-export declare class Clock implements IClock {
-    private readonly opts;
-    readonly genesisTime: number;
-    readonly secondsPerSlot: number;
-    private readonly config;
-    private readonly logger;
-    private readonly fns;
-    constructor(config: ChainForkConfig, logger: Logger, opts: {
-        genesisTime: number;
-    } & ClockOptions);
-    get currentEpoch(): Epoch;
-    start(signal: AbortSignal): void;
-    getCurrentSlot(): Slot;
-    getCurrentEpoch(): Epoch;
-    runEverySlot(fn: RunEveryFn): void;
-    runEveryEpoch(fn: RunEveryFn): void;
-    /** Milliseconds from now to a specific slot */
-    msToSlot(slot: Slot): number;
-    /** Milliseconds elapsed from a specific slot to now */
-    msFromSlot(slot: Slot): number;
-    /** Seconds elapsed from a specific slot to now */
-    secFromSlot(slot: Slot): number;
-    private runAtMostEvery;
-    private timeUntilNext;
-}
-/**
- * Same to the spec but we use Math.round instead of Math.floor.
- */
-export declare function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot;
-export {};
-//# sourceMappingURL=clock.d.ts.map

package/lib/util/clock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clock.d.ts","sourceRoot":"","sources":["../../src/util/clock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAe,MAAM,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3E,aAAa,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC7B,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC/B,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAChC,cAAc,IAAI,IAAI,CAAC;IACvB,eAAe,IAAI,KAAK,CAAC;CAC1B;AAED,oBAAY,QAAQ;IAClB,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,qBAAa,KAAM,YAAW,MAAM;IAUhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IATvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA8C;IAElE,YACE,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACG,IAAI,EAAE;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,GAAG,YAAY,EAM5D;IAED,IAAI,YAAY,IAAI,KAAK,CAExB;IAED,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAQ/B;IAED,cAAc,IAAI,IAAI,CAErB;IAED,eAAe,IAAI,KAAK,CAEvB;IAED,YAAY,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAEjC;IAED,aAAa,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAElC;IAED,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE3B;IAED,uDAAuD;IACvD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7B;IAED,kDAAkD;IAClD,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE9B;YAQa,cAAc;IA2C5B,OAAO,CAAC,aAAa;CAgBtB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAI5F"}

package/lib/util/clock.js

@@ -1,141 +0,0 @@
-import { GENESIS_SLOT, SLOTS_PER_EPOCH } from "@lodestar/params";
-import { computeEpochAtSlot, computeTimeAtSlot, getCurrentSlot } from "@lodestar/state-transition";
-import { ErrorAborted, isErrorAborted, sleep } from "@lodestar/utils";
-export { TimeItem };
-var TimeItem;
-(function (TimeItem) {
-    TimeItem[TimeItem["Slot"] = 0] = "Slot";
-    TimeItem[TimeItem["Epoch"] = 1] = "Epoch";
-})(TimeItem || (TimeItem = {}));
-export class Clock {
-    opts;
-    genesisTime;
-    secondsPerSlot;
-    config;
-    logger;
-    fns = [];
-    constructor(config, logger, opts) {
-        this.opts = opts;
-        this.genesisTime = opts.genesisTime;
-        this.secondsPerSlot = config.SLOT_DURATION_MS / 1000;
-        this.config = config;
-        this.logger = logger;
-    }
-    get currentEpoch() {
-        return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
-    }
-    start(signal) {
-        for (const { timeItem, fn } of this.fns) {
-            this.runAtMostEvery(timeItem, signal, fn).catch((e) => {
-                if (!isErrorAborted(e)) {
-                    this.logger.error("runAtMostEvery", {}, e);
-                }
-            });
-        }
-    }
-    getCurrentSlot() {
-        return getCurrentSlot(this.config, this.genesisTime);
-    }
-    getCurrentEpoch() {
-        return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
-    }
-    runEverySlot(fn) {
-        this.fns.push({ timeItem: TimeItem.Slot, fn });
-    }
-    runEveryEpoch(fn) {
-        this.fns.push({ timeItem: TimeItem.Epoch, fn });
-    }
-    /** Milliseconds from now to a specific slot */
-    msToSlot(slot) {
-        return computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000 - Date.now();
-    }
-    /** Milliseconds elapsed from a specific slot to now */
-    msFromSlot(slot) {
-        return Date.now() - computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000;
-    }
-    /** Seconds elapsed from a specific slot to now */
-    secFromSlot(slot) {
-        return Date.now() / 1000 - computeTimeAtSlot(this.config, slot, this.genesisTime);
-    }
-    /**
-     * If a task happens to take more than one slot to run, we might skip a slot. This is unfortunate,
-     * however the alternative is to *always* process every slot, which has the chance of creating a
-     * theoretically unlimited backlog of tasks. It was a conscious decision to choose to drop tasks
-     * on an overloaded/latent system rather than overload it even more.
-     */
-    async runAtMostEvery(timeItem, signal, fn) {
-        // Run immediately first
-        let slot = getCurrentSlot(this.config, this.genesisTime);
-        let slotOrEpoch = timeItem === TimeItem.Slot ? slot : computeEpochAtSlot(slot);
-        while (!signal.aborted) {
-            // Must catch fn() to ensure `sleep()` is awaited both for resolve and reject
-            const task = fn(slotOrEpoch, signal).catch((e) => {
-                if (!isErrorAborted(e))
-                    this.logger.error("Error on runEvery fn", {}, e);
-            });
-            if (timeItem !== TimeItem.Slot || this.opts.skipSlots !== false) {
-                // await response to only continue with next task if current task finished within slot
-                await task;
-            }
-            try {
-                await sleep(this.timeUntilNext(timeItem), signal);
-                // calling getCurrentSlot here may not be correct when we're close to the next slot
-                // it's safe to call getCurrentSlotAround after we sleep
-                const nextSlot = getCurrentSlotAround(this.config, this.genesisTime);
-                if (timeItem === TimeItem.Slot) {
-                    if (nextSlot > slot + 1) {
-                        // It's not very likely that we skip more than one slot as HTTP timeout is set
-                        // to SLOT_DURATION_MS so we will fail task before skipping another slot.
-                        this.logger.warn("Skipped slot due to task taking more than one slot to run", {
-                            skippedSlot: slot + 1,
-                        });
-                    }
-                    slotOrEpoch = nextSlot;
-                }
-                else {
-                    slotOrEpoch = computeEpochAtSlot(nextSlot);
-                }
-                slot = nextSlot;
-            }
-            catch (e) {
-                if (e instanceof ErrorAborted) {
-                    return;
-                }
-                throw e;
-            }
-        }
-    }
-    timeUntilNext(timeItem) {
-        const milliSecondsPerSlot = this.config.SLOT_DURATION_MS;
-        const msFromGenesis = Date.now() - this.genesisTime * 1000;
-        if (timeItem === TimeItem.Slot) {
-            if (msFromGenesis >= 0) {
-                return milliSecondsPerSlot - (msFromGenesis % milliSecondsPerSlot);
-            }
-            return Math.abs(msFromGenesis) % milliSecondsPerSlot;
-        }
-        const milliSecondsPerEpoch = SLOTS_PER_EPOCH * milliSecondsPerSlot;
-        if (msFromGenesis >= 0) {
-            return milliSecondsPerEpoch - (msFromGenesis % milliSecondsPerEpoch);
-        }
-        return Math.abs(msFromGenesis) % milliSecondsPerEpoch;
-    }
-}
-/**
- * Same to the spec but we use Math.round instead of Math.floor.
- */
-export function getCurrentSlotAround(config, genesisTime) {
-    const diffInSeconds = Date.now() / 1000 - genesisTime;
-    const slotsSinceGenesis = Math.round((diffInSeconds * 1000) / config.SLOT_DURATION_MS);
-    return GENESIS_SLOT + slotsSinceGenesis;
-}
-// function useEventStream() {
-//   this.stream = this.events.getEventStream([BeaconEventType.BLOCK, BeaconEventType.HEAD, BeaconEventType.CHAIN_REORG]);
-//   pipeToEmitter(this.stream, this).catch((e: Error) => {
-//     this.logger.error("Error on stream pipe", {}, e);
-//   });
-//   // On stop
-//   this.stream.stop();
-//   this.stream = null;
-// }
-//# sourceMappingURL=clock.js.map

package/lib/util/clock.js.map

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

package/src/util/clock.ts

@@ -1,182 +0,0 @@
-import {ChainForkConfig} from "@lodestar/config";
-import {GENESIS_SLOT, SLOTS_PER_EPOCH} from "@lodestar/params";
-import {computeEpochAtSlot, computeTimeAtSlot, getCurrentSlot} from "@lodestar/state-transition";
-import {Epoch, Slot, TimeSeconds} from "@lodestar/types";
-import {ErrorAborted, Logger, isErrorAborted, sleep} from "@lodestar/utils";
-
-type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
-
-export type ClockOptions = {
-  skipSlots?: boolean;
-};
-
-export interface IClock {
-  readonly genesisTime: number;
-  readonly secondsPerSlot: number;
-
-  readonly currentEpoch: number;
-
-  start(signal: AbortSignal): void;
-  runEverySlot(fn: (slot: Slot, signal: AbortSignal) => Promise<void>): void;
-  runEveryEpoch(fn: (epoch: Epoch, signal: AbortSignal) => Promise<void>): void;
-  msToSlot(slot: Slot): number;
-  msFromSlot(slot: Slot): number;
-  secFromSlot(slot: Slot): number;
-  getCurrentSlot(): Slot;
-  getCurrentEpoch(): Epoch;
-}
-
-export enum TimeItem {
-  Slot,
-  Epoch,
-}
-
-export class Clock implements IClock {
-  readonly genesisTime: number;
-  readonly secondsPerSlot: number;
-  private readonly config: ChainForkConfig;
-  private readonly logger: Logger;
-  private readonly fns: {timeItem: TimeItem; fn: RunEveryFn}[] = [];
-
-  constructor(
-    config: ChainForkConfig,
-    logger: Logger,
-    private readonly opts: {genesisTime: number} & ClockOptions
-  ) {
-    this.genesisTime = opts.genesisTime;
-    this.secondsPerSlot = config.SLOT_DURATION_MS / 1000;
-    this.config = config;
-    this.logger = logger;
-  }
-
-  get currentEpoch(): Epoch {
-    return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
-  }
-
-  start(signal: AbortSignal): void {
-    for (const {timeItem, fn} of this.fns) {
-      this.runAtMostEvery(timeItem, signal, fn).catch((e: Error) => {
-        if (!isErrorAborted(e)) {
-          this.logger.error("runAtMostEvery", {}, e);
-        }
-      });
-    }
-  }
-
-  getCurrentSlot(): Slot {
-    return getCurrentSlot(this.config, this.genesisTime);
-  }
-
-  getCurrentEpoch(): Epoch {
-    return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
-  }
-
-  runEverySlot(fn: RunEveryFn): void {
-    this.fns.push({timeItem: TimeItem.Slot, fn});
-  }
-
-  runEveryEpoch(fn: RunEveryFn): void {
-    this.fns.push({timeItem: TimeItem.Epoch, fn});
-  }
-
-  /** Milliseconds from now to a specific slot */
-  msToSlot(slot: Slot): number {
-    return computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000 - Date.now();
-  }
-
-  /** Milliseconds elapsed from a specific slot to now */
-  msFromSlot(slot: Slot): number {
-    return Date.now() - computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000;
-  }
-
-  /** Seconds elapsed from a specific slot to now */
-  secFromSlot(slot: Slot): number {
-    return Date.now() / 1000 - computeTimeAtSlot(this.config, slot, this.genesisTime);
-  }
-
-  /**
-   * If a task happens to take more than one slot to run, we might skip a slot. This is unfortunate,
-   * however the alternative is to *always* process every slot, which has the chance of creating a
-   * theoretically unlimited backlog of tasks. It was a conscious decision to choose to drop tasks
-   * on an overloaded/latent system rather than overload it even more.
-   */
-  private async runAtMostEvery(timeItem: TimeItem, signal: AbortSignal, fn: RunEveryFn): Promise<void> {
-    // Run immediately first
-    let slot = getCurrentSlot(this.config, this.genesisTime);
-    let slotOrEpoch = timeItem === TimeItem.Slot ? slot : computeEpochAtSlot(slot);
-    while (!signal.aborted) {
-      // Must catch fn() to ensure `sleep()` is awaited both for resolve and reject
-      const task = fn(slotOrEpoch, signal).catch((e: Error) => {
-        if (!isErrorAborted(e)) this.logger.error("Error on runEvery fn", {}, e);
-      });
-
-      if (timeItem !== TimeItem.Slot || this.opts.skipSlots !== false) {
-        // await response to only continue with next task if current task finished within slot
-        await task;
-      }
-
-      try {
-        await sleep(this.timeUntilNext(timeItem), signal);
-        // calling getCurrentSlot here may not be correct when we're close to the next slot
-        // it's safe to call getCurrentSlotAround after we sleep
-        const nextSlot = getCurrentSlotAround(this.config, this.genesisTime);
-
-        if (timeItem === TimeItem.Slot) {
-          if (nextSlot > slot + 1) {
-            // It's not very likely that we skip more than one slot as HTTP timeout is set
-            // to SLOT_DURATION_MS so we will fail task before skipping another slot.
-            this.logger.warn("Skipped slot due to task taking more than one slot to run", {
-              skippedSlot: slot + 1,
-            });
-          }
-          slotOrEpoch = nextSlot;
-        } else {
-          slotOrEpoch = computeEpochAtSlot(nextSlot);
-        }
-        slot = nextSlot;
-      } catch (e) {
-        if (e instanceof ErrorAborted) {
-          return;
-        }
-        throw e;
-      }
-    }
-  }
-
-  private timeUntilNext(timeItem: TimeItem): number {
-    const milliSecondsPerSlot = this.config.SLOT_DURATION_MS;
-    const msFromGenesis = Date.now() - this.genesisTime * 1000;
-
-    if (timeItem === TimeItem.Slot) {
-      if (msFromGenesis >= 0) {
-        return milliSecondsPerSlot - (msFromGenesis % milliSecondsPerSlot);
-      }
-      return Math.abs(msFromGenesis) % milliSecondsPerSlot;
-    }
-    const milliSecondsPerEpoch = SLOTS_PER_EPOCH * milliSecondsPerSlot;
-    if (msFromGenesis >= 0) {
-      return milliSecondsPerEpoch - (msFromGenesis % milliSecondsPerEpoch);
-    }
-    return Math.abs(msFromGenesis) % milliSecondsPerEpoch;
-  }
-}
-
-/**
- * Same to the spec but we use Math.round instead of Math.floor.
- */
-export function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot {
-  const diffInSeconds = Date.now() / 1000 - genesisTime;
-  const slotsSinceGenesis = Math.round((diffInSeconds * 1000) / config.SLOT_DURATION_MS);
-  return GENESIS_SLOT + slotsSinceGenesis;
-}
-
-// function useEventStream() {
-//   this.stream = this.events.getEventStream([BeaconEventType.BLOCK, BeaconEventType.HEAD, BeaconEventType.CHAIN_REORG]);
-//   pipeToEmitter(this.stream, this).catch((e: Error) => {
-//     this.logger.error("Error on stream pipe", {}, e);
-//   });
-
-//   // On stop
-//   this.stream.stop();
-//   this.stream = null;
-// }