@lodestar/beacon-node 1.43.0-dev.180030f946 → 1.43.0-dev.1d4e5f45ec

package/src/sync/sync.ts

@@ -1,6 +1,6 @@
 import {SLOTS_PER_EPOCH} from "@lodestar/params";
 import {Slot} from "@lodestar/types";
-import {Logger} from "@lodestar/utils";
+import {Logger, toRootHex} from "@lodestar/utils";
 import {IBeaconChain} from "../chain/index.js";
 import {GENESIS_SLOT} from "../constants/constants.js";
 import {ExecutionEngineState} from "../execution/index.js";
@@ -188,6 +188,18 @@ export class BeaconSync implements IBeaconSync {
   private addPeer = (data: NetworkEventData[NetworkEvent.peerConnected]): void => {
     const localStatus = this.chain.getStatus();
     const syncType = getPeerSyncType(localStatus, data.status, this.chain.forkChoice, this.slotImportTolerance);
+    this.logger.verbose("Peer sync type classified", {
+      peer: data.peer,
+      syncType,
+      localFinalizedEpoch: localStatus.finalizedEpoch,
+      localFinalizedRoot: toRootHex(localStatus.finalizedRoot),
+      localHeadSlot: localStatus.headSlot,
+      localHeadRoot: toRootHex(localStatus.headRoot),
+      remoteFinalizedEpoch: data.status.finalizedEpoch,
+      remoteFinalizedRoot: toRootHex(data.status.finalizedRoot),
+      remoteHeadSlot: data.status.headSlot,
+      remoteHeadRoot: toRootHex(data.status.headRoot),
+    });
 
     // For metrics only
     this.peerSyncType.set(data.peer, syncType);

package/src/sync/types.ts

@@ -1,5 +1,8 @@
 import {RootHex, Slot} from "@lodestar/types";
+import {SignedExecutionPayloadEnvelope} from "@lodestar/types/gloas";
+import {toRootHex} from "@lodestar/utils";
 import {IBlockInput} from "../chain/blocks/blockInput/index.js";
+import {PayloadEnvelopeInput} from "../chain/blocks/payloadEnvelopeInput/payloadEnvelopeInput.js";
 
 export enum PendingBlockType {
   /**
@@ -26,6 +29,14 @@ export enum PendingBlockInputStatus {
   processing = "processing",
 }
 
+export enum PendingPayloadInputStatus {
+  pending = "pending",
+  fetching = "fetching",
+  waitingForBlock = "waiting_for_block",
+  downloaded = "downloaded",
+  processing = "processing",
+}
+
 export type PendingBlockInput = {
   status: PendingBlockInputStatus;
   blockInput: IBlockInput;
@@ -44,10 +55,47 @@ export type PendingRootHex = {
 
 export type BlockInputSyncCacheItem = PendingBlockInput | PendingRootHex;
 
+export type PendingPayloadInput = {
+  status:
+    | PendingPayloadInputStatus.pending
+    | PendingPayloadInputStatus.fetching
+    | PendingPayloadInputStatus.downloaded
+    | PendingPayloadInputStatus.processing;
+  payloadInput: PayloadEnvelopeInput;
+  timeAddedSec: number;
+  timeSyncedSec?: number;
+  peerIdStrings: Set<string>;
+};
+
+export type PendingPayloadRootHex = {
+  status: PendingPayloadInputStatus.pending | PendingPayloadInputStatus.fetching;
+  rootHex: RootHex;
+  timeAddedSec: number;
+  timeSyncedSec?: number;
+  peerIdStrings: Set<string>;
+};
+
+export type PendingPayloadEnvelope = {
+  status: PendingPayloadInputStatus.waitingForBlock;
+  envelope: SignedExecutionPayloadEnvelope;
+  timeAddedSec: number;
+  peerIdStrings: Set<string>;
+};
+
+export type PayloadSyncCacheItem = PendingPayloadInput | PendingPayloadRootHex | PendingPayloadEnvelope;
+
 export function isPendingBlockInput(pending: BlockInputSyncCacheItem): pending is PendingBlockInput {
   return "blockInput" in pending;
 }
 
+export function isPendingPayloadInput(pending: PayloadSyncCacheItem): pending is PendingPayloadInput {
+  return "payloadInput" in pending;
+}
+
+export function isPendingPayloadEnvelope(pending: PayloadSyncCacheItem): pending is PendingPayloadEnvelope {
+  return "envelope" in pending;
+}
+
 export function getBlockInputSyncCacheItemRootHex(block: BlockInputSyncCacheItem): RootHex {
   return isPendingBlockInput(block) ? block.blockInput.blockRootHex : block.rootHex;
 }
@@ -55,3 +103,27 @@ export function getBlockInputSyncCacheItemRootHex(block: BlockInputSyncCacheItem
 export function getBlockInputSyncCacheItemSlot(block: BlockInputSyncCacheItem): Slot | string {
   return isPendingBlockInput(block) ? block.blockInput.slot : "unknown";
 }
+
+export function getPayloadSyncCacheItemRootHex(payload: PayloadSyncCacheItem): RootHex {
+  if (isPendingPayloadInput(payload)) {
+    return payload.payloadInput.blockRootHex;
+  }
+
+  if (isPendingPayloadEnvelope(payload)) {
+    return toRootHex(payload.envelope.message.beaconBlockRoot);
+  }
+
+  return payload.rootHex;
+}
+
+export function getPayloadSyncCacheItemSlot(payload: PayloadSyncCacheItem): Slot | string {
+  if (isPendingPayloadInput(payload)) {
+    return payload.payloadInput.slot;
+  }
+
+  if (isPendingPayloadEnvelope(payload)) {
+    return payload.envelope.message.payload.slotNumber;
+  }
+
+  return "unknown";
+}