@lodestar/beacon-node 1.50.0-dev.70314c9caa → 1.50.0-dev.7df32d9c25

package/src/network/processor/index.ts

@@ -22,7 +22,6 @@ import {
   getParentRootFromSignedBeaconBlockSerialized,
   getPayloadPresentFromPayloadAttestationMessageSerialized,
 } from "../../util/sszBytes.js";
-import {INetworkCore} from "../core/index.js";
 import {NetworkEvent, NetworkEventBus} from "../events.js";
 import {
   GossipHandlers,
@@ -35,12 +34,7 @@ import {MAX_PEERS_PER_ROOT} from "./constants.js";
 import {createExtractBlockSlotRootFns} from "./extractSlotRootFns.js";
 import {GossipHandlerOpts, ValidatorFnsModules, getGossipHandlers} from "./gossipHandlers.js";
 import {createGossipQueues} from "./gossipQueues/index.js";
-import {
-  ValidatorFnModules,
-  getGossipValidatorBatchFn,
-  getGossipValidatorFn,
-  rejectPeerAction,
-} from "./gossipValidatorFn.js";
+import {ValidatorFnModules, getGossipValidatorBatchFn, getGossipValidatorFn} from "./gossipValidatorFn.js";
 import {PendingGossipsubMessage} from "./types.js";
 
 export * from "./types.js";
@@ -108,12 +102,6 @@ type SearchedRootEntry = {
  */
 const DEFAULT_EARLIEST_PERMISSIBLE_SLOT_DISTANCE = 32;
 
-/**
- * The network worker bans a Fatal peer only on its next PeerManager heartbeat (30s). Until then the main thread
- * would keep validating that peer's messages, so drop them here. 3 slots (36s) outlasts one heartbeat.
- */
-export const FATAL_PEER_EXPIRY_SLOTS = 3;
-
 type WorkOpts = {
   bypassQueue?: boolean;
 };
@@ -244,7 +232,6 @@ type SearchUnknownRootTarget =
  */
 export class NetworkProcessor {
   private readonly chain: IBeaconChain;
-  private readonly core: INetworkCore;
   private readonly events: NetworkEventBus;
   private readonly logger: Logger;
   private readonly metrics: Metrics | null;
@@ -269,31 +256,23 @@ export class NetworkProcessor {
     () => new MapDef<RootHex, SearchedRootEntry>(() => ({}))
   );
   private bufferedRootsBySlot = new MapDef<Slot, Set<RootHex>>(() => new Set());
-  /** peer -> clock slot when it was Fatal'ed */
-  private readonly fatalPeers = new Map<PeerIdStr, Slot>();
 
   constructor(
     modules: NetworkProcessorModules,
     private readonly opts: NetworkProcessorOpts
   ) {
-    const {chain, core, events, logger, metrics} = modules;
+    const {chain, events, logger, metrics} = modules;
     this.chain = chain;
-    this.core = core;
     this.events = events;
     this.metrics = metrics;
     this.logger = logger;
     this.events = events;
     this.gossipQueues = createGossipQueues();
     this.gossipTopicConcurrency = mapValues(this.gossipQueues, () => 0);
-    this.gossipValidatorFn = getGossipValidatorFn(
-      modules.gossipHandlers ?? getGossipHandlers(modules, opts),
-      modules,
-      this.onFatalPeer
-    );
+    this.gossipValidatorFn = getGossipValidatorFn(modules.gossipHandlers ?? getGossipHandlers(modules, opts), modules);
     this.gossipValidatorBatchFn = getGossipValidatorBatchFn(
       modules.gossipHandlers ?? getGossipHandlers(modules, opts),
-      modules,
-      this.onFatalPeer
+      modules
     );
 
     events.on(NetworkEvent.pendingGossipsubMessage, this.onPendingGossipsubMessage);
@@ -427,47 +406,19 @@ export class NetworkProcessor {
     }
   }
 
-  private onFatalPeer = (peer: PeerIdStr): void => {
-    this.fatalPeers.set(peer, this.chain.clock.currentSlot);
-  };
-
   private onPendingGossipsubMessage = (message: PendingGossipsubMessage): void => {
     const topicType = message.topic.type;
-    if (this.fatalPeers.has(message.propagationSource)) {
-      this.metrics?.networkProcessor.gossipValidationError.inc({topic: topicType, error: GossipErrorCode.FATAL_PEER});
-      // No need to report the dropped job to gossip. It will be eventually pruned from the mcache
-      return;
-    }
-
     const extractBlockSlotRootFn = this.extractBlockSlotRootFns[topicType];
-    if (extractBlockSlotRootFn === undefined) {
-      // some messages don't have slot and root
-      this.pushPendingGossipsubMessageToQueue(message);
-      return;
-    }
 
     // 1st extract round: make sure slot is in range and if block root is not available
     // proactively search for it + queue the message
-    const slotRoot = extractBlockSlotRootFn(message.msg.data, message.topic.boundary.fork);
+    const slotRoot = extractBlockSlotRootFn
+      ? extractBlockSlotRootFn(message.msg.data, message.topic.boundary.fork)
+      : null;
     if (slotRoot === null) {
-      // DOS protection: null means malformed bytes or slot >= 2^32, neither is forwarded by honest peers.
-      const {propagationSource, clientAgent, clientVersion} = message;
-      const code = GossipErrorCode.INVALID_SLOT;
-      const peerAction = rejectPeerAction(topicType, code);
-      this.metrics?.networkProcessor.gossipValidationReject.inc({topic: topicType});
-      this.core.reportPeer(propagationSource, peerAction, code);
-      this.logger.debug(`Gossip validation ${topicType} rejected due to null slot`, {
-        peer: propagationSource,
-        clientAgent,
-        clientVersion,
-        peerAction,
-        code,
-      });
-      this.events.emit(NetworkEvent.gossipMessageValidationResult, {
-        msgId: message.msgId,
-        propagationSource,
-        acceptance: TopicValidatorResult.Reject,
-      });
+      // some messages don't have slot and root
+      // if the msg.data is invalid, message will be rejected when deserializing data in later phase (gossipValidatorFn)
+      this.pushPendingGossipsubMessageToQueue(message);
       return;
     }
 
@@ -921,10 +872,6 @@ export class NetworkProcessor {
     for (const slot of this.bufferedRootsBySlot.keys()) {
       if (slot <= minSlot) this.bufferedRootsBySlot.delete(slot);
     }
-
-    for (const [peer, slot] of this.fatalPeers) {
-      if (clockSlot - slot > FATAL_PEER_EXPIRY_SLOTS) this.fatalPeers.delete(peer);
-    }
   };
 
   private executeWork(): void {
@@ -980,32 +927,6 @@ export class NetworkProcessor {
   private async processPendingGossipsubMessage(
     messageOrArray: PendingGossipsubMessage | PendingGossipsubMessage[]
   ): Promise<void> {
-    // drop messages from peers Fatal'ed after these were queued or started awaiting a block/envelope
-    // No need to report the dropped jobs to gossip. They will be eventually pruned from the mcache
-    if (this.fatalPeers.size > 0) {
-      if (Array.isArray(messageOrArray)) {
-        const allowed: PendingGossipsubMessage[] = [];
-        for (const msg of messageOrArray) {
-          if (this.fatalPeers.has(msg.propagationSource)) {
-            this.metrics?.networkProcessor.gossipValidationError.inc({
-              topic: msg.topic.type,
-              error: GossipErrorCode.FATAL_PEER,
-            });
-          } else {
-            allowed.push(msg);
-          }
-        }
-        if (allowed.length === 0) return;
-        messageOrArray = allowed;
-      } else if (this.fatalPeers.has(messageOrArray.propagationSource)) {
-        this.metrics?.networkProcessor.gossipValidationError.inc({
-          topic: messageOrArray.topic.type,
-          error: GossipErrorCode.FATAL_PEER,
-        });
-        return;
-      }
-    }
-
     const nowSec = Date.now() / 1000;
     if (Array.isArray(messageOrArray)) {
       for (const msg of messageOrArray) {

package/src/sync/range/range.ts

@@ -5,7 +5,6 @@ import {IBeaconStateViewGloas, computeStartSlotAtEpoch, isStatePostGloas} from "
 import {Epoch, Status, fulu} from "@lodestar/types";
 import {Logger, prettyPrintIndices, toRootHex} from "@lodestar/utils";
 import {IBlockInput} from "../../chain/blocks/blockInput/types.js";
-import {PayloadError, PayloadErrorCode} from "../../chain/blocks/importExecutionPayload.js";
 import {AttestationImportOpt, ImportBlockOpts} from "../../chain/blocks/index.js";
 import {assertLinearChainSegment} from "../../chain/blocks/utils/chainSegment.js";
 import {BlockError} from "../../chain/errors/index.js";
@@ -208,50 +207,22 @@ export class RangeSync extends (EventEmitter as {new (): RangeSyncEmitter}) {
       blsVerifyOnMainThread: false,
     };
 
-    try {
-      if (this.opts?.disableProcessAsChainSegment) {
-        // Should only be used for debugging or testing
-        for (const block of blocks) {
-          await this.chain.processBlock(block, flags);
-          const payloadEnvelope = payloadEnvelopes?.get(block.slot);
-          if (payloadEnvelope?.hasPayloadEnvelope()) {
-            await this.chain.processExecutionPayload(payloadEnvelope);
-          }
-        }
-      } else {
-        const {orphaned, skipped} = await this.chain.processChainSegment(blocks, payloadEnvelopes, flags);
-        // We log orphaned payloads to work with different clients
-        // in the future, consider applying penalties in certain conditions
-        // make sure the payload source was from range sync in that case
-        for (const {slot, payloadEnvelopeInput} of orphaned) {
-          const {peerIdStr, source} = payloadEnvelopeInput.getPayloadEnvelopeSource();
-          let client = "unknown";
-          if (peerIdStr !== undefined) {
-            try {
-              client = this.getConnectedPeerSyncMeta(peerIdStr).client;
-            } catch {
-              // peer disconnected since serving the envelope, keep "unknown"
-            }
-          }
-          this.logger.debug("Orphaned payload envelope in range sync batch", {
-            slot,
-            root: payloadEnvelopeInput.blockRootHex,
-            peer: peerIdStr ?? "unknown",
-            source,
-            client,
-            skipped,
-          });
+    if (this.opts?.disableProcessAsChainSegment) {
+      // Should only be used for debugging or testing
+      for (const block of blocks) {
+        await this.chain.processBlock(block, flags);
+        const payloadEnvelope = payloadEnvelopes?.get(block.slot);
+        if (payloadEnvelope?.hasPayloadEnvelope()) {
+          await this.chain.processExecutionPayload(payloadEnvelope);
         }
       }
-    } catch (e) {
-      if (
-        e instanceof PayloadError &&
-        (e.type.code === PayloadErrorCode.INVALID_SIGNATURE ||
-          e.type.code === PayloadErrorCode.ENVELOPE_VERIFICATION_ERROR ||
-          e.type.code === PayloadErrorCode.EXECUTION_ENGINE_INVALID)
-      ) {
-        const {payloadInput} = e;
-        const {peerIdStr, source} = payloadInput.getPayloadEnvelopeSource();
+    } else {
+      const {orphaned, skipped} = await this.chain.processChainSegment(blocks, payloadEnvelopes, flags);
+      // We log orphaned payloads to work with different clients
+      // in the future, consider applying penalties in certain conditions
+      // make sure the payload source was from range sync in that case
+      for (const {slot, payloadEnvelopeInput} of orphaned) {
+        const {peerIdStr, source} = payloadEnvelopeInput.getPayloadEnvelopeSource();
         let client = "unknown";
         if (peerIdStr !== undefined) {
           try {
@@ -260,18 +231,15 @@ export class RangeSync extends (EventEmitter as {new (): RangeSyncEmitter}) {
             // peer disconnected since serving the envelope, keep "unknown"
           }
         }
-        this.logger.debug("Removing invalid payload envelope in range sync batch", {
-          slot: payloadInput.slot,
-          root: payloadInput.blockRootHex,
+        this.logger.debug("Orphaned payload envelope in range sync batch", {
+          slot,
+          root: payloadEnvelopeInput.blockRootHex,
           peer: peerIdStr ?? "unknown",
           source,
           client,
-          code: e.type.code,
+          skipped,
         });
-        // The batch is downloaded again, it would otherwise reuse the cached envelope and fail the same way
-        this.chain.seenPayloadEnvelopeInputCache.removeInvalid(payloadInput);
       }
-      throw e;
     }
   };
 

package/src/sync/unknownBlock.ts

@@ -1426,23 +1426,20 @@ export class BlockInputSync {
           pendingPayload.status = PendingPayloadInputStatus.downloaded;
           break;
 
-        // The invalid envelope is evicted from the seen cache in the cases below, otherwise the next
-        // attempt would reuse it instead of fetching another envelope from peers
         case PayloadErrorCode.EXECUTION_ENGINE_INVALID:
           this.logger.debug("Error processing payload from unknown sync", logCtx, res.err);
-          this.chain.seenPayloadEnvelopeInputCache.removeInvalid(pendingPayload.payloadInput);
           this.removePendingPayloadAndDescendants(rootHex, DroppedItemReason.elInvalid);
           break;
 
         case PayloadErrorCode.ENVELOPE_VERIFICATION_ERROR:
           this.logger.debug("Error processing payload from unknown sync", logCtx, res.err);
-          this.chain.seenPayloadEnvelopeInputCache.removeInvalid(pendingPayload.payloadInput);
           this.removePendingPayloadAndDescendants(rootHex, DroppedItemReason.invalidEnvelope);
           break;
 
         case PayloadErrorCode.INVALID_SIGNATURE:
+          // TODO GLOAS: Decide how invalid payload inputs should eventually leave memory without
+          // reintroducing envelope replacement / recreation flows.
           this.logger.debug("Error processing payload from unknown sync", logCtx, res.err);
-          this.chain.seenPayloadEnvelopeInputCache.removeInvalid(pendingPayload.payloadInput);
           this.removePendingPayloadAndDescendants(rootHex, DroppedItemReason.invalidSignature);
           break;
 
@@ -1882,6 +1879,8 @@ export class BlockInputSync {
 
   // Once a parent payload is invalid, every descendant waiting on that payload lineage becomes unrecoverable too.
   private removePendingPayloadAndDescendants(rootHex: RootHex, headReason: DroppedItemReason): void {
+    // Keep PayloadEnvelopeInput resident in the seen cache. importBlock() owns that object and
+    // later validation/finalization logic decides when it can leave memory.
     if (this.pendingPayloads.delete(rootHex)) {
       this.metrics?.blockInputSync.removedPayloads.inc({reason: headReason}, 1);
     }