@aztec/p2p 0.0.1-commit.ec5f612 → 0.0.1-commit.ec7ac5448

package/dest/services/libp2p/libp2p_service.js

@@ -370,14 +370,15 @@ function applyDecs2203RFactory() {
 function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _initProto;
+var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _initProto;
 import { BlockNumber } from '@aztec/foundation/branded-types';
+import { maxBy } from '@aztec/foundation/collection';
 import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { GasFees } from '@aztec/stdlib/gas';
-import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PMessage, PeerErrorSeverity, PeerErrorSeverityByHarshness, TopicType, createTopicString, getTopicsForConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Tx } from '@aztec/stdlib/tx';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
@@ -394,6 +395,7 @@ import { mplex } from '@libp2p/mplex';
 import { tcp } from '@libp2p/tcp';
 import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
+import { CheckpointProposalReceivedCallbackNotRegisteredError } from '../../errors/p2p-service.error.js';
 import { BlockProposalValidator, CheckpointAttestationValidator, CheckpointProposalValidator, DoubleSpendTxValidator, FishermanAttestationValidator, getDefaultAllowedSetupFunctions } from '../../msg_validators/index.js';
 import { MessageSeenValidator } from '../../msg_validators/msg_seen_validator/msg_seen_validator.js';
 import { createFirstStageTxValidationsForGossipedTransactions, createSecondStageTxValidationsForGossipedTransactions, createTxValidatorForBlockProposalReceivedTxs, createTxValidatorForReqResponseReceivedTxs } from '../../msg_validators/tx_validator/factory.js';
@@ -407,7 +409,7 @@ import { APP_SPECIFIC_WEIGHT, gossipScoreThresholds } from '../gossipsub/scoring
 import { createAllTopicScoreParams } from '../gossipsub/topic_score_params.js';
 import { PeerManager } from '../peer-manager/peer_manager.js';
 import { PeerScoring } from '../peer-manager/peer_scoring.js';
-import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
+import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
 _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation)=>({
@@ -429,12 +431,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         [Attributes.BLOCK_ARCHIVE]: request.archiveRoot.toString()
     })), _dec6 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
         [Attributes.TX_HASH]: requestedTxHash.toString()
-    })), _dec7 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
-        [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
-    })), _dec8 = trackSpan('Libp2pService.validateCheckpointAttestation', async (_, attestation)=>({
-        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
-        [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-        [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
     }));
 /**
  * Lib P2P implementation of the P2PService interface.
@@ -485,16 +481,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 _dec6,
                 2,
                 "validateRequestedTxs"
-            ],
-            [
-                _dec7,
-                2,
-                "validateRequestedBlock"
-            ],
-            [
-                _dec8,
-                2,
-                "validateCheckpointAttestation"
             ]
         ], []));
     }
@@ -518,7 +504,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    * Callback for when a checkpoint proposal is received from a peer.
    * @param checkpoint - The checkpoint proposal received from the peer.
    * @returns The attestations for the checkpoint, if any.
-   */ checkpointReceivedCallback;
+   */ allNodesCheckpointReceivedCallback;
+    /**
+   * Callback for when a checkpoint proposal is received - specifically for validators - from a peer.
+   * @param checkpoint - The checkpoint proposal received from the peer.
+   * @returns The attestations for the checkpoint, if any.
+   */ validatorCheckpointReceivedCallback;
     gossipSubEventHandler;
     instrumentation;
     telemetry;
@@ -540,22 +531,30 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
         this.topicStrings[TopicType.checkpoint_proposal] = createTopicString(TopicType.checkpoint_proposal, this.protocolVersion);
         this.topicStrings[TopicType.checkpoint_attestation] = createTopicString(TopicType.checkpoint_attestation, this.protocolVersion);
-        this.blockProposalValidator = new BlockProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
-        });
-        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
+        const p2pPropagationTime = config.attestationPropagationTime;
+        const proposalValidatorOpts = {
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
+            p2pPropagationTime
+        };
+        this.blockProposalValidator = new BlockProposalValidator(epochCache, proposalValidatorOpts);
+        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, proposalValidatorOpts);
+        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry, {
+            l1PublishingTime: config.l1PublishingTime
+        }) : new CheckpointAttestationValidator(epochCache, {
+            l1PublishingTime: config.l1PublishingTime
         });
-        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new CheckpointAttestationValidator(epochCache);
         this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
         this.blockReceivedCallback = async (block)=>{
-            this.logger.debug(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber} from peer.`, {
+            this.logger.warn(`Handler for block received not yet registered on P2P service. Received block ${block.blockNumber} for slot ${block.slotNumber} from peer.`, {
                 p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier()
             });
-            return false;
+            return true;
+        };
+        this.allNodesCheckpointReceivedCallback = (_checkpoint)=>{
+            throw new CheckpointProposalReceivedCallbackNotRegisteredError();
         };
-        this.checkpointReceivedCallback = (checkpoint)=>{
-            this.logger.debug(`Handler not yet registered: Checkpoint received callback not set. Received checkpoint for slot ${checkpoint.slotNumber} from peer.`);
+        this.validatorCheckpointReceivedCallback = (_checkpoint)=>{
             return Promise.resolve(undefined);
         };
     }
@@ -608,9 +607,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const l1Constants = epochCache.getL1Constants();
         const topicScoreParams = createAllTopicScoreParams(protocolVersion, {
             slotDurationMs: l1Constants.slotDuration * 1000,
+            ethereumSlotDuration: l1Constants.ethereumSlotDuration,
             heartbeatIntervalMs: config.gossipsubInterval,
             targetCommitteeSize: l1Constants.targetCommitteeSize,
             blockDurationMs: config.blockDurationMs,
+            l1PublishingTime: config.l1PublishingTime,
+            p2pPropagationTime: config.attestationPropagationTime,
             expectedBlockProposalsPerSlot: config.expectedBlockProposalsPerSlot
         });
         const node = await createLibp2p({
@@ -725,6 +727,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const peerScoring = new PeerScoring(config, telemetry);
         const reqresp = new ReqResp(config, node, peerScoring, createLogger(`${logger.module}:reqresp`));
         const peerManager = new PeerManager(node, peerDiscoveryService, config, telemetry, createLogger(`${logger.module}:peer_manager`), peerScoring, reqresp, worldStateSynchronizer, protocolVersion, epochCache);
+        // Gate req/resp data protocols for unauthenticated peers when p2pAllowOnlyValidators is enabled
+        reqresp.setShouldRejectPeer((peerId)=>peerManager.shouldDisableP2PGossip(peerId));
         // Configure application-specific scoring for gossipsub.
         // The weight scales app score to align with gossipsub thresholds:
         // - Disconnect (-50) × 10 = -500 = gossipThreshold (stops receiving gossip)
@@ -751,13 +755,11 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // Create request response protocol handlers
         const txHandler = reqRespTxHandler(this.mempools);
         const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
-        const blockHandler = reqRespBlockHandler(this.archiver);
         const statusHandler = reqRespStatusHandler(this.protocolVersion, this.worldStateSynchronizer, this.logger);
         const requestResponseHandlers = {
             [ReqRespSubProtocol.PING]: pingHandler,
             [ReqRespSubProtocol.STATUS]: statusHandler.bind(this),
-            [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this),
-            [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
+            [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this)
         };
         if (!this.config.disableTransactions) {
             const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.archiver, this.mempools.txPool);
@@ -770,8 +772,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const reqrespSubProtocolValidators = {
             ...DEFAULT_SUB_PROTOCOL_VALIDATORS,
             [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
-            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
-            [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this)
+            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this)
         };
         await this.peerManager.initializePeers();
         await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
@@ -859,8 +860,14 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     registerBlockReceivedCallback(callback) {
         this.blockReceivedCallback = callback;
     }
-    registerCheckpointReceivedCallback(callback) {
-        this.checkpointReceivedCallback = callback;
+    registerValidatorCheckpointReceivedCallback(callback) {
+        this.validatorCheckpointReceivedCallback = callback;
+    }
+    registerAllNodesCheckpointReceivedCallback(callback) {
+        this.allNodesCheckpointReceivedCallback = callback;
+    }
+    async notifyOwnCheckpointProposal(checkpoint) {
+        await this.allNodesCheckpointReceivedCallback(checkpoint, this.node.peerId);
     }
     /**
    * Registers a callback to be invoked when a duplicate proposal is detected.
@@ -926,6 +933,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (!validator || !validator.addMessage(msgId)) {
             this.instrumentation.incMessagePrevalidationStatus(false, topicType);
             this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Ignore);
+            if (topicType === TopicType.tx) {
+                this.logger.verbose(`Ignoring already-seen tx gossip message`, {
+                    msgId,
+                    source: source.toString()
+                });
+            }
             return {
                 result: false,
                 topicType
@@ -1031,29 +1044,67 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         return;
     }
     async validateReceivedMessage(validationFunc, msgId, source, topicType) {
+        // Default to reject result with a penalty if validation function throws an error
         let resultAndObj = {
-            result: TopicValidatorResult.Reject
+            result: TopicValidatorResult.Reject,
+            severity: PeerErrorSeverity.MidToleranceError
         };
         const timer = new Timer();
         try {
             resultAndObj = await validationFunc();
         } catch (err) {
-            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
-            this.logger.error(`Error deserializing and validating gossipsub message`, err, {
+            this.logger.error(`Error validating gossipsub message`, err, {
                 msgId,
                 source: source.toString(),
                 topicType
             });
         }
         if (resultAndObj.result === TopicValidatorResult.Accept) {
+            this.logger.debug(`Message ${topicType} accepted by validator`, {
+                msgId,
+                source: source.toString(),
+                topicType
+            });
             this.instrumentation.recordMessageValidation(topicType, timer);
+        } else if (resultAndObj.result === TopicValidatorResult.Reject) {
+            this.logger.warn(`Message ${topicType} rejected by validator with severity ${resultAndObj.severity}`, {
+                msgId,
+                source: source.toString(),
+                topicType,
+                severity: resultAndObj.severity
+            });
+            this.peerManager.penalizePeer(source, resultAndObj.severity);
+        } else {
+            this.logger.trace(`Message ${topicType} ignored by validator`, {
+                msgId,
+                source: source.toString(),
+                topicType
+            });
         }
         this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), resultAndObj.result);
         return resultAndObj;
     }
+    tryDeserialize(deserializeFunc, msgId, source) {
+        try {
+            return deserializeFunc();
+        } catch (err) {
+            this.logger.warn(`Failed to deserialize gossipsub message from buffer`, {
+                err,
+                msgId,
+                source: source.toString()
+            });
+            return undefined;
+        }
+    }
     async handleGossipedTx(payloadData, msgId, source) {
         const validationFunc = async ()=>{
-            const tx = Tx.fromBuffer(payloadData);
+            const tx = this.tryDeserialize(()=>Tx.fromBuffer(payloadData), msgId, source);
+            if (!tx) {
+                return {
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.LowToleranceError
+                };
+            }
             const currentBlockNumber = await this.archiver.getBlockNumber();
             const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
             // Stage 1: fast validators (metadata, data, timestamps, double-spend, gas, phases, block header)
@@ -1069,14 +1120,22 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                     const txBlockNumber = BlockNumber(currentBlockNumber + 1);
                     severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
                 }
-                this.peerManager.penalizePeer(source, severity);
+                this.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 1 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Reject,
+                    severity
                 };
             }
             // Pool pre-check: see if the pool would accept this tx before doing expensive proof verification
             const canAdd = await this.mempools.txPool.canAddPendingTx(tx);
             if (canAdd === 'ignored') {
+                this.logger.verbose(`Ignoring gossiped tx ${tx.getTxHash().toString()}: pool pre-check returned ignored`, {
+                    source: source.toString()
+                });
                 return {
                     result: TopicValidatorResult.Ignore,
                     obj: tx
@@ -1086,10 +1145,15 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             const secondStageValidators = this.createSecondStageMessageValidators();
             const secondStageOutcome = await this.runValidations(tx, secondStageValidators);
             if (!secondStageOutcome.allPassed) {
-                const { severity } = secondStageOutcome.failure;
-                this.peerManager.penalizePeer(source, severity);
+                const { severity, name } = secondStageOutcome.failure;
+                this.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 2 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Reject,
+                    severity
                 };
             }
             // Pool add: persist the tx
@@ -1101,7 +1165,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             });
             const wasAccepted = addResult.accepted.some((h)=>h.equals(txHash));
             const wasIgnored = addResult.ignored.some((h)=>h.equals(txHash));
-            this.logger.trace(`Validate propagated tx`, {
+            this.logger.verbose(`Validate propagated tx ${txHash.toString()}`, {
                 wasAccepted,
                 wasIgnored,
                 [Attributes.P2P_ID]: source.toString()
@@ -1117,8 +1181,13 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                     obj: tx
                 };
             } else {
+                this.logger.warn(`Gossiped tx ${txHash.toString()} unexpectedly rejected by pool`, {
+                    source: source.toString(),
+                    txHash: txHash.toString()
+                });
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.HighToleranceError
                 };
             }
         };
@@ -1139,7 +1208,16 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    * Process a checkpoint attestation from a peer.
    * Validates the attestation and adds it to the pool.
    */ async processCheckpointAttestationFromPeer(payloadData, msgId, source) {
-        const { result, obj: attestation } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointAttestation(source, CheckpointAttestation.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_attestation);
+        const { result, obj: attestation } = await this.validateReceivedMessage(()=>{
+            const attestation = this.tryDeserialize(()=>CheckpointAttestation.fromBuffer(payloadData), msgId, source);
+            if (!attestation) {
+                return Promise.resolve({
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.LowToleranceError
+                });
+            }
+            return this.validateAndStoreCheckpointAttestation(source, attestation);
+        }, msgId, source, TopicType.checkpoint_attestation);
         if (result !== TopicValidatorResult.Accept || !attestation) {
             return;
         }
@@ -1154,9 +1232,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const validationResult = await this.checkpointAttestationValidator.validate(attestation);
         if (validationResult.result === 'reject') {
             this.logger.warn(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
-            this.peerManager.penalizePeer(peerId, validationResult.severity);
             return {
-                result: TopicValidatorResult.Reject
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1183,9 +1261,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 obj: attestation
             };
         }
-        // Could not add (cap reached for signer), no need to re-broadcast
+        // Could not add (cap reached for signer), penalize and do not re-broadcast
         if (!added) {
-            this.logger.warn(`Dropping checkpoint attestation due to cap`, {
+            this.logger.warn(`Rejecting checkpoint attestation due to cap`, {
                 slot: slot.toString(),
                 archive: attestation.archive.toString(),
                 source: peerId.toString(),
@@ -1193,8 +1271,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 count
             });
             return {
-                result: TopicValidatorResult.Ignore,
-                obj: attestation
+                result: TopicValidatorResult.Reject,
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
         // Check if this is a duplicate attestation (signer attested to a different proposal at the same slot)
@@ -1232,9 +1310,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const validationResult = await this.blockProposalValidator.validate(block);
         if (validationResult.result === 'reject') {
             this.logger.warn(`Penalizing peer ${peerId} for block proposal validation failure`);
-            this.peerManager.penalizePeer(peerId, validationResult.severity);
             return {
-                result: TopicValidatorResult.Reject
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1264,7 +1342,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         // Too many blocks received for this slot and index, penalize peer and do not re-broadcast
         if (!added) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.HighToleranceError);
             this.logger.warn(`Penalizing peer for block proposal exceeding per-position cap`, {
                 ...block.toBlockInfo(),
                 indexWithinCheckpoint: block.indexWithinCheckpoint,
@@ -1276,7 +1353,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 result: TopicValidatorResult.Reject,
                 metadata: {
                     isEquivocated
-                }
+                },
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
         // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
@@ -1325,7 +1403,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // Note: Validators do NOT attest to individual blocks, only to checkpoint proposals.
         const isValid = await this.blockReceivedCallback(block, sender);
         if (!isValid) {
-            this.logger.warn(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
+            this.logger.info(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
         }
     }
     /**
@@ -1350,9 +1428,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const validationResult = await this.checkpointProposalValidator.validate(checkpoint);
         if (validationResult.result === 'reject') {
             this.logger.warn(`Penalizing peer ${peerId} for checkpoint proposal validation failure`);
-            this.peerManager.penalizePeer(peerId, validationResult.severity);
             return {
-                result: TopicValidatorResult.Reject
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1369,18 +1447,20 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
                 [Attributes.P2P_ID]: peerId.toString()
             });
-            const { result, obj, metadata: { isEquivocated } = {} } = await this.validateAndStoreBlockProposal(peerId, blockProposal);
-            if (result === TopicValidatorResult.Reject || !obj || isEquivocated) {
+            const blockProposalResult = await this.validateAndStoreBlockProposal(peerId, blockProposal);
+            const { obj, metadata: { isEquivocated } = {} } = blockProposalResult;
+            if (blockProposalResult.result === TopicValidatorResult.Reject || !obj || isEquivocated) {
                 this.logger.debug(`Rejecting checkpoint due to invalid last block proposal`, {
                     [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
                     [Attributes.P2P_ID]: peerId.toString(),
                     isEquivocated,
-                    result
+                    result: blockProposalResult.result
                 });
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Reject,
+                    severity: 'severity' in blockProposalResult ? blockProposalResult.severity : PeerErrorSeverity.MidToleranceError
                 };
-            } else if (result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+            } else if (blockProposalResult.result === TopicValidatorResult.Accept && obj && !isEquivocated) {
                 processBlock = true;
             }
         }
@@ -1407,7 +1487,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // Too many checkpoint proposals received for this slot, penalize peer and do not re-broadcast
         // Note: We still return the checkpoint obj so the lastBlock can be processed if valid
         if (!added) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.HighToleranceError);
             this.logger.warn(`Penalizing peer for checkpoint proposal exceeding per-slot cap`, {
                 ...checkpoint.toCheckpointInfo(),
                 count,
@@ -1419,7 +1498,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 metadata: {
                     isEquivocated,
                     processBlock
-                }
+                },
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
         // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
@@ -1469,9 +1549,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             archive: checkpoint.archive.toString(),
             source: sender.toString()
         });
+        await this.allNodesCheckpointReceivedCallback(checkpoint, sender);
         // Call the checkpoint received callback with the core version (without lastBlock)
         // to validate and potentially generate attestations
-        const attestations = await this.checkpointReceivedCallback(checkpoint, sender);
+        const attestations = await this.validatorCheckpointReceivedCallback(checkpoint, sender);
         if (attestations && attestations.length > 0) {
             // If the callback returned attestations, add them to the pool and propagate them
             await this.mempools.attestationPool.addOwnCheckpointAttestations(attestations);
@@ -1591,45 +1672,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             return false;
         }
     }
-    /**
-   * Validates a BLOCK response.
-   *
-   * If a local copy exists, enforces hash equality. If missing, rejects (no penalty) since the hash cannot be verified.
-   * Penalizes on block number mismatch or hash mismatch.
-   *
-   * @param requestedBlockNumber - The requested block number.
-   * @param responseBlock - The block returned by the peer.
-   * @param peerId - The peer that returned the block.
-   * @returns True if the response is valid, false otherwise.
-   */ async validateRequestedBlock(requestedBlockNumber, responseBlock, peerId) {
-        try {
-            const reqNum = Number(requestedBlockNumber.toString());
-            if (responseBlock.number !== reqNum) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
-                return false;
-            }
-            const local = await this.archiver.getBlock(BlockNumber(reqNum));
-            if (!local) {
-                // We are missing the local block; we cannot verify the hash yet. Reject without penalizing.
-                // TODO: Consider extending this validator to accept an expected hash or
-                // performing quorum-based checks when using P2P syncing prior to L1 sync.
-                this.logger.warn(`Local block ${reqNum} not found; rejecting BLOCK response without hash verification`);
-                return false;
-            }
-            const [localHash, respHash] = await Promise.all([
-                local.hash(),
-                responseBlock.hash()
-            ]);
-            if (!localHash.equals(respHash)) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                return false;
-            }
-            return true;
-        } catch (e) {
-            this.logger.warn(`Error validating requested block`, e);
-            return false;
-        }
-    }
     async validateRequestedTx(tx, peerId, txValidator, requested) {
         const penalize = (severity)=>this.peerManager.penalizePeer(peerId, severity);
         if (requested && !requested.has(tx.getTxHash().toString())) {
@@ -1689,9 +1731,17 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     }
     /** Creates the first stage (fast) validators for gossiped transactions. */ async createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp) {
         const gasFees = await this.getGasFees(currentBlockNumber);
-        const allowedInSetup = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
+        const allowedInSetup = [
+            ...await getDefaultAllowedSetupFunctions(),
+            ...this.config.txPublicSetupAllowListExtend ?? []
+        ];
         const blockNumber = BlockNumber(currentBlockNumber + 1);
-        return createFirstStageTxValidationsForGossipedTransactions(nextSlotTimestamp, blockNumber, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, !this.config.disableTransactions, allowedInSetup, this.logger.getBindings());
+        const l1Constants = await this.archiver.getL1Constants();
+        return createFirstStageTxValidationsForGossipedTransactions(nextSlotTimestamp, blockNumber, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, !this.config.disableTransactions, allowedInSetup, this.logger.getBindings(), {
+            rollupManaLimit: l1Constants.rollupManaLimit,
+            maxBlockL2Gas: this.config.validateMaxL2BlockGas,
+            maxBlockDAGas: this.config.validateMaxDABlockGas
+        });
     }
     /** Creates the second stage (expensive proof verification) validators for gossiped transactions. */ createSecondStageMessageValidators() {
         return createSecondStageTxValidationsForGossipedTransactions(this.proofVerifier, this.logger.getBindings());
@@ -1712,8 +1762,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         });
         // A promise that resolves when all validations have been run
         const allValidations = await Promise.all(validationPromises);
-        const failed = allValidations.find((x)=>!x.isValid);
-        if (failed) {
+        const failures = allValidations.filter((x)=>!x.isValid);
+        if (failures.length > 0) {
+            // Pick the most severe failure (lowest tolerance = harshest penalty)
+            const failed = maxBy(failures, (f)=>PeerErrorSeverityByHarshness.indexOf(f.severity));
             return {
                 allPassed: false,
                 failure: {
@@ -1760,19 +1812,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         return PeerErrorSeverity.HighToleranceError;
     }
-    /**
-   * Validate a checkpoint attestation.
-   *
-   * @param attestation - The checkpoint attestation to validate.
-   * @returns True if the checkpoint attestation is valid, false otherwise.
-   */ async validateCheckpointAttestation(peerId, attestation) {
-        const result = await this.checkpointAttestationValidator.validate(attestation);
-        if (result.result === 'reject') {
-            this.logger.warn(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
-            this.peerManager.penalizePeer(peerId, result.severity);
-        }
-        return result;
-    }
     getPeerScore(peerId) {
         return this.node.services.pubsub.score.score(peerId.toString());
     }

package/dest/services/peer-manager/metrics.d.ts

@@ -6,6 +6,7 @@ export declare class PeerManagerMetrics {
     private sentGoodbyes;
     private receivedGoodbyes;
     private peerCount;
+    private healthyPeerCount;
     private lowScoreDisconnects;
     private peerConnectionDuration;
     private peerConnectedAt;
@@ -14,8 +15,9 @@ export declare class PeerManagerMetrics {
     recordGoodbyeSent(reason: GoodByeReason): void;
     recordGoodbyeReceived(reason: GoodByeReason): void;
     recordPeerCount(count: number): void;
+    recordHealthyPeerCount(count: number): void;
     recordLowScoreDisconnect(scoreState: 'Banned' | 'Disconnect'): void;
     peerConnected(id: PeerId): void;
     peerDisconnected(id: PeerId): void;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3BlZXItbWFuYWdlci9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFLTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBSVosTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsYUFBYSxFQUF1QixNQUFNLCtCQUErQixDQUFDO0FBRW5GLHFCQUFhLGtCQUFrQjthQVlYLGVBQWUsRUFBRSxlQUFlO0lBWGxELE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBUTtJQUN6QixPQUFPLENBQUMsbUJBQW1CLENBQWdCO0lBQzNDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBWTtJQUUxQyxPQUFPLENBQUMsZUFBZSxDQUFrRDtJQUV6RSxTQUFnQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRS9CLFlBQ2tCLGVBQWUsR0FBRSxlQUFzQyxFQUN2RSxJQUFJLFNBQWdCLEVBMEJyQjtJQUVNLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxhQUFhLFFBRTdDO0lBRU0scUJBQXFCLENBQUMsTUFBTSxFQUFFLGFBQWEsUUFFakQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFbkM7SUFFTSx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsUUFBUSxHQUFHLFlBQVksUUFFbEU7SUFFTSxhQUFhLENBQUMsRUFBRSxFQUFFLE1BQU0sUUFFOUI7SUFFTSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxRQUtqQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3BlZXItbWFuYWdlci9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFLTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBSVosTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsYUFBYSxFQUF1QixNQUFNLCtCQUErQixDQUFDO0FBRW5GLHFCQUFhLGtCQUFrQjthQWFYLGVBQWUsRUFBRSxlQUFlO0lBWmxELE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBUTtJQUN6QixPQUFPLENBQUMsZ0JBQWdCLENBQVE7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFnQjtJQUMzQyxPQUFPLENBQUMsc0JBQXNCLENBQVk7SUFFMUMsT0FBTyxDQUFDLGVBQWUsQ0FBa0Q7SUFFekUsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNrQixlQUFlLEdBQUUsZUFBc0MsRUFDdkUsSUFBSSxTQUFnQixFQTJCckI7SUFFTSxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsYUFBYSxRQUU3QztJQUVNLHFCQUFxQixDQUFDLE1BQU0sRUFBRSxhQUFhLFFBRWpEO0lBRU0sZUFBZSxDQUFDLEtBQUssRUFBRSxNQUFNLFFBRW5DO0lBRU0sc0JBQXNCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFMUM7SUFFTSx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsUUFBUSxHQUFHLFlBQVksUUFFbEU7SUFFTSxhQUFhLENBQUMsRUFBRSxFQUFFLE1BQU0sUUFFOUI7SUFFTSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxRQU1qQztDQUNGIn0=

package/dest/services/peer-manager/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AAEnF,qBAAa,kBAAkB;aAYX,eAAe,EAAE,eAAe;IAXlD,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,sBAAsB,CAAY;IAE1C,OAAO,CAAC,eAAe,CAAkD;IAEzE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACkB,eAAe,GAAE,eAAsC,EACvE,IAAI,SAAgB,EA0BrB;IAEM,iBAAiB,CAAC,MAAM,EAAE,aAAa,QAE7C;IAEM,qBAAqB,CAAC,MAAM,EAAE,aAAa,QAEjD;IAEM,eAAe,CAAC,KAAK,EAAE,MAAM,QAEnC;IAEM,wBAAwB,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,QAElE;IAEM,aAAa,CAAC,EAAE,EAAE,MAAM,QAE9B;IAEM,gBAAgB,CAAC,EAAE,EAAE,MAAM,QAKjC;CACF"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AAEnF,qBAAa,kBAAkB;aAaX,eAAe,EAAE,eAAe;IAZlD,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,sBAAsB,CAAY;IAE1C,OAAO,CAAC,eAAe,CAAkD;IAEzE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACkB,eAAe,GAAE,eAAsC,EACvE,IAAI,SAAgB,EA2BrB;IAEM,iBAAiB,CAAC,MAAM,EAAE,aAAa,QAE7C;IAEM,qBAAqB,CAAC,MAAM,EAAE,aAAa,QAEjD;IAEM,eAAe,CAAC,KAAK,EAAE,MAAM,QAEnC;IAEM,sBAAsB,CAAC,KAAK,EAAE,MAAM,QAE1C;IAEM,wBAAwB,CAAC,UAAU,EAAE,QAAQ,GAAG,YAAY,QAElE;IAEM,aAAa,CAAC,EAAE,EAAE,MAAM,QAE9B;IAEM,gBAAgB,CAAC,EAAE,EAAE,MAAM,QAMjC;CACF"}

package/dest/services/peer-manager/metrics.js

@@ -5,6 +5,7 @@ export class PeerManagerMetrics {
     sentGoodbyes;
     receivedGoodbyes;
     peerCount;
+    healthyPeerCount;
     lowScoreDisconnects;
     peerConnectionDuration;
     peerConnectedAt;
@@ -27,6 +28,7 @@ export class PeerManagerMetrics {
         this.sentGoodbyes = createUpDownCounterWithDefault(meter, Metrics.PEER_MANAGER_GOODBYES_SENT, goodbyeReasonAttrs);
         this.receivedGoodbyes = createUpDownCounterWithDefault(meter, Metrics.PEER_MANAGER_GOODBYES_RECEIVED, goodbyeReasonAttrs);
         this.peerCount = meter.createGauge(Metrics.PEER_MANAGER_PEER_COUNT);
+        this.healthyPeerCount = meter.createGauge(Metrics.PEER_MANAGER_HEALTHY_PEER_COUNT);
         this.lowScoreDisconnects = createUpDownCounterWithDefault(meter, Metrics.PEER_MANAGER_LOW_SCORE_DISCONNECTS, {
             [Attributes.P2P_PEER_SCORE_STATE]: [
                 'Banned',
@@ -48,6 +50,9 @@ export class PeerManagerMetrics {
     recordPeerCount(count) {
         this.peerCount.record(count);
     }
+    recordHealthyPeerCount(count) {
+        this.healthyPeerCount.record(count);
+    }
     recordLowScoreDisconnect(scoreState) {
         this.lowScoreDisconnects.add(1, {
             [Attributes.P2P_PEER_SCORE_STATE]: scoreState
@@ -60,6 +65,7 @@ export class PeerManagerMetrics {
         const connectedAt = this.peerConnectedAt.get(id.toString());
         if (connectedAt) {
             this.peerConnectionDuration.record(Date.now() - connectedAt);
+            this.peerConnectedAt.delete(id.toString());
         }
     }
 }