@lodestar/beacon-node 1.35.0-dev.fcf8d024ea → 1.35.0-rc.0

package/src/network/network.ts

@@ -7,7 +7,7 @@ import {BeaconConfig} from "@lodestar/config";
 import {LoggerNode} from "@lodestar/logger/node";
 import {ForkSeq} from "@lodestar/params";
 import {ResponseIncoming} from "@lodestar/reqresp";
-import {computeEpochAtSlot} from "@lodestar/state-transition";
+import {computeEpochAtSlot, computeTimeAtSlot} from "@lodestar/state-transition";
 import {
   AttesterSlashing,
   LightClientBootstrap,
@@ -689,9 +689,9 @@ export class Network implements INetwork {
     // TODO: Review is OK to remove if (this.hasAttachedSyncCommitteeMember())
 
     try {
-      // messages SHOULD be broadcast after SYNC_MESSAGE_DUE_BPS of slot has transpired
+      // messages SHOULD be broadcast after one-third of slot has transpired
       // https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/p2p-interface.md#sync-committee
-      await this.waitForSyncMessageCutoff(finalityUpdate.signatureSlot);
+      await this.waitOneThirdOfSlot(finalityUpdate.signatureSlot);
       await this.publishLightClientFinalityUpdate(finalityUpdate);
     } catch (e) {
       // Non-mandatory route on most of network as of Oct 2022. May not have found any peers on topic yet
@@ -706,9 +706,9 @@ export class Network implements INetwork {
     // TODO: Review is OK to remove if (this.hasAttachedSyncCommitteeMember())
 
     try {
-      // messages SHOULD be broadcast after SYNC_MESSAGE_DUE_BPS of slot has transpired
+      // messages SHOULD be broadcast after one-third of slot has transpired
       // https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/p2p-interface.md#sync-committee
-      await this.waitForSyncMessageCutoff(optimisticUpdate.signatureSlot);
+      await this.waitOneThirdOfSlot(optimisticUpdate.signatureSlot);
       await this.publishLightClientOptimisticUpdate(optimisticUpdate);
     } catch (e) {
       // Non-mandatory route on most of network as of Oct 2022. May not have found any peers on topic yet
@@ -719,10 +719,10 @@ export class Network implements INetwork {
     }
   };
 
-  private waitForSyncMessageCutoff = async (slot: number): Promise<void> => {
-    const fork = this.config.getForkName(slot);
-    const msToCutoffTime = this.config.getSyncMessageDueMs(fork) - this.chain.clock.msFromSlot(slot);
-    await sleep(msToCutoffTime, this.controller.signal);
+  private waitOneThirdOfSlot = async (slot: number): Promise<void> => {
+    const secAtSlot = computeTimeAtSlot(this.config, slot + 1 / 3, this.chain.genesisTime);
+    const msToSlot = secAtSlot * 1000 - Date.now();
+    await sleep(msToSlot, this.controller.signal);
   };
 
   private onHead = async (): Promise<void> => {

package/src/sync/unknownBlock.ts

@@ -1,5 +1,5 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {ForkSeq} from "@lodestar/params";
+import {ForkSeq, INTERVALS_PER_SLOT} from "@lodestar/params";
 import {RequestError, RequestErrorCode} from "@lodestar/reqresp";
 import {RootHex} from "@lodestar/types";
 import {Logger, prettyPrintIndices, pruneSetToMax, sleep} from "@lodestar/utils";
@@ -78,6 +78,7 @@ export class BlockInputSync {
    */
   private readonly pendingBlocks = new Map<RootHex, BlockInputSyncCacheItem>();
   private readonly knownBadBlocks = new Set<RootHex>();
+  private readonly proposerBoostSecWindow: number;
   private readonly maxPendingBlocks;
   private subscribedToNetworkEvents = false;
   private peerBalancer: UnknownBlockPeerBalancer;
@@ -91,6 +92,7 @@ export class BlockInputSync {
     private readonly opts?: SyncOptions
   ) {
     this.maxPendingBlocks = opts?.maxPendingBlocks ?? MAX_PENDING_BLOCKS;
+    this.proposerBoostSecWindow = this.config.SECONDS_PER_SLOT / INTERVALS_PER_SLOT;
     this.peerBalancer = new UnknownBlockPeerBalancer();
 
     if (metrics) {
@@ -394,10 +396,8 @@ export class BlockInputSync {
     // this prevents unbundling attack
     // see https://lighthouse-blog.sigmaprime.io/mev-unbundling-rpc.html
     const {slot: blockSlot, proposerIndex} = pendingBlock.blockInput.getBlock().message;
-    const fork = this.config.getForkName(blockSlot);
-    const proposerBoostWindowMs = this.config.getAttestationDueMs(fork);
     if (
-      this.chain.clock.msFromSlot(blockSlot) < proposerBoostWindowMs &&
+      this.chain.clock.secFromSlot(blockSlot) < this.proposerBoostSecWindow &&
       this.chain.seenBlockProposers.isKnown(blockSlot, proposerIndex)
     ) {
       // proposer is known by a gossip block already, wait a bit to make sure this block is not
@@ -407,7 +407,7 @@ export class BlockInputSync {
         root: pendingBlock.blockInput.blockRootHex,
         proposerIndex,
       });
-      await sleep(proposerBoostWindowMs);
+      await sleep(this.proposerBoostSecWindow * 1000);
     }
     // At gossip time, it's critical to keep a good number of mesh peers.
     // To do that, the Gossip Job Wait Time should be consistently <3s to avoid the behavior penalties in gossip

package/src/util/clock.ts

@@ -58,10 +58,6 @@ export type IClock = StrictEventEmitter<EventEmitter, ClockEvents> & {
    * Return second from a slot to either toSec or now.
    */
   secFromSlot(slot: Slot, toSec?: number): number;
-  /**
-   * Return milliseconds from a slot to either toMs or now.
-   */
-  msFromSlot(slot: Slot, toMs?: number): number;
 };
 
 /**
@@ -177,10 +173,6 @@ export class Clock extends EventEmitter implements IClock {
     return toSec - (this.genesisTime + slot * this.config.SECONDS_PER_SLOT);
   }
 
-  msFromSlot(slot: Slot, toMs = Date.now()): number {
-    return toMs - (this.genesisTime * 1000 + slot * this.config.SLOT_DURATION_MS);
-  }
-
   private onNextSlot = (slot?: Slot): void => {
     const clockSlot = slot ?? getCurrentSlot(this.config, this.genesisTime);
     // process multiple clock slots in the case the main thread has been saturated for > SECONDS_PER_SLOT