@lodestar/beacon-node 1.50.0-dev.859c034d37 → 1.50.0-dev.8ba9d1dd30

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);
     }