@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

package/dest/services/libp2p/libp2p_service.js

@@ -1,25 +1,390 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
 }
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+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, _initProto;
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { maxBy } from '@aztec/foundation/collection';
 import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { GasFees } from '@aztec/stdlib/gas';
-import { BlockAttestation, BlockProposal, P2PClientType, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForClientAndConfig, 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';
-import { Attributes, OtelMetricsAdapter, WithTracer, trackSpan } from '@aztec/telemetry-client';
+import { Attributes, OtelMetricsAdapter, SpanStatusCode, WithTracer, trackSpan } from '@aztec/telemetry-client';
 import { gossipsub } from '@chainsafe/libp2p-gossipsub';
-import { createPeerScoreParams, createTopicScoreParams } from '@chainsafe/libp2p-gossipsub/score';
+import { createPeerScoreParams } from '@chainsafe/libp2p-gossipsub/score';
 import { SignaturePolicy } from '@chainsafe/libp2p-gossipsub/types';
 import { noise } from '@chainsafe/libp2p-noise';
 import { yamux } from '@chainsafe/libp2p-yamux';
@@ -30,30 +395,47 @@ import { mplex } from '@libp2p/mplex';
 import { tcp } from '@libp2p/tcp';
 import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
-import { AttestationValidator, BlockProposalValidator } from '../../msg_validators/index.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 { getDefaultAllowedSetupFunctions } from '../../msg_validators/tx_validator/allowed_public_setup.js';
-import { createTxMessageValidators } from '../../msg_validators/tx_validator/factory.js';
-import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator } from '../../msg_validators/tx_validator/index.js';
+import { createFirstStageTxValidationsForGossipedTransactions, createSecondStageTxValidationsForGossipedTransactions, createTxValidatorForBlockProposalReceivedTxs, createTxValidatorForReqResponseReceivedTxs } from '../../msg_validators/tx_validator/factory.js';
 import { GossipSubEvent } from '../../types/index.js';
 import { convertToMultiaddr } from '../../util.js';
 import { getVersions } from '../../versioning.js';
 import { AztecDatastore } from '../data_store.js';
 import { DiscV5Service } from '../discv5/discV5_service.js';
 import { SnappyTransform, fastMsgIdFn, getMsgIdFn, msgIdToStrFn } from '../encoding.js';
-import { gossipScoreThresholds } from '../gossipsub/scoring.js';
+import { APP_SPECIFIC_WEIGHT, gossipScoreThresholds } from '../gossipsub/scoring.js';
+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 } from '../reqresp/interface.js';
-import { reqRespBlockTxsHandler } from '../reqresp/protocols/block_txs/block_txs_handler.js';
-import { reqGoodbyeHandler } from '../reqresp/protocols/goodbye.js';
-import { pingHandler, reqRespBlockHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/protocols/index.js';
+import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
+_dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation)=>({
+        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString()
+    })), _dec1 = trackSpan('Libp2pService.validateAndStoreBlockProposal', (_peerId, block)=>({
+        [Attributes.BLOCK_NUMBER]: block.blockNumber.toString(),
+        [Attributes.SLOT_NUMBER]: block.slotNumber.toString()
+    })), _dec2 = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
+        [Attributes.SLOT_NUMBER]: block.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
+        [Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then((i)=>i.toString())
+    })), _dec3 = trackSpan('Libp2pService.validateAndStoreCheckpointProposal', (_peerId, checkpoint)=>({
+        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString()
+    })), _dec4 = trackSpan('Libp2pService.processValidCheckpointProposal', async (checkpoint)=>({
+        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: checkpoint.archive.toString(),
+        [Attributes.P2P_ID]: await checkpoint.p2pMessageLoggingIdentifier().then((i)=>i.toString())
+    })), _dec5 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
+        [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()
+    }));
 /**
  * Lib P2P implementation of the P2PService interface.
  */ export class LibP2PService extends WithTracer {
-    clientType;
     config;
     node;
     peerDiscoveryService;
@@ -64,45 +446,109 @@ import { P2PInstrumentation } from './instrumentation.js';
     epochCache;
     proofVerifier;
     worldStateSynchronizer;
-    logger;
-    jobQueue;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "validateAndStoreCheckpointAttestation"
+            ],
+            [
+                _dec1,
+                2,
+                "validateAndStoreBlockProposal"
+            ],
+            [
+                _dec2,
+                2,
+                "processValidBlockProposal"
+            ],
+            [
+                _dec3,
+                2,
+                "validateAndStoreCheckpointProposal"
+            ],
+            [
+                _dec4,
+                2,
+                "processValidCheckpointProposal"
+            ],
+            [
+                _dec5,
+                2,
+                "validateRequestedBlockTxs"
+            ],
+            [
+                _dec6,
+                2,
+                "validateRequestedTxs"
+            ],
+            [
+                _dec7,
+                2,
+                "validateRequestedBlock"
+            ]
+        ], []));
+    }
     discoveryRunningPromise;
     msgIdSeenValidators;
     // Message validators
-    attestationValidator;
     blockProposalValidator;
+    checkpointProposalValidator;
+    checkpointAttestationValidator;
     protocolVersion;
     topicStrings;
     feesCache;
+    /** Callback invoked when a duplicate proposal is detected (triggers slashing). */ duplicateProposalCallback;
+    /** Callback invoked when a duplicate attestation is detected (triggers slashing). */ duplicateAttestationCallback;
     /**
    * Callback for when a block is received from a peer.
    * @param block - The block received from the peer.
    * @returns The attestation for the block, if any.
    */ blockReceivedCallback;
+    /**
+   * 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;
     gossipSubEventHandler;
     instrumentation;
-    constructor(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
-        super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.logger = logger, this.jobQueue = new SerialQueue(), this.msgIdSeenValidators = {}, this.protocolVersion = '', this.topicStrings = {};
+    telemetry;
+    logger;
+    constructor(config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
+        super(telemetry, 'LibP2PService'), this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = (_initProto(this), {}), this.protocolVersion = '', this.topicStrings = {};
+        this.telemetry = telemetry;
+        // Create child logger with fisherman prefix if in fisherman mode
+        this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
         this.instrumentation = new P2PInstrumentation(telemetry, 'LibP2PService');
         this.msgIdSeenValidators[TopicType.tx] = new MessageSeenValidator(config.seenMessageCacheSize);
         this.msgIdSeenValidators[TopicType.block_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
-        this.msgIdSeenValidators[TopicType.block_attestation] = new MessageSeenValidator(config.seenMessageCacheSize);
+        this.msgIdSeenValidators[TopicType.checkpoint_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
+        this.msgIdSeenValidators[TopicType.checkpoint_attestation] = new MessageSeenValidator(config.seenMessageCacheSize);
         const versions = getVersions(config);
         this.protocolVersion = compressComponentVersions(versions);
         logger.info(`Started libp2p service with protocol version ${this.protocolVersion}`);
         this.topicStrings[TopicType.tx] = createTopicString(TopicType.tx, this.protocolVersion);
         this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
-        this.topicStrings[TopicType.block_attestation] = createTopicString(TopicType.block_attestation, this.protocolVersion);
-        this.attestationValidator = new AttestationValidator(epochCache);
-        this.blockProposalValidator = new BlockProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
-        });
+        this.topicStrings[TopicType.checkpoint_proposal] = createTopicString(TopicType.checkpoint_proposal, this.protocolVersion);
+        this.topicStrings[TopicType.checkpoint_attestation] = createTopicString(TopicType.checkpoint_attestation, this.protocolVersion);
+        const proposalValidatorOpts = {
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint
+        };
+        this.blockProposalValidator = new BlockProposalValidator(epochCache, proposalValidatorOpts);
+        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, proposalValidatorOpts);
+        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.toNumber()} from peer.`, {
-                p2pMessageIdentifier: await block.p2pMessageIdentifier()
+            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 undefined;
+            return true;
+        };
+        this.checkpointReceivedCallback = (checkpoint)=>{
+            this.logger.debug(`Handler not yet registered: Checkpoint received callback not set. Received checkpoint for slot ${checkpoint.slotNumber} from peer.`);
+            return Promise.resolve(undefined);
         };
     }
     updateConfig(config) {
@@ -113,13 +559,13 @@ import { P2PInstrumentation } from './instrumentation.js';
    * @param config - The configuration to use when creating the service.
    * @param txPool - The transaction pool to be accessed by the service.
    * @returns The new service.
-   */ static async new(clientType, config, peerId, deps) {
+   */ static async new(config, peerId, deps) {
         const { worldStateSynchronizer, epochCache, l2BlockSource, mempools, proofVerifier, peerStore, telemetry, logger, packageVersion } = deps;
         const { p2pPort, maxPeerCount, listenAddress } = config;
         const bindAddrTcp = convertToMultiaddr(listenAddress, p2pPort, 'tcp');
         const datastore = new AztecDatastore(peerStore);
-        const otelMetricsAdapter = new OtelMetricsAdapter(telemetry);
-        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`));
+        const otelMetricsAdapter = new OtelMetricsAdapter(telemetry, logger.getBindings());
+        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`, logger.getBindings()));
         // Seed libp2p's bootstrap discovery with private and trusted peers
         const bootstrapNodes = [
             ...config.privatePeers,
@@ -133,9 +579,6 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
         const versions = getVersions(config);
         const protocolVersion = compressComponentVersions(versions);
-        const txTopic = createTopicString(TopicType.tx, protocolVersion);
-        const blockProposalTopic = createTopicString(TopicType.block_proposal, protocolVersion);
-        const blockAttestationTopic = createTopicString(TopicType.block_attestation, protocolVersion);
         const preferredPeersEnrs = config.preferredPeers.map((enr)=>ENR.decodeTxt(enr));
         const directPeers = (await Promise.all(preferredPeersEnrs.map(async (enr)=>{
             const peerId = await enr.peerId();
@@ -153,6 +596,15 @@ import { P2PInstrumentation } from './instrumentation.js';
         const announceTcpMultiaddr = config.p2pIp ? [
             convertToMultiaddr(config.p2pIp, p2pPort, 'tcp')
         ] : [];
+        // Create dynamic topic score params based on network configuration
+        const l1Constants = epochCache.getL1Constants();
+        const topicScoreParams = createAllTopicScoreParams(protocolVersion, {
+            slotDurationMs: l1Constants.slotDuration * 1000,
+            heartbeatIntervalMs: config.gossipsubInterval,
+            targetCommitteeSize: l1Constants.targetCommitteeSize,
+            blockDurationMs: config.blockDurationMs,
+            expectedBlockProposalsPerSlot: config.expectedBlockProposalsPerSlot
+        });
         const node = await createLibp2p({
             start: false,
             peerId,
@@ -253,38 +705,26 @@ import { P2PInstrumentation } from './instrumentation.js';
                     scoreParams: createPeerScoreParams({
                         // IPColocation factor can be disabled for local testing - default to -5
                         IPColocationFactorWeight: config.debugDisableColocationPenalty ? 0 : -5.0,
-                        topics: {
-                            [txTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            }),
-                            [blockAttestationTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            }),
-                            [blockProposalTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            })
-                        }
+                        topics: topicScoreParams
                     })
                 }),
                 components: (components)=>({
                         connectionManager: components.connectionManager
                     })
             },
-            logger: createLibp2pComponentLogger(logger.module)
+            logger: createLibp2pComponentLogger(logger.module, logger.getBindings())
         });
-        const peerScoring = new PeerScoring(config);
+        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);
-        // Update gossipsub score params
-        node.services.pubsub.score.params.appSpecificWeight = 10;
+        // Configure application-specific scoring for gossipsub.
+        // The weight scales app score to align with gossipsub thresholds:
+        // - Disconnect (-50) × 10 = -500 = gossipThreshold (stops receiving gossip)
+        // - Ban (-100) × 10 = -1000 = publishThreshold (cannot publish)
+        // Note: positive topic scores can offset penalties, so alignment is best-effort.
+        node.services.pubsub.score.params.appSpecificWeight = APP_SPECIFIC_WEIGHT;
         node.services.pubsub.score.params.appSpecificScore = (peerId)=>peerManager.shouldDisableP2PGossip(peerId) ? -Infinity : peerManager.getPeerScore(peerId);
-        return new LibP2PService(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger);
+        return new LibP2PService(config, node, peerDiscoveryService, reqresp, peerManager, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger);
     }
     /**
    * Starts the LibP2P service.
@@ -300,17 +740,6 @@ import { P2PInstrumentation } from './instrumentation.js';
             throw new Error('Announce address not provided.');
         }
         const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
-        // Start job queue, peer discovery service and libp2p node
-        this.jobQueue.start();
-        await this.peerManager.initializePeers();
-        if (!this.config.p2pDiscoveryDisabled) {
-            await this.peerDiscoveryService.start();
-        }
-        await this.node.start();
-        // Subscribe to standard GossipSub topics by default
-        for (const topic of getTopicsForClientAndConfig(this.clientType, this.config.disableTransactions)){
-            this.subscribeToTopic(this.topicStrings[topic]);
-        }
         // Create request response protocol handlers
         const txHandler = reqRespTxHandler(this.mempools);
         const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
@@ -322,27 +751,37 @@ import { P2PInstrumentation } from './instrumentation.js';
             [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this),
             [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
         };
-        // Only handle block transactions request if attestation pool is available to the client
-        if (this.mempools.attestationPool && !this.config.disableTransactions) {
-            const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool);
+        if (!this.config.disableTransactions) {
+            const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.archiver, this.mempools.txPool);
             requestResponseHandlers[ReqRespSubProtocol.BLOCK_TXS] = blockTxsHandler.bind(this);
         }
         if (!this.config.disableTransactions) {
             requestResponseHandlers[ReqRespSubProtocol.TX] = txHandler.bind(this);
         }
-        // add GossipSub listener
-        this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
-        // Start running promise for peer discovery
-        this.discoveryRunningPromise = new RunningPromise(()=>this.peerManager.heartbeat(), this.logger, this.config.peerCheckIntervalMS);
-        this.discoveryRunningPromise.start();
         // Define the sub protocol validators - This is done within this start() method to gain a callback to the existing validateTx function
         const reqrespSubProtocolValidators = {
             ...DEFAULT_SUB_PROTOCOL_VALIDATORS,
-            // TODO(#11336): A request validator for blocks
             [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
-            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this)
+            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
+            [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this)
         };
+        await this.peerManager.initializePeers();
         await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
+        await this.node.start();
+        // Subscribe to standard GossipSub topics by default
+        for (const topic of getTopicsForConfig(this.config.disableTransactions)){
+            this.subscribeToTopic(this.topicStrings[topic]);
+        }
+        // add GossipSub listener
+        this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
+        // Start running promise for peer discovery and metrics collection
+        if (!this.config.p2pDiscoveryDisabled) {
+            await this.peerDiscoveryService.start();
+        }
+        this.discoveryRunningPromise = new RunningPromise(async ()=>{
+            await this.peerManager.heartbeat();
+        }, this.logger, this.config.peerCheckIntervalMS);
+        this.discoveryRunningPromise.start();
         this.logger.info(`Started P2P service`, {
             listen: this.config.listenAddress,
             port: this.config.p2pPort,
@@ -359,8 +798,6 @@ import { P2PInstrumentation } from './instrumentation.js';
         // Stop peer manager
         this.logger.debug('Stopping peer manager...');
         await this.peerManager.stop();
-        this.logger.debug('Stopping job queue...');
-        await this.jobQueue.end();
         this.logger.debug('Stopping running promise...');
         await this.discoveryRunningPromise?.stop();
         this.logger.debug('Stopping peer discovery service...');
@@ -380,6 +817,9 @@ import { P2PInstrumentation } from './instrumentation.js';
     getPeers(includePending) {
         return this.peerManager.getPeers(includePending);
     }
+    getGossipMeshPeerCount(topicType) {
+        return this.node.services.pubsub.getMeshPeers(this.topicStrings[topicType]).length;
+    }
     handleGossipSubEvent(e) {
         this.logger.trace(`Received PUBSUB message.`);
         const safeJob = async ()=>{
@@ -399,6 +839,9 @@ import { P2PInstrumentation } from './instrumentation.js';
    */ sendBatchRequest(protocol, requests, pinnedPeerId) {
         return this.reqresp.sendBatchRequest(protocol, requests, pinnedPeerId);
     }
+    sendRequestToPeer(peerId, subProtocol, payload, dialTimeout) {
+        return this.reqresp.sendRequestToPeer(peerId, subProtocol, payload, dialTimeout);
+    }
     /**
    * Get the ENR of the node
    * @returns The ENR of the node
@@ -408,6 +851,22 @@ import { P2PInstrumentation } from './instrumentation.js';
     registerBlockReceivedCallback(callback) {
         this.blockReceivedCallback = callback;
     }
+    registerCheckpointReceivedCallback(callback) {
+        this.checkpointReceivedCallback = callback;
+    }
+    /**
+   * Registers a callback to be invoked when a duplicate proposal is detected.
+   * This callback is triggered on the first duplicate (when count goes from 1 to 2).
+   */ registerDuplicateProposalCallback(callback) {
+        this.duplicateProposalCallback = callback;
+    }
+    /**
+   * Registers a callback to be invoked when a duplicate attestation is detected.
+   * A validator signing attestations for different proposals at the same slot.
+   * This callback is triggered on the first duplicate (when count goes from 1 to 2).
+   */ registerDuplicateAttestationCallback(callback) {
+        this.duplicateAttestationCallback = callback;
+    }
     /**
    * Subscribes to a topic.
    * @param topic - The topic to subscribe to.
@@ -426,7 +885,9 @@ import { P2PInstrumentation } from './instrumentation.js';
         if (!this.node.services.pubsub) {
             throw new Error('Pubsub service not available.');
         }
-        const p2pMessage = P2PMessage.fromGossipable(message);
+        const isBlockProposal = topic === this.topicStrings[TopicType.block_proposal];
+        const traceContext = this.config.debugP2PInstrumentMessages && isBlockProposal ? this.telemetry.getTraceContext() : undefined;
+        const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages, traceContext);
         const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
         return result.recipients.length;
     }
@@ -440,12 +901,15 @@ import { P2PInstrumentation } from './instrumentation.js';
             case this.topicStrings[TopicType.tx]:
                 topicType = TopicType.tx;
                 break;
-            case this.topicStrings[TopicType.block_attestation]:
-                topicType = TopicType.block_attestation;
-                break;
             case this.topicStrings[TopicType.block_proposal]:
                 topicType = TopicType.block_proposal;
                 break;
+            case this.topicStrings[TopicType.checkpoint_proposal]:
+                topicType = TopicType.checkpoint_proposal;
+                break;
+            case this.topicStrings[TopicType.checkpoint_attestation]:
+                topicType = TopicType.checkpoint_attestation;
+                break;
             default:
                 this.logger.error(`Received message on unknown topic: ${msg.topic}`);
                 break;
@@ -454,6 +918,12 @@ import { P2PInstrumentation } from './instrumentation.js';
         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
@@ -466,23 +936,95 @@ import { P2PInstrumentation } from './instrumentation.js';
         };
     }
     /**
+   * Safely deserializes a P2PMessage from raw message data.
+   * @param msgId - The message ID.
+   * @param source - The peer ID of the message source.
+   * @param data - The raw message data.
+   * @returns The deserialized P2PMessage or undefined if deserialization fails.
+   */ safelyDeserializeP2PMessage(msgId, source, data) {
+        try {
+            return P2PMessage.fromMessageData(Buffer.from(data), this.config.debugP2PInstrumentMessages);
+        } catch (err) {
+            this.logger.error(`Error deserializing P2PMessage`, err, {
+                msgId,
+                source: source.toString()
+            });
+            this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Reject);
+            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
+            return undefined;
+        }
+    }
+    /**
    * Handles a new gossip message that was received by the client.
    * @param topic - The message's topic.
    * @param data - The message data
    */ async handleNewGossipMessage(msg, msgId, source) {
-        const p2pMessage = P2PMessage.fromMessageData(Buffer.from(msg.data));
+        const msgReceivedTime = Date.now();
+        let topicType;
+        const p2pMessage = this.safelyDeserializeP2PMessage(msgId, source, msg.data);
+        if (!p2pMessage) {
+            return;
+        }
         const preValidationResult = this.preValidateReceivedMessage(msg, msgId, source);
         if (!preValidationResult.result) {
             return;
         }
+        // Determine topic type for attributes
         if (msg.topic === this.topicStrings[TopicType.tx]) {
-            await this.handleGossipedTx(p2pMessage.payload, msgId, source);
+            topicType = TopicType.tx;
+        } else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
+            topicType = TopicType.checkpoint_attestation;
+        } else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
+            topicType = TopicType.block_proposal;
+        } else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
+            topicType = TopicType.checkpoint_proposal;
         }
-        if (msg.topic === this.topicStrings[TopicType.block_attestation] && this.clientType === P2PClientType.Full) {
-            await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
+        // Process the message, optionally within a linked span for trace propagation
+        const processMessage = async ()=>{
+            if (msg.topic === this.topicStrings[TopicType.tx]) {
+                await this.handleGossipedTx(p2pMessage.payload, msgId, source);
+            } else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
+                await this.processCheckpointAttestationFromPeer(p2pMessage.payload, msgId, source);
+            } else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
+                await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
+            } else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
+                await this.handleGossipedCheckpointProposal(p2pMessage.payload, msgId, source);
+            } else {
+                this.logger.error(`Received message on unknown topic: ${msg.topic}`);
+            }
+        };
+        const latency = p2pMessage.timestamp !== undefined ? msgReceivedTime - p2pMessage.timestamp.getTime() : undefined;
+        const propagatedContext = p2pMessage.traceContext ? this.telemetry.extractPropagatedContext(p2pMessage.traceContext) : undefined;
+        if (propagatedContext) {
+            await this.tracer.startActiveSpan('LibP2PService.processMessage', {
+                attributes: {
+                    [Attributes.TOPIC_NAME]: topicType,
+                    [Attributes.PEER_ID]: source.toString()
+                }
+            }, propagatedContext, async (span)=>{
+                try {
+                    await processMessage();
+                    span.setStatus({
+                        code: SpanStatusCode.OK
+                    });
+                } catch (err) {
+                    span.setStatus({
+                        code: SpanStatusCode.ERROR,
+                        message: String(err)
+                    });
+                    if (typeof err === 'string' || err && err instanceof Error) {
+                        span.recordException(err);
+                    }
+                    throw err;
+                } finally{
+                    span.end();
+                }
+            });
+        } else {
+            await processMessage();
         }
-        if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
-            await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
+        if (latency !== undefined && topicType !== undefined) {
+            this.instrumentation.recordMessageLatency(topicType, latency);
         }
         return;
     }
@@ -494,6 +1036,7 @@ import { P2PInstrumentation } from './instrumentation.js';
         try {
             resultAndObj = await validationFunc();
         } catch (err) {
+            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
             this.logger.error(`Error deserializing and validating gossipsub message`, err, {
                 msgId,
                 source: source.toString(),
@@ -509,191 +1052,520 @@ import { P2PInstrumentation } from './instrumentation.js';
     async handleGossipedTx(payloadData, msgId, source) {
         const validationFunc = async ()=>{
             const tx = Tx.fromBuffer(payloadData);
-            const isValid = await this.validatePropagatedTx(tx, source);
-            const exists = isValid && await this.mempools.txPool.hasTx(tx.getTxHash());
-            this.logger.trace(`Validate propagated tx`, {
-                isValid,
-                exists,
-                [Attributes.P2P_ID]: source.toString()
-            });
-            if (!isValid) {
+            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)
+            const firstStageValidators = await this.createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp);
+            const firstStageOutcome = await this.runValidations(tx, firstStageValidators);
+            if (!firstStageOutcome.allPassed) {
+                const { name } = firstStageOutcome.failure;
+                let { severity } = firstStageOutcome.failure;
+                // Double spend validator has a special case handler. We perform more detailed examination
+                // as to how recently the nullifier was entered into the tree and if the transaction should
+                // have 'known' the nullifier existed. This determines the severity of the penalty applied to the peer.
+                if (name === 'doubleSpendValidator') {
+                    const txBlockNumber = BlockNumber(currentBlockNumber + 1);
+                    severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
+                }
+                this.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 1 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
+                this.peerManager.penalizePeer(source, severity);
                 return {
                     result: TopicValidatorResult.Reject
                 };
-            } else if (exists) {
+            }
+            // 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
                 };
-            } else {
+            }
+            // Stage 2: expensive proof verification
+            const secondStageValidators = this.createSecondStageMessageValidators();
+            const secondStageOutcome = await this.runValidations(tx, secondStageValidators);
+            if (!secondStageOutcome.allPassed) {
+                const { severity, name } = secondStageOutcome.failure;
+                this.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 2 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
+                this.peerManager.penalizePeer(source, severity);
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            }
+            // Pool add: persist the tx
+            const txHash = tx.getTxHash();
+            const addResult = await this.mempools.txPool.addPendingTxs([
+                tx
+            ], {
+                source: 'gossip'
+            });
+            const wasAccepted = addResult.accepted.some((h)=>h.equals(txHash));
+            const wasIgnored = addResult.ignored.some((h)=>h.equals(txHash));
+            this.logger.verbose(`Validate propagated tx ${txHash.toString()}`, {
+                wasAccepted,
+                wasIgnored,
+                [Attributes.P2P_ID]: source.toString()
+            });
+            if (wasAccepted) {
                 return {
                     result: TopicValidatorResult.Accept,
                     obj: tx
                 };
+            } else if (wasIgnored) {
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: tx
+                };
+            } else {
+                this.logger.warn(`Gossiped tx ${txHash.toString()} unexpectedly rejected by pool`, {
+                    source: source.toString(),
+                    txHash: txHash.toString()
+                });
+                this.peerManager.penalizePeer(source, PeerErrorSeverity.HighToleranceError);
+                return {
+                    result: TopicValidatorResult.Reject
+                };
             }
         };
         const { result, obj: tx } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.tx);
         if (result !== TopicValidatorResult.Accept || !tx) {
             return;
         }
+        // Tx was accepted into pool and will be propagated - just log and record metrics
         const txHash = tx.getTxHash();
         const txHashString = txHash.toString();
         this.logger.verbose(`Received tx ${txHashString} from external peer ${source.toString()} via gossip`, {
             source: source.toString(),
             txHash: txHashString
         });
-        if (this.config.dropTransactions && randomInt(1000) < this.config.dropTransactionsProbability * 1000) {
-            this.logger.warn(`Intentionally dropping tx ${txHashString} (probability rule)`);
-            return;
-        }
-        await this.mempools.txPool.addTxs([
-            tx
-        ]);
+        this.instrumentation.incrementTxReceived(1);
     }
     /**
-   * Process Attestation From Peer
-   * When a proposal is received from a peer, we add it to the attestation pool, so it can be accessed by other services.
-   *
-   * @param attestation - The attestation to process.
-   */ async processAttestationFromPeer(payloadData, msgId, source) {
-        const validationFunc = async ()=>{
-            const attestation = BlockAttestation.fromBuffer(payloadData);
-            const isValid = await this.validateAttestation(source, attestation);
-            const exists = isValid && await this.mempools.attestationPool.hasAttestation(attestation);
-            this.logger.trace(`Validate propagated block attestation`, {
-                isValid,
-                exists,
-                [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
-                [Attributes.P2P_ID]: source.toString()
-            });
-            if (!isValid) {
-                return {
-                    result: TopicValidatorResult.Reject
-                };
-            } else if (exists) {
-                return {
-                    result: TopicValidatorResult.Ignore,
-                    obj: attestation
-                };
-            } else {
-                return {
-                    result: TopicValidatorResult.Accept,
-                    obj: attestation
-                };
-            }
-        };
-        const { result, obj: attestation } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.block_attestation);
+   * 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);
         if (result !== TopicValidatorResult.Accept || !attestation) {
             return;
         }
-        this.logger.debug(`Received attestation for slot ${attestation.slotNumber.toNumber()} from external peer ${source.toString()}`, {
-            p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-            slot: attestation.slotNumber.toNumber(),
+        this.logger.verbose(`Received valid checkpoint attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`, {
+            p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
+            slot: attestation.slotNumber,
             archive: attestation.archive.toString(),
             source: source.toString()
         });
-        await this.mempools.attestationPool.addAttestations([
-            attestation
-        ]);
     }
-    async processBlockFromPeer(payloadData, msgId, source) {
-        const validationFunc = async ()=>{
-            const block = BlockProposal.fromBuffer(payloadData);
-            const isValid = await this.validateBlockProposal(source, block);
-            // Note that we dont have an attestation pool if we're a prover node, but we still
-            // subscribe to block proposal topics in order to prevent their txs from being cleared.
-            const exists = isValid && await this.mempools.attestationPool?.hasBlockProposal(block);
-            this.logger.trace(`Validate propagated block proposal`, {
-                isValid,
-                exists,
-                [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
-                [Attributes.P2P_ID]: source.toString()
+    /** Validates a checkpoint attestation and adds it to the pool. Penalizes the peer if validation fails. */ async validateAndStoreCheckpointAttestation(peerId, attestation) {
+        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
+            };
+        }
+        if (validationResult.result === 'ignore') {
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: attestation
+            };
+        }
+        // Try to add the attestation: this handles existence check, cap check, and adding in one call
+        // count is the number of attestations by this signer for this slot (for duplicate detection)
+        const slot = attestation.payload.header.slotNumber;
+        const { added, alreadyExists, count } = await this.mempools.attestationPool.tryAddCheckpointAttestation(attestation);
+        this.logger.trace(`Validate propagated checkpoint attestation`, {
+            added,
+            alreadyExists,
+            count,
+            [Attributes.SLOT_NUMBER]: slot.toString(),
+            [Attributes.P2P_ID]: peerId.toString()
+        });
+        // Exact same attestation received, no need to re-broadcast
+        if (alreadyExists) {
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: attestation
+            };
+        }
+        // Could not add (cap reached for signer), no need to re-broadcast
+        if (!added) {
+            this.logger.warn(`Dropping checkpoint attestation due to cap`, {
+                slot: slot.toString(),
+                archive: attestation.archive.toString(),
+                source: peerId.toString(),
+                attester: attestation.getSender()?.toString(),
+                count
             });
-            if (!isValid) {
-                return {
-                    result: TopicValidatorResult.Reject
-                };
-            } else if (exists) {
-                return {
-                    result: TopicValidatorResult.Ignore,
-                    obj: block
-                };
-            } else {
-                return {
-                    result: TopicValidatorResult.Accept,
-                    obj: block
-                };
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: attestation
+            };
+        }
+        // Check if this is a duplicate attestation (signer attested to a different proposal at the same slot)
+        // count is the number of attestations by this signer for this slot
+        if (count === 2) {
+            const attester = attestation.getSender();
+            if (attester) {
+                this.logger.warn(`Detected duplicate attestation (equivocation) at slot ${slot}`, {
+                    slot: slot.toString(),
+                    archive: attestation.archive.toString(),
+                    source: peerId.toString(),
+                    attester: attester.toString()
+                });
+                this.duplicateAttestationCallback?.({
+                    slot,
+                    attester
+                });
             }
+        }
+        // Attestation was added successfully - accept it so other nodes can also detect the equivocation
+        return {
+            result: TopicValidatorResult.Accept,
+            obj: attestation
         };
-        const { result, obj: block } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.block_proposal);
-        if (!result || !block) {
+    }
+    async processBlockFromPeer(payloadData, msgId, source) {
+        const { result, obj: block, metadata: { isEquivocated } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreBlockProposal(source, BlockProposal.fromBuffer(payloadData)), msgId, source, TopicType.block_proposal);
+        // If not accepted or equivocated, return
+        if (result !== TopicValidatorResult.Accept || !block || isEquivocated) {
             return;
         }
         await this.processValidBlockProposal(block, source);
     }
-    // REVIEW: callback pattern https://github.com/AztecProtocol/aztec-packages/issues/7963
+    /** Validates a block proposal. Triggers a penalization to the peer that sent it if invalid. Adds to the mempool if valid. */ async validateAndStoreBlockProposal(peerId, block) {
+        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
+            };
+        }
+        if (validationResult.result === 'ignore') {
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: block
+            };
+        }
+        // Try to add the proposal: this handles existence check, cap check, and adding in one call
+        const { added, alreadyExists, count } = await this.mempools.attestationPool.tryAddBlockProposal(block);
+        const isEquivocated = count !== undefined && count > 1;
+        // Duplicate proposal received, no need to re-broadcast
+        if (alreadyExists) {
+            this.logger.debug(`Ignoring duplicate block proposal received`, {
+                ...block.toBlockInfo(),
+                indexWithinCheckpoint: block.indexWithinCheckpoint,
+                proposer: block.getSender()?.toString(),
+                source: peerId.toString()
+            });
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: block,
+                metadata: {
+                    isEquivocated
+                }
+            };
+        }
+        // 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,
+                count,
+                proposer: block.getSender()?.toString(),
+                source: peerId.toString()
+            });
+            return {
+                result: TopicValidatorResult.Reject,
+                metadata: {
+                    isEquivocated
+                }
+            };
+        }
+        // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
+        // and do re-broadcast it so other nodes in the network know to slash the proposer
+        if (isEquivocated) {
+            const proposer = block.getSender();
+            this.logger.warn(`Detected duplicate block proposal (equivocation) at slot ${block.slotNumber}`, {
+                ...block.toBlockInfo(),
+                source: peerId.toString(),
+                proposer: proposer?.toString()
+            });
+            // Invoke the duplicate callback on the first duplicate spotted only
+            if (proposer && count === 2) {
+                this.duplicateProposalCallback?.({
+                    slot: block.slotNumber,
+                    proposer,
+                    type: 'block'
+                });
+            }
+            return {
+                result: TopicValidatorResult.Accept,
+                obj: block,
+                metadata: {
+                    isEquivocated
+                }
+            };
+        }
+        // Otherwise, we're good to go!
+        return {
+            result: TopicValidatorResult.Accept,
+            obj: block
+        };
+    }
+    // REFACTOR(palla): This method should be moved to the p2p_client or to a separate component,
+    // should not be here as it does not deal with p2p networking.
     async processValidBlockProposal(block, sender) {
-        const slot = block.slotNumber.toBigInt();
-        const previousSlot = slot - 1n;
+        const slot = block.slotNumber;
         this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
-            p2pMessageIdentifier: await block.p2pMessageIdentifier(),
-            slot: block.slotNumber.toNumber(),
-            archive: block.archive.toString(),
-            source: sender.toString()
+            p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
+            source: sender.toString(),
+            ...block.toBlockInfo()
         });
-        const attestationsForPreviousSlot = await this.mempools.attestationPool?.getAttestationsForSlot(previousSlot);
-        if (attestationsForPreviousSlot !== undefined) {
-            this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
-        }
-        // Mark the txs in this proposal as non-evictable
-        await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
-        await this.mempools.attestationPool?.addBlockProposal(block);
-        const attestations = await this.blockReceivedCallback(block, sender);
-        // TODO: fix up this pattern - the abstraction is not nice
-        // The attestation can be undefined if no handler is registered / the validator deems the block invalid
-        if (attestations?.length) {
-            for (const attestation of attestations){
-                this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber.toNumber()}`, {
-                    p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-                    slot: attestation.slotNumber.toNumber(),
-                    archive: attestation.archive.toString()
+        // Mark the txs in this proposal as protected
+        await this.mempools.txPool.protectTxs(block.txHashes, block.blockHeader);
+        // Call the block received callback to validate the proposal.
+        // Note: Validators do NOT attest to individual blocks, only to checkpoint proposals.
+        const isValid = await this.blockReceivedCallback(block, sender);
+        if (!isValid) {
+            this.logger.info(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
+        }
+    }
+    /**
+   * Handle a gossiped checkpoint proposal.
+   * Validates and processes the checkpoint proposal, then triggers the callback for attestation.
+   */ async handleGossipedCheckpointProposal(payloadData, msgId, source) {
+        const { result, obj: checkpoint, metadata: { isEquivocated, processBlock } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointProposal(source, CheckpointProposal.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_proposal);
+        // If the checkpoint contained a valid last block, we process it even if the checkpoint itself is to be rejected
+        // TODO(palla/mbps): Is this ok? Should we be considering a block from a checkpoint that was equivocated?
+        if (processBlock && checkpoint?.getBlockProposal()) {
+            await this.processValidBlockProposal(checkpoint.getBlockProposal(), source);
+        }
+        if (result !== TopicValidatorResult.Accept || !checkpoint || isEquivocated) {
+            return;
+        }
+        await this.processValidCheckpointProposal(checkpoint.toCore(), source);
+    }
+    /**
+   * Validates a checkpoint proposal. Penalizes peer if validation fails. Adds the checkpoint and
+   * its last block (if present) to the mempool if valid. Triggers equivocation detection on both.
+   */ async validateAndStoreCheckpointProposal(peerId, checkpoint) {
+        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
+            };
+        }
+        if (validationResult.result === 'ignore') {
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: checkpoint
+            };
+        }
+        // Extract and try to add the block proposal first if present
+        const blockProposal = checkpoint.getBlockProposal();
+        let processBlock = false;
+        if (blockProposal) {
+            this.logger.debug(`Validating block proposal from propagated checkpoint`, {
+                [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) {
+                this.logger.debug(`Rejecting checkpoint due to invalid last block proposal`, {
+                    [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+                    [Attributes.P2P_ID]: peerId.toString(),
+                    isEquivocated,
+                    result
+                });
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            } else if (result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+                processBlock = true;
+            }
+        }
+        // Try to add the checkpoint proposal core: this handles existence check, cap check, and adding in one call
+        const checkpointCore = checkpoint.toCore();
+        const tryAddResult = await this.mempools.attestationPool.tryAddCheckpointProposal(checkpointCore);
+        const { added, alreadyExists, count } = tryAddResult;
+        const isEquivocated = count !== undefined && count > 1;
+        // Duplicate proposal received, do not re-broadcast
+        if (alreadyExists) {
+            this.logger.debug(`Ignoring duplicate checkpoint proposal received`, {
+                ...checkpoint.toCheckpointInfo(),
+                source: peerId.toString()
+            });
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: checkpoint,
+                metadata: {
+                    isEquivocated,
+                    processBlock
+                }
+            };
+        }
+        // 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,
+                source: peerId.toString()
+            });
+            return {
+                result: TopicValidatorResult.Reject,
+                obj: checkpoint,
+                metadata: {
+                    isEquivocated,
+                    processBlock
+                }
+            };
+        }
+        // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
+        // and do re-broadcast it so other nodes in the network know to slash the proposer
+        if (isEquivocated) {
+            const proposer = checkpoint.getSender();
+            this.logger.warn(`Detected duplicate checkpoint proposal (equivocation) at slot ${checkpoint.slotNumber}`, {
+                ...checkpoint.toCheckpointInfo(),
+                source: peerId.toString(),
+                proposer: proposer?.toString()
+            });
+            // Invoke the duplicate callback on the first duplicate spotted only
+            if (proposer && count === 2) {
+                this.duplicateProposalCallback?.({
+                    slot: checkpoint.slotNumber,
+                    proposer,
+                    type: 'checkpoint'
                 });
-                await this.broadcastAttestation(attestation);
             }
+            return {
+                result: TopicValidatorResult.Accept,
+                obj: checkpoint,
+                metadata: {
+                    isEquivocated,
+                    processBlock
+                }
+            };
         }
+        // Otherwise, we're good to go!
+        return {
+            result: TopicValidatorResult.Accept,
+            obj: checkpoint,
+            metadata: {
+                processBlock,
+                isEquivocated
+            }
+        };
     }
     /**
-   * Broadcast an attestation to all peers.
-   * @param attestation - The attestation to broadcast.
-   */ async broadcastAttestation(attestation) {
-        await this.propagate(attestation);
+   * Process a validated checkpoint proposal.
+   * Note: The proposal was already added to the pool by tryAddCheckpointProposal in handleGossipedCheckpointProposal.
+   */ async processValidCheckpointProposal(checkpoint, sender) {
+        const slot = checkpoint.slotNumber;
+        this.logger.verbose(`Received checkpoint proposal for slot ${slot} from external peer ${sender.toString()}.`, {
+            p2pMessageIdentifier: await checkpoint.p2pMessageLoggingIdentifier(),
+            slot: checkpoint.slotNumber,
+            archive: checkpoint.archive.toString(),
+            source: sender.toString()
+        });
+        // Call the checkpoint received callback with the core version (without lastBlock)
+        // to validate and potentially generate attestations
+        const attestations = await this.checkpointReceivedCallback(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);
+            for (const attestation of attestations){
+                await this.propagate(attestation);
+            }
+        }
     }
     /**
    * Propagates provided message to peers.
    * @param message - The message to propagate.
    */ async propagate(message) {
-        const p2pMessageIdentifier = await message.p2pMessageIdentifier();
+        const p2pMessageIdentifier = await message.p2pMessageLoggingIdentifier();
         this.logger.trace(`Message ${p2pMessageIdentifier} queued`, {
             p2pMessageIdentifier
         });
-        void this.jobQueue.put(async ()=>{
-            await this.sendToPeers(message);
-        }).catch((error)=>{
+        void this.sendToPeers(message).catch((error)=>{
             this.logger.error(`Error propagating message ${p2pMessageIdentifier}`, {
                 error
             });
         });
     }
     /**
-   * Validate the requested block transactions.
+   * Validate the requested block transactions. Allow partial returns.
    * @param request - The block transactions request.
    * @param response - The block transactions response.
    * @param peerId - The ID of the peer that made the request.
    * @returns True if the requested block transactions are valid, false otherwise.
-   */ async validateRequestedBlockTxs(_request, response, peerId) {
+   */ async validateRequestedBlockTxs(request, response, peerId) {
         const requestedTxValidator = this.createRequestedTxValidator();
         try {
-            // TODO(palla/txs): Validate that this tx belongs to the block hash being requested
+            if (!response.archiveRoot.equals(request.archiveRoot)) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received block txs for unexpected archive root: expected ${request.archiveRoot.toString()}, got ${response.archiveRoot.toString()}`);
+            }
+            if (response.txIndices.getLength() !== request.txIndices.getLength()) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received block txs with mismatched bitvector length: expected ${request.txIndices.getLength()}, got ${response.txIndices.getLength()}`);
+            }
+            // Check no duplicates and not exceeding returnable count
+            const requestedIndices = new Set(request.txIndices.getTrueIndices());
+            const availableIndices = new Set(response.txIndices.getTrueIndices());
+            const maxReturnable = [
+                ...requestedIndices
+            ].filter((i)=>availableIndices.has(i)).length;
+            const returnedHashes = await Promise.all(response.txs.map((tx)=>tx.getTxHash().toString()));
+            const uniqueReturned = new Set(returnedHashes.map((h)=>h.toString()));
+            if (uniqueReturned.size !== returnedHashes.length) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received duplicate txs in block txs response`);
+            }
+            if (response.txs.length > maxReturnable) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received more txs (${response.txs.length}) than requested-and-available (${maxReturnable})`);
+            }
+            // Given proposal (should have locally), ensure returned txs are valid subset and match request indices
+            const proposal = await this.mempools.attestationPool.getBlockProposal(request.archiveRoot.toString());
+            if (proposal) {
+                // Build intersected indices
+                const intersectIdx = request.txIndices.getTrueIndices().filter((i)=>response.txIndices.isSet(i));
+                // Enforce subset membership and preserve increasing order by index.
+                const hashToIndexInProposal = new Map(proposal.txHashes.map((h, i)=>[
+                        h.toString(),
+                        i
+                    ]));
+                const allowedIndexSet = new Set(intersectIdx);
+                const indices = returnedHashes.map((h)=>hashToIndexInProposal.get(h));
+                const allAllowed = indices.every((idx)=>idx !== undefined && allowedIndexSet.has(idx));
+                const strictlyIncreasing = indices.every((idx, i)=>i === 0 ? idx !== undefined : idx > indices[i - 1]);
+                if (!allAllowed || !strictlyIncreasing) {
+                    this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+                    throw new ValidationError('Returned txs do not match expected subset/order for requested indices');
+                }
+            } else {
+                // No local proposal, cannot check the membership/order of the returned txs
+                this.logger.warn(`Block proposal not found for archive root ${request.archiveRoot.toString()}; cannot validate membership/order of returned txs`);
+                return false;
+            }
             await Promise.all(response.txs.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator)));
             return true;
         } catch (e) {
@@ -715,13 +1587,13 @@ import { P2PInstrumentation } from './instrumentation.js';
    * ReqRespSubProtocol.TX subprotocol validation.
    *
    * @param requestedTxHash - The collection of the txs that was requested.
-   * @param responseTx - The collectin of txs that was received as a response to the request.
+   * @param responseTx - The collection of txs that was received as a response to the request.
    * @param peerId - The peer ID of the peer that sent the tx.
    * @returns True if the whole collection of txs is valid, false otherwise.
    */ async validateRequestedTxs(requestedTxHash, responseTx, peerId) {
         const requested = new Set(requestedTxHash.map((h)=>h.toString()));
         const requestedTxValidator = this.createRequestedTxValidator();
-        //TODO: (mralj) - this is somewhat naive implementation, if single tx is invlid we consider the whole response invalid.
+        //TODO: (mralj) - this is somewhat naive implementation, if single tx is invalid we consider the whole response invalid.
         // I think we should still extract the valid txs and return them, so that we can still use the response.
         try {
             await Promise.all(responseTx.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator, requested)));
@@ -735,50 +1607,62 @@ import { P2PInstrumentation } from './instrumentation.js';
             return false;
         }
     }
-    createRequestedTxValidator() {
-        return new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator({
-            l1ChainId: new Fr(this.config.l1ChainId),
-            rollupVersion: new Fr(this.config.rollupVersion),
-            protocolContractsHash,
-            vkTreeRoot: getVKTreeRoot()
-        }), new TxProofValidator(this.proofVerifier));
+    /**
+   * 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) {
-        if (!await tx.validateTxHash()) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-            throw new ValidationError(`Received tx with invalid hash ${tx.getTxHash().toString()}.`);
-        }
+        const penalize = (severity)=>this.peerManager.penalizePeer(peerId, severity);
         if (requested && !requested.has(tx.getTxHash().toString())) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+            penalize(PeerErrorSeverity.MidToleranceError);
             throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
         }
         const { result } = await txValidator.validateTx(tx);
         if (result === 'invalid') {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+            penalize(PeerErrorSeverity.LowToleranceError);
             throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
         }
     }
-    async validatePropagatedTx(tx, peerId) {
-        const currentBlockNumber = await this.archiver.getBlockNumber();
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
-        const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
-        for (const validator of messageValidators){
-            const outcome = await this.runValidations(tx, validator);
-            if (outcome.allPassed) {
-                continue;
-            }
-            const { name } = outcome.failure;
-            let { severity } = outcome.failure;
-            // Double spend validator has a special case handler
-            if (name === 'doubleSpendValidator') {
-                const txBlockNumber = currentBlockNumber + 1; // tx is expected to be in the next block
-                severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
-            }
-            this.peerManager.penalizePeer(peerId, severity);
-            return false;
-        }
-        return true;
+    createRequestedTxValidator() {
+        return createTxValidatorForReqResponseReceivedTxs(this.proofVerifier, {
+            l1ChainId: this.config.l1ChainId,
+            rollupVersion: this.config.rollupVersion
+        });
     }
     async getGasFees(blockNumber) {
         if (blockNumber === this.feesCache?.blockNumber) {
@@ -792,38 +1676,49 @@ import { P2PInstrumentation } from './instrumentation.js';
         };
         return gasFees;
     }
-    async validate(txs) {
-        const currentBlockNumber = await this.archiver.getBlockNumber();
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
-        const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
-        await Promise.all(txs.map(async (tx)=>{
-            for (const validator of messageValidators){
-                const outcome = await this.runValidations(tx, validator);
-                if (!outcome.allPassed) {
-                    throw new Error('Invalid tx detected', {
-                        cause: {
-                            outcome
-                        }
-                    });
-                }
-            }
+    /**
+   * Get the BatchTxRequesterLibP2PService dependencies for creating BatchTxRequester instances
+   */ getBatchTxRequesterService() {
+        return {
+            reqResp: this.reqresp,
+            connectionSampler: this.reqresp.getConnectionSampler(),
+            txValidatorConfig: {
+                l1ChainId: this.config.l1ChainId,
+                rollupVersion: this.config.rollupVersion,
+                proofVerifier: this.proofVerifier
+            },
+            peerScoring: this.peerManager
+        };
+    }
+    async validateTxsReceivedInBlockProposal(txs) {
+        const validator = createTxValidatorForBlockProposalReceivedTxs(this.proofVerifier, {
+            l1ChainId: this.config.l1ChainId,
+            rollupVersion: this.config.rollupVersion
+        }, this.logger.getBindings());
+        const results = await Promise.all(txs.map(async (tx)=>{
+            const result = await validator.validateTx(tx);
+            return result.result !== 'invalid';
         }));
+        if (results.some((value)=>value === false)) {
+            throw new Error('Invalid tx detected');
+        }
     }
-    /**
-   * Create message validators for the given block number and timestamp.
-   *
-   * Each validator is a pair of a validator and a severity.
-   * If a validator fails, the peer is penalized with the severity of the validator.
-   *
-   * @param currentBlockNumber - The current synced block number.
-   * @param nextSlotTimestamp - The timestamp of the next slot (used to validate txs are not expired).
-   * @returns The message validators.
-   */ async createMessageValidators(currentBlockNumber, nextSlotTimestamp) {
+    /** 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 blockNumberInWhichTheTxIsConsideredToBeIncluded = currentBlockNumber + 1;
-        return createTxMessageValidators(nextSlotTimestamp, blockNumberInWhichTheTxIsConsideredToBeIncluded, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, this.proofVerifier, !this.config.disableTransactions, allowedInSetup);
+        const allowedInSetup = [
+            ...await getDefaultAllowedSetupFunctions(),
+            ...this.config.txPublicSetupAllowListExtend ?? []
+        ];
+        const blockNumber = BlockNumber(currentBlockNumber + 1);
+        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());
     }
     /**
    * Run validations on a tx.
@@ -841,8 +1736,10 @@ import { P2PInstrumentation } from './instrumentation.js';
         });
         // 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: {
@@ -878,44 +1775,17 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
         const snapshotValidator = new DoubleSpendTxValidator({
             nullifiersExist: async (nullifiers)=>{
-                const merkleTree = this.worldStateSynchronizer.getSnapshot(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow);
+                const merkleTree = this.worldStateSynchronizer.getSnapshot(BlockNumber(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow));
                 const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
                 return indices.map((index)=>index !== undefined);
             }
-        });
+        }, this.logger.getBindings());
         const validSnapshot = await snapshotValidator.validateTx(tx);
         if (validSnapshot.result !== 'valid') {
             return PeerErrorSeverity.LowToleranceError;
         }
         return PeerErrorSeverity.HighToleranceError;
     }
-    /**
-   * Validate an attestation.
-   *
-   * @param attestation - The attestation to validate.
-   * @returns True if the attestation is valid, false otherwise.
-   */ async validateAttestation(peerId, attestation) {
-        const severity = await this.attestationValidator.validate(attestation);
-        if (severity) {
-            this.peerManager.penalizePeer(peerId, severity);
-            return false;
-        }
-        return true;
-    }
-    /**
-   * Validate a block proposal.
-   *
-   * @param block - The block proposal to validate.
-   * @returns True if the block proposal is valid, false otherwise.
-   */ async validateBlockProposal(peerId, block) {
-        const severity = await this.blockProposalValidator.validate(block);
-        if (severity) {
-            this.logger.debug(`Penalizing peer ${peerId} for block proposal validation failure`);
-            this.peerManager.penalizePeer(peerId, severity);
-            return false;
-        }
-        return true;
-    }
     getPeerScore(peerId) {
         return this.node.services.pubsub.score.score(peerId.toString());
     }
@@ -924,7 +1794,7 @@ import { P2PInstrumentation } from './instrumentation.js';
     }
     async sendToPeers(message) {
         const parent = message.constructor;
-        const identifier = await message.p2pMessageIdentifier().then((i)=>i.toString());
+        const identifier = await message.p2pMessageLoggingIdentifier().then((i)=>i.toString());
         this.logger.trace(`Sending message ${identifier}`, {
             p2pMessageIdentifier: identifier
         });
@@ -951,44 +1821,3 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
     }
 }
-_ts_decorate([
-    trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
-            [Attributes.SLOT_NUMBER]: block.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
-            [Attributes.P2P_ID]: await block.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "processValidBlockProposal", null);
-_ts_decorate([
-    trackSpan('Libp2pService.broadcastAttestation', async (attestation)=>({
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "broadcastAttestation", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
-            [Attributes.BLOCK_HASH]: request.blockHash.toString()
-        }))
-], LibP2PService.prototype, "validateRequestedBlockTxs", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
-            [Attributes.TX_HASH]: requestedTxHash.toString()
-        }))
-], LibP2PService.prototype, "validateRequestedTxs", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], LibP2PService.prototype, "validatePropagatedTx", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateAttestation', async (_, attestation)=>({
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "validateAttestation", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
-            [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString()
-        }))
-], LibP2PService.prototype, "validateBlockProposal", null);