@aztec/p2p 0.0.1-commit.c31f2472 → 0.0.1-commit.c52d6e7

package/dest/client/p2p_client.js

@@ -371,18 +371,16 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
 var _dec, _dec1, _initProto;
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
-import { L2BlockStream } from '@aztec/stdlib/block';
+import { EventDrivenL2BlockStream } from '@aztec/stdlib/block';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { getP2PDefaultConfig } from '../config.js';
-import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
-import { chunkTxHashesRequest } from '../services/reqresp/protocols/tx.js';
+import { TxPoolError } from '../errors/tx-pool.error.js';
 import { TxProvider } from '../services/tx_provider.js';
 import { P2PClientState } from './interface.js';
 _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
@@ -401,6 +399,8 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     l2BlockSource;
     p2pService;
     txCollection;
+    txFileStore;
+    epochCache;
     _dateProvider;
     telemetry;
     log;
@@ -433,15 +433,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     blockStream;
     txProvider;
     validatorAddresses;
-    /**
-   * In-memory P2P client constructor.
-   * @param store - The client's instance of the KV store.
-   * @param l2BlockSource - P2P client's source for fetching existing blocks.
-   * @param txPool - The client's instance of a transaction pool. Defaults to in-memory implementation.
-   * @param p2pService - The concrete instance of p2p networking to use.
-   * @param log - A logger.
-   */ constructor(_clientType, store, l2BlockSource, mempools, p2pService, txCollection, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p')){
-        super(telemetry, 'P2PClient'), this.store = store, this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.txCollection = txCollection, this._dateProvider = _dateProvider, this.telemetry = telemetry, this.log = log, this.currentState = (_initProto(this), P2PClientState.IDLE), this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1, this.finalizedBlockNumberAtStart = -1, this.validatorAddresses = [];
+    /** Tracks the last slot for which we called prepareForSlot */ lastSlotProcessed;
+    constructor(store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p'), initialBlockHash){
+        super(telemetry, 'P2PClient'), this.store = store, this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.txCollection = txCollection, this.txFileStore = txFileStore, this.epochCache = epochCache, this._dateProvider = _dateProvider, this.telemetry = telemetry, this.log = log, this.currentState = (_initProto(this), P2PClientState.IDLE), this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1, this.finalizedBlockNumberAtStart = -1, this.validatorAddresses = [], this.lastSlotProcessed = SlotNumber.ZERO;
         this.config = {
             ...getP2PDefaultConfig(),
             ...config
@@ -449,30 +443,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         this.txPool = mempools.txPool;
         this.attestationPool = mempools.attestationPool;
         this.txProvider = new TxProvider(this.txCollection, this.txPool, this, this.log.createChild('tx-provider'), this.telemetry);
-        // Default to collecting all txs when we see a valid proposal
-        // This can be overridden by the validator client to validate, and it will call getTxsForBlockProposal on its own
-        // Note: Validators do NOT attest to individual blocks - attestations are only for checkpoint proposals.
-        // TODO(palla/txs): We should not trigger a request for txs on a proposal before fully validating it. We need to bring
-        // validator-client code into here so we can validate a proposal is reasonable.
-        this.registerBlockProposalHandler(async (block, sender)=>{
-            this.log.debug(`Received block proposal from ${sender.toString()}`);
-            // TODO(palla/txs): Need to subtract validatorReexecuteDeadlineMs from this deadline (see ValidatorClient.getReexecutionDeadline)
-            const constants = this.txCollection.getConstants();
-            const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(block.slotNumber + 1), constants));
-            const deadline = new Date(nextSlotTimestampSeconds * 1000);
-            const parentBlock = await this.l2BlockSource.getBlockHeaderByArchive(block.blockHeader.lastArchive.root);
-            if (!parentBlock) {
-                this.log.debug(`Cannot collect txs for proposal as parent block not found`);
-                return false;
-            }
-            const blockNumber = BlockNumber(parentBlock.getBlockNumber() + 1);
-            await this.txProvider.getTxsForBlockProposal(block, blockNumber, {
-                pinnedPeer: sender,
-                deadline
-            });
-            return true;
-        });
-        this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
+        this.l2Tips = new L2TipsKVStore(store, 'p2p_client', initialBlockHash);
         this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
     }
     registerThisValidatorAddresses(addresses) {
@@ -493,13 +464,15 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     getPeers(includePending) {
         return Promise.resolve(this.p2pService.getPeers(includePending));
     }
+    getGossipMeshPeerCount(topicType) {
+        return Promise.resolve(this.p2pService.getGossipMeshPeerCount(topicType));
+    }
     getL2BlockHash(number) {
         return this.l2Tips.getL2BlockHash(number);
     }
-    updateP2PConfig(config) {
-        this.txPool.updateConfig(config);
+    async updateP2PConfig(config) {
+        await this.txPool.updateConfig(config);
         this.p2pService.updateConfig(config);
-        return Promise.resolve();
     }
     getL2Tips() {
         return this.l2Tips.getL2Tips();
@@ -516,7 +489,10 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                     const from = BlockNumber(oldFinalizedBlockNum + 1);
                     const limit = event.block.number - from + 1;
                     if (limit > 0) {
-                        const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+                        const oldBlocks = await this.l2BlockSource.getBlocksData({
+                            from,
+                            limit
+                        });
                         await this.handleFinalizedL2Blocks(oldBlocks);
                     }
                     break;
@@ -526,10 +502,12 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                 break;
             case 'chain-pruned':
                 this.txCollection.stopCollectingForBlocksAfter(event.block.number);
-                await this.handlePruneL2Blocks(event.block.number);
+                await this.handlePruneL2Blocks(event.block, event.checkpointed.checkpoint);
                 break;
             case 'chain-checkpointed':
                 break;
+            case 'chain-proposed':
+                break;
             default:
                 {
                     const _ = event;
@@ -541,7 +519,6 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         await this.startServiceIfSynched();
     }
     #assertIsReady() {
-        // this.log.info('Checking if p2p client is ready, current state: ', this.currentState);
         if (!this.isReady()) {
             throw new Error('P2P client not ready');
         }
@@ -556,6 +533,8 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         if (this.currentState !== P2PClientState.IDLE) {
             return this.syncPromise;
         }
+        // Start the tx pool first, as it needs to hydrate state from persistence
+        await this.txPool.start();
         // get the current latest block numbers
         const latestBlockNumbers = await this.l2BlockSource.getL2Tips();
         this.latestBlockNumberAtStart = latestBlockNumbers.proposed.number;
@@ -596,17 +575,21 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                 syncedFinalizedBlock
             });
         }
+        // Should never happen: all branches above call initBlockStream()
+        if (!this.blockStream) {
+            throw new Error('Block stream not initialized');
+        }
         this.blockStream.start();
-        await this.txCollection.start();
+        this.txFileStore?.start();
         return this.syncPromise;
     }
-    addReqRespSubProtocol(subProtocol, handler, validator) {
-        return this.p2pService.addReqRespSubProtocol(subProtocol, handler, validator);
+    addReqRespSubProtocol(subProtocol, handler) {
+        return this.p2pService.addReqRespSubProtocol(subProtocol, handler);
     }
     initBlockStream(startingBlock) {
         if (!this.blockStream) {
             const { blockRequestBatchSize: batchSize, blockCheckIntervalMS: pollIntervalMS } = this.config;
-            this.blockStream = new L2BlockStream(this.l2BlockSource, this, this, createLogger(`${this.log.module}:l2-block-stream`), {
+            this.blockStream = new EventDrivenL2BlockStream(this.l2BlockSource, this, this, createLogger(`${this.log.module}:l2-block-stream`), {
                 batchSize,
                 pollIntervalMS,
                 startingBlock
@@ -620,176 +603,171 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         this.log.debug('Stopping p2p client...');
         await tryStop(this.txCollection);
         this.log.debug('Stopped tx collection service');
+        await this.txFileStore?.stop();
+        this.log.debug('Stopped tx file store');
         await this.p2pService.stop();
         this.log.debug('Stopped p2p service');
         await this.blockStream?.stop();
         this.log.debug('Stopped block downloader');
+        await this.txPool.stop();
+        this.log.debug('Stopped tx pool');
         await this.runningPromise;
         this.setCurrentState(P2PClientState.STOPPED);
         this.log.info('P2P client stopped');
     }
     /** Triggers a sync to the archiver. Used for testing. */ async sync() {
         this.initBlockStream();
+        // Should never happen: initBlockStream() creates blockStream if absent
+        if (!this.blockStream) {
+            throw new Error('Block stream not initialized');
+        }
         await this.blockStream.sync();
     }
-    broadcastProposal(proposal) {
+    async broadcastProposal(proposal) {
         this.log.verbose(`Broadcasting proposal for slot ${proposal.slotNumber} to peers`);
+        // Store our own proposal so we can respond to req/resp requests for it
+        const { count } = await this.attestationPool.tryAddBlockProposal(proposal);
+        if (count > 1) {
+            if (this.config.broadcastEquivocatedProposals) {
+                this.log.warn(`Broadcasting equivocated block proposal for slot ${proposal.slotNumber}`, {
+                    slot: proposal.slotNumber,
+                    archive: proposal.archive.toString(),
+                    count
+                });
+            } else {
+                throw new Error(`Attempted to broadcast a duplicate block proposal for slot ${proposal.slotNumber}`);
+            }
+        }
         return this.p2pService.propagate(proposal);
     }
-    broadcastCheckpointProposal(proposal) {
+    async broadcastCheckpointProposal(proposal) {
         this.log.verbose(`Broadcasting checkpoint proposal for slot ${proposal.slotNumber} to peers`);
+        const blockProposal = proposal.getBlockProposal();
+        if (blockProposal) {
+            // Store our own last-block proposal so we can respond to req/resp requests for it.
+            await this.attestationPool.tryAddBlockProposal(blockProposal);
+        }
+        const checkpointCore = proposal.toCore();
+        const { count } = await this.attestationPool.tryAddCheckpointProposal(checkpointCore);
+        if (count > 1) {
+            if (this.config.broadcastEquivocatedProposals) {
+                this.log.warn(`Broadcasting equivocated checkpoint proposal for slot ${proposal.slotNumber}`, {
+                    slot: proposal.slotNumber,
+                    archive: proposal.archive.toString(),
+                    count
+                });
+            } else {
+                throw new Error(`Attempted to broadcast a duplicate checkpoint proposal for slot ${proposal.slotNumber}`);
+            }
+        }
         return this.p2pService.propagate(proposal);
     }
     async broadcastCheckpointAttestations(attestations) {
         this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
         await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
     }
-    async getCheckpointAttestationsForSlot(slot, proposalId) {
-        return await (proposalId ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
+    async getCheckpointAttestationsForSlot(slot, proposalPayloadHash) {
+        return await (proposalPayloadHash ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalPayloadHash) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
     }
-    addCheckpointAttestations(attestations) {
-        return this.attestationPool.addCheckpointAttestations(attestations);
+    addOwnCheckpointAttestations(attestations) {
+        return this.attestationPool.addOwnCheckpointAttestations(attestations);
+    }
+    getProposalsForSlot(slot) {
+        return this.attestationPool.getProposalsForSlot(slot);
+    }
+    hasBlockProposalsForSlot(slot) {
+        return this.attestationPool.hasBlockProposalsForSlot(slot);
+    }
+    hasCheckpointProposalForSlot(slot) {
+        return this.attestationPool.hasCheckpointProposalForSlot(slot);
     }
     // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
     // ^ This pattern is not my favorite (md)
     registerBlockProposalHandler(handler) {
         this.p2pService.registerBlockReceivedCallback(handler);
     }
-    registerCheckpointProposalHandler(handler) {
-        this.p2pService.registerCheckpointReceivedCallback(handler);
+    registerValidatorCheckpointProposalHandler(handler) {
+        this.p2pService.registerValidatorCheckpointReceivedCallback(handler);
     }
-    /**
-   * Uses the batched Request Response protocol to request a set of transactions from the network.
-   */ async requestTxsByHash(txHashes, pinnedPeerId) {
-        const timeoutMs = 8000; // Longer timeout for now
-        const maxRetryAttempts = 10; // Keep retrying within the timeout
-        const requests = chunkTxHashesRequest(txHashes);
-        const maxPeers = Math.min(Math.ceil(requests.length / 3), 10);
-        const txBatches = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, requests, pinnedPeerId, timeoutMs, maxPeers, maxRetryAttempts);
-        const txs = txBatches.flat();
-        if (txs.length > 0) {
-            await this.txPool.addTxs(txs);
-        }
-        const txHashesStr = txHashes.map((tx)=>tx.toString()).join(', ');
-        this.log.debug(`Requested txs ${txHashesStr} (${txs.length} / ${txHashes.length}) from peers`);
-        // We return all transactions, even the not found ones to the caller, such they can handle missing items themselves.
-        return txs;
+    registerAllNodesCheckpointProposalHandler(handler) {
+        this.p2pService.registerAllNodesCheckpointReceivedCallback(handler);
     }
-    getPendingTxs(limit, after) {
-        return this.getTxs('pending', limit, after);
+    registerDuplicateProposalCallback(callback) {
+        this.p2pService.registerDuplicateProposalCallback(callback);
     }
-    getPendingTxCount() {
-        return this.txPool.getPendingTxCount();
+    registerOversizedProposalCallback(callback) {
+        this.p2pService.registerOversizedProposalCallback(callback);
     }
-    async *iteratePendingTxs() {
-        for (const txHash of (await this.txPool.getPendingTxHashes())){
-            const tx = await this.txPool.getTxByHash(txHash);
-            if (tx) {
-                yield tx;
-            }
-        }
+    registerDuplicateAttestationCallback(callback) {
+        this.p2pService.registerDuplicateAttestationCallback(callback);
     }
-    /**
-   * Returns all transactions in the transaction pool.
-   * @param filter - The type of txs to return
-   * @param limit - How many txs to return
-   * @param after - If paginating, the last known tx hash. Will return txs after this hash
-   * @returns An array of Txs.
-   */ async getTxs(filter, limit, after) {
+    registerCheckpointAttestationCallback(callback) {
+        this.p2pService.registerCheckpointAttestationCallback(callback);
+    }
+    async getPendingTxs(limit, after, options) {
         if (limit !== undefined && limit <= 0) {
             throw new TypeError('limit must be greater than 0');
         }
-        let txs = undefined;
-        let txHashes;
-        if (filter === 'all') {
-            txs = await this.txPool.getAllTxs();
-            txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
-        } else if (filter === 'mined') {
-            const minedTxHashes = await this.txPool.getMinedTxHashes();
-            txHashes = minedTxHashes.map(([txHash])=>txHash);
-        } else if (filter === 'pending') {
-            txHashes = await this.txPool.getPendingTxHashes();
-        } else {
-            const _ = filter;
-            throw new Error(`Unknown filter ${filter}`);
-        }
+        let txHashes = await this.txPool.getPendingTxHashes();
         let startIndex = 0;
-        let endIndex = undefined;
         if (after) {
             startIndex = txHashes.findIndex((txHash)=>after.equals(txHash));
-            // if we can't find the last tx in our set then return an empty array as pagination is no longer valid.
             if (startIndex === -1) {
                 return [];
             }
-            // increment by one because we don't want to return the same tx again
             startIndex++;
         }
-        if (limit !== undefined) {
-            endIndex = startIndex + limit;
-        }
+        const endIndex = limit !== undefined ? startIndex + limit : undefined;
         txHashes = txHashes.slice(startIndex, endIndex);
-        if (txs) {
-            txs = txs.slice(startIndex, endIndex);
-        } else {
-            const maybeTxs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash)));
-            txs = maybeTxs.filter((tx)=>!!tx);
+        // This is a public-facing API (exposed via both the node and the p2p RPC), so proofs are opt-in.
+        const includeProof = !!options?.includeProof;
+        const maybeTxs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash, {
+                includeProof
+            })));
+        return maybeTxs.filter((tx)=>!!tx);
+    }
+    getPendingTxCount() {
+        return this.txPool.getPendingTxCount();
+    }
+    hasEligiblePendingTxs(minCount) {
+        return this.txPool.hasEligiblePendingTxs(minCount);
+    }
+    async *iteratePendingTxs(opts) {
+        for (const txHash of (await this.txPool.getPendingTxHashes())){
+            const tx = await this.txPool.getTxByHash(txHash, opts);
+            if (tx) {
+                yield tx;
+            }
+        }
+    }
+    async *iterateEligiblePendingTxs(opts) {
+        for (const txHash of (await this.txPool.getEligiblePendingTxHashes())){
+            const tx = await this.txPool.getTxByHash(txHash, opts);
+            if (tx) {
+                yield tx;
+            }
         }
-        return txs;
     }
     /**
    * Returns a transaction in the transaction pool by its hash.
    * @param txHash - Hash of the transaction to look for in the pool.
+   * @param opts - Set `includeProof: false` to skip loading the tx proof from the DB.
    * @returns A single tx or undefined.
-   */ getTxByHashFromPool(txHash) {
-        return this.txPool.getTxByHash(txHash);
+   */ getTxByHashFromPool(txHash, opts) {
+        return this.txPool.getTxByHash(txHash, opts);
     }
     /**
    * Returns transactions in the transaction pool by hash.
    * @param txHashes - Hashes of the transactions to look for.
+   * @param opts - Set `includeProof: false` to skip loading tx proofs from the DB.
    * @returns The txs found, in the same order as the requested hashes. If a tx is not found, it will be undefined.
-   */ getTxsByHashFromPool(txHashes) {
-        return this.txPool.getTxsByHash(txHashes);
+   */ getTxsByHashFromPool(txHashes, opts) {
+        return this.txPool.getTxsByHash(txHashes, opts);
     }
     hasTxsInPool(txHashes) {
         return this.txPool.hasTxs(txHashes);
     }
     /**
-   * Returns transactions in the transaction pool by hash.
-   * If a transaction is not in the pool, it will be requested from the network.
-   * @param txHashes - Hashes of the transactions to look for.
-   * @returns The txs found, or undefined if not found in the order requested.
-   */ async getTxsByHash(txHashes, pinnedPeerId) {
-        const txs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash)));
-        const missingTxHashes = txs.map((tx, index)=>[
-                tx,
-                index
-            ]).filter(([tx, _index])=>!tx).map(([_tx, index])=>txHashes[index]);
-        if (missingTxHashes.length === 0) {
-            return txs;
-        }
-        const missingTxs = await this.requestTxsByHash(missingTxHashes, pinnedPeerId);
-        // TODO: optimize
-        // Merge the found txs in order
-        const mergingTxs = txHashes.map((txHash)=>{
-            // Is it in the txs list from the mempool?
-            for (const tx of txs){
-                if (tx !== undefined && tx.getTxHash().equals(txHash)) {
-                    return tx;
-                }
-            }
-            // Is it in the fetched missing txs?
-            // Note: this is an O(n^2) operation, but we expect the number of missing txs to be small.
-            for (const tx of missingTxs){
-                if (tx.getTxHash().equals(txHash)) {
-                    return tx;
-                }
-            }
-            // Otherwise return undefined
-            return undefined;
-        });
-        return mergingTxs;
-    }
-    /**
    * Returns an archived transaction in the transaction pool by its hash.
    * @param txHash - Hash of the archived transaction to look for.
    * @returns A single tx or undefined.
@@ -797,31 +775,35 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         return this.txPool.getArchivedTxByHash(txHash);
     }
     /**
-   * Verifies the 'tx' and, if valid, adds it to local tx pool and forwards it to other peers.
-   * @param tx - The tx to verify.
+   * Accepts a transaction, adds it to local tx pool and forwards it to other peers.
+   * @param tx - The tx to send.
    * @returns Empty promise.
    **/ async sendTx(tx) {
-        const addedCount = await this.addTxsToPool([
+        this.#assertIsReady();
+        const result = await this.txPool.addPendingTxs([
             tx
-        ]);
-        const txAddedSuccessfully = addedCount === 1;
-        if (txAddedSuccessfully) {
+        ], {
+            feeComparisonOnly: true
+        });
+        if (result.accepted.length === 1) {
             await this.p2pService.propagate(tx);
+            return;
         }
-    }
-    /**
-   * Adds transactions to the pool. Does not send to peers or validate the txs.
-   * @param txs - The transactions.
-   **/ async addTxsToPool(txs) {
-        this.#assertIsReady();
-        return await this.txPool.addTxs(txs);
+        const txHashStr = tx.getTxHash().toString();
+        const reason = result.errors?.get(txHashStr);
+        if (reason) {
+            this.log.warn(`Tx ${txHashStr} not added to pool: ${reason.message}`);
+            throw new TxPoolError(reason);
+        }
+        this.log.warn(`Tx ${txHashStr} not propagated: accepted=${result.accepted.length} ignored=${result.ignored.length} rejected=${result.rejected.length}`);
     }
     /**
    * Returns whether the given tx hash is flagged as pending or mined.
    * @param txHash - Hash of the tx to query.
    * @returns Pending or mined depending on its status, or undefined if not found.
-   */ getTxStatus(txHash) {
-        return this.txPool.getTxStatus(txHash);
+   */ async getTxStatus(txHash) {
+        const status = await this.txPool.getTxStatus(txHash);
+        return status === 'protected' ? 'pending' : status;
     }
     getEnr() {
         return this.p2pService.getEnr();
@@ -830,13 +812,11 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         return Promise.resolve(this.p2pService.getEnr()?.encodeTxt());
     }
     /**
-   * Deletes the 'txs' from the pool.
-   * NOT used if we use sendTx as reconcileTxPool will handle this.
-   * @param txHashes - Hashes of the transactions to delete.
-   * @returns Empty promise.
-   **/ async deleteTxs(txHashes) {
+   * Handles failed transaction execution by removing txs from the pool.
+   * @param txHashes - Hashes of the transactions that failed execution.
+   **/ async handleFailedExecution(txHashes) {
         this.#assertIsReady();
-        await this.txPool.deleteTxs(txHashes);
+        await this.txPool.handleFailedExecution(txHashes);
     }
     /**
    * Public function to check if the p2p client is fully synced and ready to receive txs.
@@ -870,7 +850,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
    * @returns Information about p2p client status: state & syncedToBlockNum.
    */ async getStatus() {
         const blockNumber = await this.getSyncedLatestBlockNum();
-        const blockHash = blockNumber === 0 ? GENESIS_BLOCK_HEADER_HASH.toString() : await this.l2BlockSource.getBlockHeader(blockNumber).then((header)=>header?.hash()).then((hash)=>hash?.toString());
+        const blockHash = await this.l2BlockSource.getBlockData({
+            number: blockNumber
+        }).then((data)=>data?.header.hash()).then((hash)=>hash?.toString());
         return {
             state: this.currentState,
             syncedToL2Block: {
@@ -880,13 +862,12 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         };
     }
     /**
-   * Mark all txs from these blocks as mined.
+   * Handles mined blocks by marking the txs in them as mined.
    * @param blocks - A list of existing blocks with txs that the P2P client needs to ensure the tx pool is reconciled with.
    * @returns Empty promise.
-   */ async markTxsAsMinedFromBlocks(blocks) {
+   */ async handleMinedBlocks(blocks) {
         for (const block of blocks){
-            const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
-            await this.txPool.markAsMined(txHashes, block.header);
+            await this.txPool.handleMinedBlock(block);
         }
     }
     /**
@@ -895,16 +876,19 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
    * @returns Empty promise.
    */ async handleLatestL2Blocks(blocks) {
         if (!blocks.length) {
-            return Promise.resolve();
+            return;
         }
-        await this.markTxsAsMinedFromBlocks(blocks);
-        await this.txPool.clearNonEvictableTxs();
-        await this.startCollectingMissingTxs(blocks);
         const lastBlock = blocks.at(-1);
-        await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
-        this.log.verbose(`Synched to latest block ${lastBlock.number}`);
-    }
-    /** Request txs for unproven blocks so the prover node has more chances to get them. */ async startCollectingMissingTxs(blocks) {
+        const lastSlot = lastBlock.header.getSlot();
+        // Mark txs mined before releasing protections: a block landing at this slot supersedes any
+        // protection for txs it includes, so mined-marking must run first to keep just-landed txs from
+        // being unprotected into pending where they could be evicted before they are recorded as mined.
+        await this.handleMinedBlocks(blocks);
+        await this.maybeCallPrepareForSlot(lastSlot);
+        await this.collectingMissingTxs(blocks);
+        await this.synchedLatestSlot.set(BigInt(lastSlot));
+    }
+    /** Request txs for unproven blocks so the prover node can prove. */ async collectingMissingTxs(blocks) {
         try {
             // TODO(#15435): If the archiver has lagged behind L1, the reported proven block number may
             // be much lower than the actual one, and it does not update until the pending chain is
@@ -912,7 +896,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
             // are already proven, but the archiver has not yet updated its state. Until this is properly
             // fixed, it is mitigated by the expiration date of collection requests, which depends on
             // the slot number of the block.
-            const provenBlockNumber = await this.l2BlockSource.getProvenBlockNumber();
+            const provenBlockNumber = await this.l2BlockSource.getBlockNumber({
+                tag: 'proven'
+            }) ?? BlockNumber.ZERO;
             const unprovenBlocks = blocks.filter((block)=>block.number > provenBlockNumber);
             for (const block of unprovenBlocks){
                 const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
@@ -923,7 +909,19 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                         blockNumber: block.number,
                         blockHash: await block.hash().then((h)=>h.toString())
                     });
-                    this.txCollection.startCollecting(block, missingTxHashes);
+                    // Both `slashDataWithholdingToleranceSlots` and `p2pMissingTxCollectionDeadlineSlots`
+                    // count *full slots after the block slot* — value N means collection runs until
+                    // `slotStart(block.slot + N + 1)`. Take the larger of the two so collection never
+                    // gives up before the data-withholding slash verdict is rendered.
+                    const blockSlot = block.header.getSlot();
+                    const toleranceSlots = this.config.slashDataWithholdingToleranceSlots;
+                    const configuredSlots = this.config.p2pMissingTxCollectionDeadlineSlots ?? 0;
+                    const deadlineSlot = SlotNumber(blockSlot + Math.max(toleranceSlots, configuredSlots) + 1);
+                    const deadlineSeconds = getTimestampForSlot(deadlineSlot, this.epochCache.getL1Constants());
+                    const deadline = new Date(Number(deadlineSeconds) * 1000);
+                    await this.txCollection.collectFastForBlock(block, missingTxHashes, {
+                        deadline
+                    });
                 }
             }
         } catch (err) {
@@ -936,59 +934,54 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
    * @returns Empty promise.
    */ async handleFinalizedL2Blocks(blocks) {
         if (!blocks.length) {
-            return Promise.resolve();
+            return;
         }
-        this.log.debug(`Handling finalized blocks ${blocks.length} up to ${blocks.at(-1)?.number}`);
-        const lastBlockNum = blocks[blocks.length - 1].number;
-        const lastBlockSlot = blocks[blocks.length - 1].header.getSlot();
-        const txHashes = blocks.flatMap((block)=>block.body.txEffects.map((txEffect)=>txEffect.txHash));
-        this.log.debug(`Deleting ${txHashes.length} txs from pool from finalized blocks up to ${lastBlockNum}`);
-        await this.txPool.deleteTxs(txHashes, {
-            permanently: true
-        });
-        await this.txPool.cleanupDeletedMinedTxs(lastBlockNum);
-        await this.attestationPool.deleteCheckpointAttestationsOlderThan(lastBlockSlot);
-        this.log.debug(`Synched to finalized block ${lastBlockNum} at slot ${lastBlockSlot}`);
+        // Finalization is monotonic, so we only need to call with the last block
+        const lastBlock = blocks.at(-1);
+        await this.txPool.handleFinalizedBlock(lastBlock.header);
+        await this.attestationPool.deleteOlderThan(lastBlock.header.getSlot());
     }
     /**
    * Updates the tx pool after a chain prune.
-   * @param latestBlock - The block number the chain was pruned to.
-   */ async handlePruneL2Blocks(latestBlock) {
-        const txsToDelete = new Map();
-        const minedTxs = await this.txPool.getMinedTxHashes();
-        // Find transactions that reference pruned blocks in their historical header
-        for (const tx of (await this.txPool.getAllTxs())){
-            // every tx that's been generated against a block that has now been pruned is no longer valid
-            if (tx.data.constants.anchorBlockHeader.globalVariables.blockNumber > latestBlock) {
-                const txHash = tx.getTxHash();
-                txsToDelete.set(txHash.toString(), txHash);
-            }
-        }
-        this.log.info(`Detected chain prune. Removing ${txsToDelete.size} txs built against pruned blocks.`, {
-            newLatestBlock: latestBlock,
-            previousLatestBlock: await this.getSyncedLatestBlockNum(),
-            txsToDelete: Array.from(txsToDelete.keys())
+   * Detects epoch prunes (checkpoint number changed) and deletes all txs in that case.
+   * @param latestBlock - The block ID the chain was pruned to.
+   * @param newCheckpoint - The checkpoint ID after the prune.
+   */ async handlePruneL2Blocks(latestBlock, newCheckpoint) {
+        const deleteAllTxs = this.config.txPoolDeleteTxsAfterReorg && await this.isEpochPrune(newCheckpoint);
+        await this.txPool.handlePrunedBlocks(latestBlock, {
+            deleteAllTxs
         });
-        // delete invalid txs (both pending and mined)
-        await this.txPool.deleteTxs(Array.from(txsToDelete.values()));
-        // everything left in the mined set was built against a block on the proven chain so its still valid
-        // move back to pending the txs that were reorged out of the chain, unless txPoolDeleteTxsAfterReorg is set,
-        // in which case we clean them up to avoid potential reorg loops
-        // NOTE: we can't move _all_ txs back to pending because the tx pool could keep hold of mined txs for longer
-        // (see this.keepProvenTxsFor)
-        const minedTxsFromReorg = [];
-        for (const [txHash, blockNumber] of minedTxs){
-            // We keep the txsToDelete out of this list as they have already been deleted above
-            if (blockNumber > latestBlock && !txsToDelete.has(txHash.toString())) {
-                minedTxsFromReorg.push(txHash);
-            }
+    }
+    /**
+   * Returns true if the prune is an epoch prune (new checkpoint number is less than old).
+   * If the checkpoint number stays the same or increases, the prune is within a checkpoint.
+   */ async isEpochPrune(newCheckpoint) {
+        const tips = await this.l2Tips.getL2Tips();
+        const oldCheckpointNumber = tips.checkpointed.checkpoint.number;
+        if (oldCheckpointNumber <= CheckpointNumber.INITIAL) {
+            return false;
         }
-        if (this.config.txPoolDeleteTxsAfterReorg) {
-            this.log.info(`Deleting ${minedTxsFromReorg.length} mined txs from reorg`);
-            await this.txPool.deleteTxs(minedTxsFromReorg);
-        } else {
-            await this.txPool.markMinedAsPending(minedTxsFromReorg, latestBlock);
+        const newCheckpointNumber = newCheckpoint.number;
+        // We check that the new checkpoint number is less than the old checkpoint number in order to consider it an epoch prune.
+        // To be more certain that it is an epoch prune, we will check that at least 2 checkpoints were removed.
+        // This means we should avoid thinking checkpoints removed by L1 re-orgs are epoch prunes
+        const thresholdForEpochPrune = CheckpointNumber(oldCheckpointNumber - 2);
+        const isEpochPrune = newCheckpointNumber <= thresholdForEpochPrune;
+        if (isEpochPrune) {
+            this.log.info(`Detected epoch prune to ${newCheckpointNumber}`, {
+                oldCheckpointNumber,
+                newCheckpointNumber,
+                thresholdForEpochPrune
+            });
         }
+        return isEpochPrune;
+    }
+    /** Calls prepareForSlot for the given slot if it advances past the last slot we prepared for. */ async maybeCallPrepareForSlot(slot) {
+        if (slot <= this.lastSlotProcessed) {
+            return;
+        }
+        this.lastSlotProcessed = slot;
+        await this.txPool.prepareForSlot(slot);
     }
     async startServiceIfSynched() {
         if (this.currentState !== P2PClientState.SYNCHING) {
@@ -1019,14 +1012,24 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         this.currentState = newState;
         this.log.debug(`Moved from state ${P2PClientState[oldState]} to ${P2PClientState[this.currentState]}`);
     }
-    validate(txs) {
-        return this.p2pService.validate(txs);
+    validateTxsReceivedInBlockProposal(txs) {
+        return this.p2pService.validateTxsReceivedInBlockProposal(txs);
+    }
+    /**
+   * Protects existing transactions by hash for a given slot.
+   * Returns hashes of transactions that weren't found in the pool.
+   * @param txHashes - Hashes of the transactions to protect.
+   * @param blockHeader - The block header providing slot context.
+   * @returns Hashes of transactions not found in the pool.
+   */ protectTxs(txHashes, blockHeader) {
+        return this.txPool.protectTxs(txHashes, blockHeader);
     }
     /**
-   * Marks transactions as non-evictable in the pool.
-   * @param txHashes - Hashes of the transactions to mark as non-evictable.
-   */ markTxsAsNonEvictable(txHashes) {
-        return this.txPool.markTxsAsNonEvictable(txHashes);
+   * Prepares the pool for a new slot.
+   * Unprotects transactions from earlier slots and validates them.
+   * @param slotNumber - The slot number to prepare for
+   */ async prepareForSlot(slotNumber) {
+        await this.txPool.prepareForSlot(slotNumber);
     }
     handleAuthRequestFromPeer(authRequest, peerId) {
         return this.p2pService.handleAuthRequestFromPeer(authRequest, peerId);