@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.001888fc

package/src/client/p2p_client.ts

@@ -1,173 +1,58 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
-import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
-import type { L2Block, L2BlockId, L2BlockSource, L2BlockStreamEvent, L2Tips } from '@aztec/stdlib/block';
-import type { P2PApi, PeerInfo, ProverCoordination } from '@aztec/stdlib/interfaces/server';
-import type { BlockAttestation, BlockProposal, P2PClientType } from '@aztec/stdlib/p2p';
-import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import { RunningPromise } from '@aztec/foundation/promise';
+import { DateProvider } from '@aztec/foundation/timer';
+import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
+import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import {
-  Attributes,
-  type TelemetryClient,
-  TraceableL2BlockStream,
-  WithTracer,
-  getTelemetryClient,
-  trackSpan,
-} from '@aztec/telemetry-client';
-
-import type { ENR } from '@chainsafe/enr';
+  type CheckpointId,
+  type EthAddress,
+  type L2Block,
+  type L2BlockId,
+  type L2BlockSource,
+  L2BlockStream,
+  type L2BlockStreamEvent,
+  type L2Tips,
+  type L2TipsStore,
+} from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { type PeerInfo, tryStop } from '@aztec/stdlib/interfaces/server';
+import { type BlockProposal, CheckpointAttestation, type CheckpointProposal, type TopicType } from '@aztec/stdlib/p2p';
+import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
+import { Attributes, type TelemetryClient, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+
+import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
 
 import { type P2PConfig, getP2PDefaultConfig } from '../config.js';
-import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
+import { TxPoolError } from '../errors/tx-pool.error.js';
+import type { AttestationPoolApi } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
-import type { TxPool } from '../mem_pools/tx_pool/index.js';
-import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
-import type { P2PService } from '../services/service.js';
-
-/**
- * Enum defining the possible states of the p2p client.
- */
-export enum P2PClientState {
-  IDLE,
-  SYNCHING,
-  RUNNING,
-  STOPPED,
-}
-
-/**
- * The synchronization status of the P2P client.
- */
-export interface P2PSyncState {
-  /**
-   * The current state of the p2p client.
-   */
-  state: P2PClientState;
-  /**
-   * The block number that the p2p client is synced to.
-   */
-  syncedToL2Block: L2BlockId;
-}
-
-/**
- * Interface of a P2P client.
- **/
-export type P2P<T extends P2PClientType = P2PClientType.Full> = ProverCoordination &
-  P2PApi<T> & {
-    /**
-     * Broadcasts a block proposal to other peers.
-     *
-     * @param proposal - the block proposal
-     */
-    broadcastProposal(proposal: BlockProposal): void;
-
-    /**
-     * Registers a callback from the validator client that determines how to behave when
-     * foreign block proposals are received
-     *
-     * @param handler - A function taking a received block proposal and producing an attestation
-     */
-    // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
-    // ^ This pattern is not my favorite (md)
-    registerBlockProposalHandler(handler: (block: BlockProposal) => Promise<BlockAttestation | undefined>): void;
-
-    /**
-     * Request a list of transactions from another peer by their tx hashes.
-     * @param txHashes - Hashes of the txs to query.
-     * @returns A list of transactions or undefined if the transactions are not found.
-     */
-    requestTxs(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
-
-    /**
-     * Request a transaction from another peer by its tx hash.
-     * @param txHash - Hash of the tx to query.
-     */
-    requestTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Verifies the 'tx' and, if valid, adds it to local tx pool and forwards it to other peers.
-     * @param tx - The transaction.
-     **/
-    sendTx(tx: Tx): Promise<void>;
-
-    /**
-     * Deletes 'txs' from the pool, given hashes.
-     * NOT used if we use sendTx as reconcileTxPool will handle this.
-     * @param txHashes - Hashes to check.
-     **/
-    deleteTxs(txHashes: TxHash[]): Promise<void>;
-
-    /**
-     * Returns a transaction in the transaction pool by its hash.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getTxByHashFromPool(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Returns a transaction in the transaction pool by its hash, requesting it from the network if it is not found.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * Returns an archived transaction from the transaction pool by its hash.
-     * @param txHash  - Hash of tx to return.
-     * @returns A single tx or undefined.
-     */
-    getArchivedTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-    /**
-     * 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: TxHash): Promise<'pending' | 'mined' | undefined>;
-
-    /** Returns an iterator over pending txs on the mempool. */
-    iteratePendingTxs(): AsyncIterableIterator<Tx>;
-
-    /** Returns the number of pending txs in the mempool. */
-    getPendingTxCount(): Promise<number>;
-
-    /**
-     * Starts the p2p client.
-     * @returns A promise signalling the completion of the block sync.
-     */
-    start(): Promise<void>;
-
-    /**
-     * Stops the p2p client.
-     * @returns A promise signalling the completion of the stop process.
-     */
-    stop(): Promise<void>;
-
-    /**
-     * Indicates if the p2p client is ready for transaction submission.
-     * @returns A boolean flag indicating readiness.
-     */
-    isReady(): boolean;
-
-    /**
-     * Returns the current status of the p2p client.
-     */
-    getStatus(): Promise<P2PSyncState>;
-
-    /**
-     * Returns the ENR of this node, if any.
-     */
-    getEnr(): ENR | undefined;
-
-    /** Identifies a p2p client. */
-    isP2PClient(): true;
-  };
+import type { TxPoolV2 } from '../mem_pools/tx_pool_v2/interfaces.js';
+import type { AuthRequest, StatusMessage } from '../services/index.js';
+import {
+  ReqRespSubProtocol,
+  type ReqRespSubProtocolHandler,
+  type ReqRespSubProtocolValidators,
+} from '../services/reqresp/interface.js';
+import type {
+  DuplicateAttestationInfo,
+  DuplicateProposalInfo,
+  P2PBlockReceivedCallback,
+  P2PCheckpointReceivedCallback,
+  P2PService,
+} from '../services/service.js';
+import { TxCollection } from '../services/tx_collection/tx_collection.js';
+import type { TxFileStore } from '../services/tx_file_store/tx_file_store.js';
+import { TxProvider } from '../services/tx_provider.js';
+import { type P2P, P2PClientState, type P2PSyncState } from './interface.js';
 
 /**
  * The P2P client implementation.
  */
-export class P2PClient<T extends P2PClientType = P2PClientType.Full>
-  extends WithTracer
-  implements P2P, P2P<P2PClientType.Prover>
-{
+export class P2PClient extends WithTracer implements P2P {
   /** The JS promise that will be running to keep the client's data in sync. Can be interrupted if the client is stopped. */
   private runningPromise!: Promise<void>;
 
@@ -176,132 +61,135 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   private syncResolve?: () => void = undefined;
   private latestBlockNumberAtStart = -1;
   private provenBlockNumberAtStart = -1;
+  private finalizedBlockNumberAtStart = -1;
 
-  private synchedBlockHashes: AztecAsyncMap<number, string>;
-  private synchedLatestBlockNumber: AztecAsyncSingleton<number>;
-  private synchedProvenBlockNumber: AztecAsyncSingleton<number>;
+  private l2Tips: L2TipsStore;
+  private synchedLatestSlot: AztecAsyncSingleton<bigint>;
 
-  private txPool: TxPool;
-  private attestationPool: T extends P2PClientType.Full ? AttestationPool : undefined;
+  private txPool: TxPoolV2;
+  private attestationPool: AttestationPoolApi;
 
-  /** How many slots to keep attestations for. */
-  private keepAttestationsInPoolFor: number;
-  /** How many slots to keep proven txs for. */
-  private keepProvenTxsFor: number;
+  private config: P2PConfig;
 
-  private blockStream;
+  private blockStream: L2BlockStream | undefined;
+
+  private txProvider: TxProvider;
+
+  private validatorAddresses: EthAddress[] = [];
+
+  /** Tracks the last slot for which we called prepareForSlot */
+  private lastSlotProcessed: SlotNumber = SlotNumber.ZERO;
+
+  /** Polls for slot changes and calls prepareForSlot on the tx pool */
+  private slotMonitor: RunningPromise | undefined;
 
-  /**
-   * 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 keepProvenTxsFor - How many blocks have to pass after a block is proven before its txs are deleted (zero to delete immediately once proven).
-   * @param log - A logger.
-   */
   constructor(
-    _clientType: T,
-    store: AztecAsyncKVStore,
-    private l2BlockSource: L2BlockSource,
-    mempools: MemPools<T>,
+    private store: AztecAsyncKVStore,
+    private l2BlockSource: L2BlockSource & ContractDataSource,
+    mempools: MemPools,
     private p2pService: P2PService,
+    private txCollection: TxCollection,
+    private txFileStore: TxFileStore | undefined,
+    private epochCache: EpochCacheInterface,
     config: Partial<P2PConfig> = {},
-    telemetry: TelemetryClient = getTelemetryClient(),
+    private _dateProvider: DateProvider = new DateProvider(),
+    private telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('p2p'),
   ) {
     super(telemetry, 'P2PClient');
 
-    const { keepProvenTxsInPoolFor, blockCheckIntervalMS, blockRequestBatchSize, keepAttestationsInPoolFor } = {
-      ...getP2PDefaultConfig(),
-      ...config,
-    };
-    this.keepProvenTxsFor = keepProvenTxsInPoolFor;
-    this.keepAttestationsInPoolFor = keepAttestationsInPoolFor;
+    this.config = { ...getP2PDefaultConfig(), ...config };
+    this.txPool = mempools.txPool;
+    this.attestationPool = mempools.attestationPool;
+
+    this.txProvider = new TxProvider(
+      this.txCollection,
+      this.txPool,
+      this,
+      this.log.createChild('tx-provider'),
+      this.telemetry,
+    );
 
-    const tracer = telemetry.getTracer('P2PL2BlockStream');
-    const logger = createLogger('p2p:l2-block-stream');
-    this.blockStream = new TraceableL2BlockStream(l2BlockSource, this, this, tracer, 'P2PL2BlockStream', logger, {
-      batchSize: blockRequestBatchSize,
-      pollIntervalMS: blockCheckIntervalMS,
-    });
+    this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
+    this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
+  }
 
-    this.synchedBlockHashes = store.openMap('p2p_pool_block_hashes');
-    this.synchedLatestBlockNumber = store.openSingleton('p2p_pool_last_l2_block');
-    this.synchedProvenBlockNumber = store.openSingleton('p2p_pool_last_proven_l2_block');
+  public registerThisValidatorAddresses(addresses: EthAddress[]): void {
+    this.validatorAddresses = [...addresses];
+    this.p2pService.registerThisValidatorAddresses(this.validatorAddresses);
+  }
 
-    this.txPool = mempools.txPool;
-    this.attestationPool = mempools.attestationPool!;
+  public clear(): Promise<void> {
+    return this.store.clear();
   }
 
   public isP2PClient(): true {
     return true;
   }
 
+  public getTxProvider(): TxProvider {
+    return this.txProvider;
+  }
+
   public getPeers(includePending?: boolean): Promise<PeerInfo[]> {
     return Promise.resolve(this.p2pService.getPeers(includePending));
   }
 
-  public getL2BlockHash(number: number): Promise<string | undefined> {
-    return this.synchedBlockHashes.getAsync(number);
+  public getGossipMeshPeerCount(topicType: TopicType): Promise<number> {
+    return Promise.resolve(this.p2pService.getGossipMeshPeerCount(topicType));
   }
 
-  public async getL2Tips(): Promise<L2Tips> {
-    const latestBlockNumber = await this.getSyncedLatestBlockNum();
-    let latestBlockHash: string | undefined;
-    const provenBlockNumber = await this.getSyncedProvenBlockNum();
-    let provenBlockHash: string | undefined;
-
-    if (latestBlockNumber > 0) {
-      latestBlockHash = await this.synchedBlockHashes.getAsync(latestBlockNumber);
-      if (typeof latestBlockHash === 'undefined') {
-        this.log.warn(`Block hash for latest block ${latestBlockNumber} not found`);
-        throw new Error();
-      }
-    }
+  public getL2BlockHash(number: BlockNumber): Promise<string | undefined> {
+    return this.l2Tips.getL2BlockHash(number);
+  }
 
-    if (provenBlockNumber > 0) {
-      provenBlockHash = await this.synchedBlockHashes.getAsync(provenBlockNumber);
-      if (typeof provenBlockHash === 'undefined') {
-        this.log.warn(`Block hash for proven block ${provenBlockNumber} not found`);
-        throw new Error();
-      }
-    }
+  public async updateP2PConfig(config: Partial<P2PConfig>): Promise<void> {
+    await this.txPool.updateConfig(config);
+    this.p2pService.updateConfig(config);
+  }
 
-    return Promise.resolve({
-      latest: { hash: latestBlockHash!, number: latestBlockNumber },
-      proven: { hash: provenBlockHash!, number: provenBlockNumber },
-      finalized: { hash: provenBlockHash!, number: provenBlockNumber },
-    });
+  public getL2Tips(): Promise<L2Tips> {
+    return this.l2Tips.getL2Tips();
   }
 
   public async handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void> {
     this.log.debug(`Handling block stream event ${event.type}`);
+
     switch (event.type) {
       case 'blocks-added':
         await this.handleLatestL2Blocks(event.blocks);
         break;
-      case 'chain-finalized':
-        // TODO (alexg): I think we can prune the block hashes map here
-        break;
-      case 'chain-proven': {
-        const from = (await this.getSyncedProvenBlockNum()) + 1;
-        const limit = event.blockNumber - from + 1;
-        await this.handleProvenL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
+      case 'chain-finalized': {
+        const oldFinalizedBlockNum = await this.getSyncedFinalizedBlockNum();
+        const from = BlockNumber(oldFinalizedBlockNum + 1);
+        const limit = event.block.number - from + 1;
+        if (limit > 0) {
+          const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+          await this.handleFinalizedL2Blocks(oldBlocks);
+        }
         break;
       }
+      case 'chain-proven':
+        this.txCollection.stopCollectingForBlocksUpTo(event.block.number);
+        break;
       case 'chain-pruned':
-        await this.handlePruneL2Blocks(event.blockNumber);
+        this.txCollection.stopCollectingForBlocksAfter(event.block.number);
+        await this.handlePruneL2Blocks(event.block, event.checkpoint);
+        break;
+      case 'chain-checkpointed':
         break;
       default: {
         const _: never = event;
         break;
       }
     }
+
+    // Pass the event through to our l2 tips store
+    await this.l2Tips.handleBlockStreamEvent(event);
+    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');
     }
@@ -319,124 +207,224 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
       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
-    this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
-    this.provenBlockNumberAtStart = await this.l2BlockSource.getProvenBlockNumber();
+    const latestBlockNumbers = await this.l2BlockSource.getL2Tips();
+    this.latestBlockNumberAtStart = latestBlockNumbers.proposed.number;
+    this.provenBlockNumberAtStart = latestBlockNumbers.proven.block.number;
+    this.finalizedBlockNumberAtStart = latestBlockNumbers.finalized.block.number;
 
     const syncedLatestBlock = (await this.getSyncedLatestBlockNum()) + 1;
     const syncedProvenBlock = (await this.getSyncedProvenBlockNum()) + 1;
+    const syncedFinalizedBlock = (await this.getSyncedFinalizedBlockNum()) + 1;
 
-    // if there are blocks to be retrieved, go to a synching state
-    if (syncedLatestBlock <= this.latestBlockNumberAtStart || syncedProvenBlock <= this.provenBlockNumberAtStart) {
+    if ((await this.txPool.isEmpty()) && (await this.attestationPool.isEmpty())) {
+      // if mempools are empty, we don't care about syncing prior blocks
+      this.initBlockStream(BlockNumber(this.latestBlockNumberAtStart));
+      this.setCurrentState(P2PClientState.RUNNING);
+      this.syncPromise = Promise.resolve();
+      await this.p2pService.start();
+      this.log.info(`Starting p2p client from block ${this.latestBlockNumberAtStart} with empty mempools`);
+    } else if (
+      syncedLatestBlock <= this.latestBlockNumberAtStart ||
+      syncedProvenBlock <= this.provenBlockNumberAtStart ||
+      syncedFinalizedBlock <= this.finalizedBlockNumberAtStart
+    ) {
+      // if there are blocks to be retrieved, go to a synching state
+      // this gets resolved on `startServiceIfSynched`
+      this.initBlockStream();
       this.setCurrentState(P2PClientState.SYNCHING);
       this.syncPromise = new Promise(resolve => {
         this.syncResolve = resolve;
       });
-      this.log.verbose(`Starting sync from ${syncedLatestBlock} (last proven ${syncedProvenBlock})`);
+      this.log.info(`Initiating p2p sync from ${syncedLatestBlock}`, {
+        syncedLatestBlock,
+        syncedProvenBlock,
+        syncedFinalizedBlock,
+      });
     } else {
       // if no blocks to be retrieved, go straight to running
+      this.initBlockStream();
       this.setCurrentState(P2PClientState.RUNNING);
       this.syncPromise = Promise.resolve();
       await this.p2pService.start();
-      this.log.debug(`Block ${syncedLatestBlock} (proven ${syncedProvenBlock}) already beyond current block`);
+      this.log.info(`Starting P2P client synced to ${syncedLatestBlock}`, {
+        syncedLatestBlock,
+        syncedProvenBlock,
+        syncedFinalizedBlock,
+      });
     }
 
-    this.blockStream.start();
-    this.log.verbose(`Started block downloader from block ${syncedLatestBlock}`);
+    this.blockStream!.start();
+    await this.txCollection.start();
+    this.txFileStore?.start();
+
+    // Start slot monitor to call prepareForSlot when the slot changes
+    this.slotMonitor = new RunningPromise(
+      () => this.maybeCallPrepareForSlot(),
+      this.log,
+      this.config.slotCheckIntervalMS,
+    );
+    this.slotMonitor.start();
 
     return this.syncPromise;
   }
 
+  addReqRespSubProtocol(
+    subProtocol: ReqRespSubProtocol,
+    handler: ReqRespSubProtocolHandler,
+    validator: ReqRespSubProtocolValidators[ReqRespSubProtocol],
+  ): Promise<void> {
+    return this.p2pService.addReqRespSubProtocol(subProtocol, handler, validator);
+  }
+
+  private initBlockStream(startingBlock?: BlockNumber) {
+    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`),
+        { batchSize, pollIntervalMS, startingBlock },
+      );
+    }
+  }
+
   /**
    * Allows consumers to stop the instance of the P2P client.
    * 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
    */
   public async stop() {
     this.log.debug('Stopping p2p client...');
+    await this.slotMonitor?.stop();
+    this.log.debug('Stopped slot monitor');
+    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();
+    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.');
+    this.log.info('P2P client stopped');
+  }
+
+  /** Triggers a sync to the archiver. Used for testing. */
+  public async sync() {
+    this.initBlockStream();
+    await this.blockStream!.sync();
   }
 
   @trackSpan('p2pClient.broadcastProposal', async proposal => ({
-    [Attributes.BLOCK_NUMBER]: proposal.blockNumber.toNumber(),
-    [Attributes.SLOT_NUMBER]: proposal.slotNumber.toNumber(),
+    [Attributes.SLOT_NUMBER]: proposal.slotNumber,
+    [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
+    [Attributes.P2P_ID]: (await proposal.p2pMessageLoggingIdentifier()).toString(),
+  }))
+  public async broadcastProposal(proposal: BlockProposal): Promise<void> {
+    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);
+  }
+
+  @trackSpan('p2pClient.broadcastCheckpointProposal', async proposal => ({
+    [Attributes.SLOT_NUMBER]: proposal.slotNumber,
     [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
-    [Attributes.P2P_ID]: (await proposal.p2pMessageIdentifier()).toString(),
+    [Attributes.P2P_ID]: (await proposal.p2pMessageLoggingIdentifier()).toString(),
   }))
-  public broadcastProposal(proposal: BlockProposal): void {
-    this.log.verbose(`Broadcasting proposal for slot ${proposal.slotNumber.toNumber()} to peers`);
+  public async broadcastCheckpointProposal(proposal: CheckpointProposal): Promise<void> {
+    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);
+    }
     return this.p2pService.propagate(proposal);
   }
 
-  public async getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
-    return (await this.attestationPool?.getAttestationsForSlot(slot, proposalId)) ?? [];
+  public async broadcastCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void> {
+    this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
+    await Promise.all(attestations.map(att => this.p2pService.propagate(att)));
+  }
+
+  public async getCheckpointAttestationsForSlot(
+    slot: SlotNumber,
+    proposalId?: string,
+  ): Promise<CheckpointAttestation[]> {
+    return await (proposalId
+      ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId)
+      : this.attestationPool.getCheckpointAttestationsForSlot(slot));
+  }
+
+  public addOwnCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void> {
+    return this.attestationPool.addOwnCheckpointAttestations(attestations);
+  }
+
+  public hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean> {
+    return this.attestationPool.hasBlockProposalsForSlot(slot);
   }
 
   // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
   // ^ This pattern is not my favorite (md)
-  public registerBlockProposalHandler(handler: (block: BlockProposal) => Promise<BlockAttestation | undefined>): void {
+  public registerBlockProposalHandler(handler: P2PBlockReceivedCallback): void {
     this.p2pService.registerBlockReceivedCallback(handler);
   }
 
-  /**
-   * Requests the transactions with the given hashes from the network.
-   *
-   * If a transaction can be retrieved, it will be returned, if not an undefined
-   * will be returned. In place.
-   *
-   * @param txHashes - The hashes of the transactions to request.
-   * @returns A promise that resolves to an array of transactions or undefined.
-   */
-  public async requestTxs(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
-    const res = await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes);
-    return Promise.resolve(res ?? []);
+  public registerCheckpointProposalHandler(handler: P2PCheckpointReceivedCallback): void {
+    this.p2pService.registerCheckpointReceivedCallback(handler);
   }
 
-  /**
-   * Uses the Request Response protocol to request a transaction from the network.
-   *
-   * If the underlying request response protocol fails, then we return undefined.
-   * If it succeeds then we add the transaction to our transaction pool and return.
-   *
-   * @param txHash - The hash of the transaction to request.
-   * @returns A promise that resolves to a transaction or undefined.
-   */
-  public async requestTxByHash(txHash: TxHash): Promise<Tx | undefined> {
-    const tx = await this.p2pService.sendRequest(ReqRespSubProtocol.TX, txHash);
+  public registerDuplicateProposalCallback(callback: (info: DuplicateProposalInfo) => void): void {
+    this.p2pService.registerDuplicateProposalCallback(callback);
+  }
 
-    if (tx) {
-      this.log.debug(`Received tx ${txHash.toString()} from peer`);
-      await this.txPool.addTxs([tx]);
-    } else {
-      this.log.debug(`Failed to receive tx ${txHash.toString()} from peer`);
+  public registerDuplicateAttestationCallback(callback: (info: DuplicateAttestationInfo) => void): void {
+    this.p2pService.registerDuplicateAttestationCallback(callback);
+  }
+
+  public async getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]> {
+    if (limit !== undefined && limit <= 0) {
+      throw new TypeError('limit must be greater than 0');
     }
 
-    return tx;
-  }
+    let txHashes = await this.txPool.getPendingTxHashes();
 
-  /**
-   * Uses the batched Request Response protocol to request a set of transactions from the network.
-   */
-  public async requestTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
-    const txs = (await this.p2pService.sendBatchRequest(ReqRespSubProtocol.TX, txHashes)) ?? [];
-    await this.txPool.addTxs(txs);
-    const txHashesStr = txHashes.map(tx => tx.toString()).join(', ');
-    this.log.debug(`Received batched txs ${txHashesStr} (${txs.length} / ${txHashes.length}}) from peers`);
-    return txs as Tx[];
-  }
+    let startIndex = 0;
+    if (after) {
+      startIndex = txHashes.findIndex(txHash => after.equals(txHash));
+      if (startIndex === -1) {
+        return [];
+      }
+      startIndex++;
+    }
 
-  public getPendingTxs(): Promise<Tx[]> {
-    return Promise.resolve(this.getTxs('pending'));
+    const endIndex = limit !== undefined ? startIndex + limit : undefined;
+    txHashes = txHashes.slice(startIndex, endIndex);
+
+    const maybeTxs = await Promise.all(txHashes.map(txHash => this.txPool.getTxByHash(txHash)));
+    return maybeTxs.filter((tx): tx is Tx => !!tx);
   }
 
-  public async getPendingTxCount(): Promise<number> {
-    const pendingTxs = await this.txPool.getPendingTxHashes();
-    return pendingTxs.length;
+  public getPendingTxCount(): Promise<number> {
+    return this.txPool.getPendingTxCount();
   }
 
   public async *iteratePendingTxs(): AsyncIterableIterator<Tx> {
@@ -448,24 +436,12 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     }
   }
 
-  /**
-   * Returns all transactions in the transaction pool.
-   * @returns An array of Txs.
-   */
-  public async getTxs(filter: 'all' | 'pending' | 'mined'): Promise<Tx[]> {
-    if (filter === 'all') {
-      return this.txPool.getAllTxs();
-    } else if (filter === 'mined') {
-      const minedHashes = await this.txPool.getMinedTxHashes();
-      const minedTx = await Promise.all(minedHashes.map(([txHash]) => this.txPool.getTxByHash(txHash)));
-      return minedTx.filter((tx): tx is Tx => !!tx);
-    } else if (filter === 'pending') {
-      const pendingHashses = await this.txPool.getPendingTxHashes();
-      const pendingTxs = await Promise.all(pendingHashses.map(txHash => this.txPool.getTxByHash(txHash)));
-      return pendingTxs.filter((tx): tx is Tx => !!tx);
-    } else {
-      const _: never = filter;
-      throw new Error(`Unknown filter ${filter}`);
+  public async *iterateEligiblePendingTxs(): AsyncIterableIterator<Tx> {
+    for (const txHash of await this.txPool.getEligiblePendingTxHashes()) {
+      const tx = await this.txPool.getTxByHash(txHash);
+      if (tx) {
+        yield tx;
+      }
     }
   }
 
@@ -478,39 +454,17 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     return this.txPool.getTxByHash(txHash);
   }
 
-  /**
-   * Returns a transaction in the transaction pool by its hash.
-   * If the transaction is not in the pool, it will be requested from the network.
-   * @param txHash - Hash of the transaction to look for in the pool.
-   * @returns A single tx or undefined.
-   */
-  async getTxByHash(txHash: TxHash): Promise<Tx | undefined> {
-    const tx = await this.txPool.getTxByHash(txHash);
-    if (tx) {
-      return tx;
-    }
-    return this.requestTxByHash(txHash);
-  }
-
   /**
    * 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, not necessarily on the same order as the hashes.
+   * @returns The txs found, in the same order as the requested hashes. If a tx is not found, it will be undefined.
    */
-  async getTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
-    const txs = await Promise.all(txHashes.map(txHash => this.txPool.getTxByHash(txHash)));
-    const missingTxHashes = txs
-      .map((tx, index) => [tx, index] as const)
-      .filter(([tx, _index]) => !tx)
-      .map(([_tx, index]) => txHashes[index]);
-
-    if (missingTxHashes.length === 0) {
-      return txs as Tx[];
-    }
+  getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
+    return this.txPool.getTxsByHash(txHashes);
+  }
 
-    const missingTxs = await this.requestTxsByHash(missingTxHashes);
-    return txs.filter((tx): tx is Tx => !!tx).concat(missingTxs);
+  hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]> {
+    return this.txPool.hasTxs(txHashes);
   }
 
   /**
@@ -523,14 +477,28 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   }
 
   /**
-   * 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.
    **/
   public async sendTx(tx: Tx): Promise<void> {
     this.#assertIsReady();
-    await this.txPool.addTxs([tx]);
-    this.p2pService.propagate(tx);
+    const result = await this.txPool.addPendingTxs([tx], { feeComparisonOnly: true });
+    if (result.accepted.length === 1) {
+      await this.p2pService.propagate(tx);
+      return;
+    }
+
+    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}`,
+    );
   }
 
   /**
@@ -538,8 +506,9 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @param txHash - Hash of the tx to query.
    * @returns Pending or mined depending on its status, or undefined if not found.
    */
-  public getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined> {
-    return this.txPool.getTxStatus(txHash);
+  public async getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined> {
+    const status = await this.txPool.getTxStatus(txHash);
+    return status === 'protected' ? 'pending' : status;
   }
 
   public getEnr(): ENR | undefined {
@@ -551,14 +520,12 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   }
 
   /**
-   * 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.
+   * Handles failed transaction execution by removing txs from the pool.
+   * @param txHashes - Hashes of the transactions that failed execution.
    **/
-  public async deleteTxs(txHashes: TxHash[]): Promise<void> {
+  public async handleFailedExecution(txHashes: TxHash[]): Promise<void> {
     this.#assertIsReady();
-    await this.txPool.deleteTxs(txHashes);
+    await this.txPool.handleFailedExecution(txHashes);
   }
 
   /**
@@ -573,16 +540,28 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * Public function to check the latest block number that the P2P client is synced to.
    * @returns Block number of latest L2 Block we've synced with.
    */
-  public async getSyncedLatestBlockNum(): Promise<number> {
-    return (await this.synchedLatestBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
+  public async getSyncedLatestBlockNum(): Promise<BlockNumber> {
+    const tips = await this.l2Tips.getL2Tips();
+    return tips.proposed.number;
   }
 
   /**
    * Public function to check the latest proven block number that the P2P client is synced to.
    * @returns Block number of latest proven L2 Block we've synced with.
    */
-  public async getSyncedProvenBlockNum(): Promise<number> {
-    return (await this.synchedProvenBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
+  public async getSyncedProvenBlockNum(): Promise<BlockNumber> {
+    const tips = await this.l2Tips.getL2Tips();
+    return tips.proven.block.number;
+  }
+
+  public async getSyncedFinalizedBlockNum(): Promise<BlockNumber> {
+    const tips = await this.l2Tips.getL2Tips();
+    return tips.finalized.block.number;
+  }
+
+  /** Returns latest L2 slot for which we have seen an L2 block. */
+  public async getSyncedLatestSlot(): Promise<bigint> {
+    return (await this.synchedLatestSlot.getAsync()) ?? BigInt(0);
   }
 
   /**
@@ -593,7 +572,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     const blockNumber = await this.getSyncedLatestBlockNum();
     const blockHash =
       blockNumber === 0
-        ? ''
+        ? GENESIS_BLOCK_HEADER_HASH.toString()
         : await this.l2BlockSource
             .getBlockHeader(blockNumber)
             .then(header => header?.hash())
@@ -601,32 +580,18 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
 
     return {
       state: this.currentState,
-      syncedToL2Block: { number: blockNumber, hash: blockHash },
-    } as P2PSyncState;
-  }
-
-  /**
-   * Mark all txs from these blocks 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.
-   */
-  private async markTxsAsMinedFromBlocks(blocks: L2Block[]): Promise<void> {
-    for (const block of blocks) {
-      const txHashes = block.body.txEffects.map(txEffect => txEffect.txHash);
-      await this.txPool.markAsMined(txHashes, block.number);
-    }
+      syncedToL2Block: { number: blockNumber, hash: blockHash! },
+    };
   }
 
   /**
-   * Deletes txs from these blocks.
+   * 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.
    */
-  private async deleteTxsFromBlocks(blocks: L2Block[]): Promise<void> {
-    this.log.debug(`Deleting txs from blocks ${blocks[0].number} to ${blocks[blocks.length - 1].number}`);
+  private async handleMinedBlocks(blocks: L2Block[]): Promise<void> {
     for (const block of blocks) {
-      const txHashes = block.body.txEffects.map(txEffect => txEffect.txHash);
-      await this.txPool.deleteTxs(txHashes);
+      await this.txPool.handleMinedBlock(block);
     }
   }
 
@@ -637,103 +602,127 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    */
   private async handleLatestL2Blocks(blocks: L2Block[]): Promise<void> {
     if (!blocks.length) {
-      return Promise.resolve();
+      return;
     }
 
-    await this.markTxsAsMinedFromBlocks(blocks);
-    const lastBlockNum = blocks[blocks.length - 1].number;
-    await Promise.all(
-      blocks.map(async block => this.synchedBlockHashes.set(block.number, (await block.hash()).toString())),
-    );
-    await this.synchedLatestBlockNumber.set(lastBlockNum);
-    this.log.verbose(`Synched to latest block ${lastBlockNum}`);
-    await this.startServiceIfSynched();
+    await this.handleMinedBlocks(blocks);
+    await this.maybeCallPrepareForSlot();
+    await this.startCollectingMissingTxs(blocks);
+    const lastBlock = blocks.at(-1)!;
+    await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
+  }
+
+  /** Request txs for unproven blocks so the prover node has more chances to get them. */
+  private async startCollectingMissingTxs(blocks: L2Block[]): Promise<void> {
+    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
+      // fully synced. This could lead to a ton of tx collection requests for blocks that
+      // 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 unprovenBlocks = blocks.filter(block => block.number > provenBlockNumber);
+      for (const block of unprovenBlocks) {
+        const txHashes = block.body.txEffects.map(txEffect => txEffect.txHash);
+        const missingTxHashes = await this.txPool
+          .hasTxs(txHashes)
+          .then(availability => txHashes.filter((_, index) => !availability[index]));
+        if (missingTxHashes.length > 0) {
+          this.log.verbose(
+            `Starting collection of ${missingTxHashes.length} missing txs for unproven mined block ${block.number}`,
+            { missingTxHashes, blockNumber: block.number, blockHash: await block.hash().then(h => h.toString()) },
+          );
+          this.txCollection.startCollecting(block, missingTxHashes);
+        }
+      }
+    } catch (err) {
+      this.log.error(`Error while starting collection of missing txs for unproven blocks`, err);
+    }
   }
 
   /**
-   * Handles new proven blocks by deleting the txs in them, or by deleting the txs in blocks `keepProvenTxsFor` ago.
-   * @param blocks - A list of proven L2 blocks.
+   * Handles new finalized blocks by deleting the txs and attestations in them.
+   * @param blocks - A list of finalized L2 blocks.
    * @returns Empty promise.
    */
-  private async handleProvenL2Blocks(blocks: L2Block[]): Promise<void> {
+  private async handleFinalizedL2Blocks(blocks: L2Block[]): Promise<void> {
     if (!blocks.length) {
-      return Promise.resolve();
-    }
-
-    const firstBlockNum = blocks[0].number;
-    const lastBlockNum = blocks[blocks.length - 1].number;
-    const lastBlockSlot = blocks[blocks.length - 1].header.globalVariables.slotNumber.toBigInt();
-
-    // If keepProvenTxsFor is 0, we delete all txs from all proven blocks.
-    if (this.keepProvenTxsFor === 0) {
-      await this.deleteTxsFromBlocks(blocks);
-    } else if (lastBlockNum - this.keepProvenTxsFor >= INITIAL_L2_BLOCK_NUM) {
-      const fromBlock = Math.max(INITIAL_L2_BLOCK_NUM, firstBlockNum - this.keepProvenTxsFor);
-      const toBlock = lastBlockNum - this.keepProvenTxsFor;
-      const limit = toBlock - fromBlock + 1;
-      const blocksToDeleteTxsFrom = await this.l2BlockSource.getBlocks(fromBlock, limit, true);
-      await this.deleteTxsFromBlocks(blocksToDeleteTxsFrom);
-    }
-
-    // We delete attestations older than the last block slot minus the number of slots we want to keep in the pool.
-    const lastBlockSlotMinusKeepAttestationsInPoolFor = lastBlockSlot - BigInt(this.keepAttestationsInPoolFor);
-    if (lastBlockSlotMinusKeepAttestationsInPoolFor >= BigInt(INITIAL_L2_BLOCK_NUM)) {
-      await this.attestationPool?.deleteAttestationsOlderThan(lastBlockSlotMinusKeepAttestationsInPoolFor);
+      return;
     }
 
-    await this.synchedProvenBlockNumber.set(lastBlockNum);
-    this.log.debug(`Synched to proven block ${lastBlockNum}`);
-
-    await this.startServiceIfSynched();
+    // 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.
+   * 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.
    */
-  private async handlePruneL2Blocks(latestBlock: number): Promise<void> {
-    const txsToDelete: TxHash[] = [];
-    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.historicalHeader.globalVariables.blockNumber.toNumber() > latestBlock) {
-        txsToDelete.push(await tx.getTxHash());
-      }
-    }
-
-    this.log.info(
-      `Detected chain prune. Removing invalid txs count=${
-        txsToDelete.length
-      } newLatestBlock=${latestBlock} previousLatestBlock=${this.getSyncedLatestBlockNum()}`,
-    );
+  private async handlePruneL2Blocks(latestBlock: L2BlockId, newCheckpoint: CheckpointId): Promise<void> {
+    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(txsToDelete);
-
-    // 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
-    // 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 txsToMoveToPending: TxHash[] = [];
-    for (const [txHash, blockNumber] of await this.txPool.getMinedTxHashes()) {
-      if (blockNumber > latestBlock) {
-        txsToMoveToPending.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.
+   */
+  private async isEpochPrune(newCheckpoint: CheckpointId): Promise<boolean> {
+    const tips = await this.l2Tips.getL2Tips();
+    const oldCheckpointNumber = tips.checkpointed.checkpoint.number;
+    if (oldCheckpointNumber <= CheckpointNumber.INITIAL) {
+      return false;
     }
+    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;
+  }
 
-    this.log.info(`Moving ${txsToMoveToPending.length} mined txs back to pending`);
-    await this.txPool.markMinedAsPending(txsToMoveToPending);
-
-    await this.synchedLatestBlockNumber.set(latestBlock);
-    // no need to update block hashes, as they will be updated as new blocks are added
+  /** Checks if the slot has changed and calls prepareForSlot if so. */
+  private async maybeCallPrepareForSlot(): Promise<void> {
+    const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
+    if (currentSlot <= this.lastSlotProcessed) {
+      return;
+    }
+    this.lastSlotProcessed = currentSlot;
+    await this.txPool.prepareForSlot(currentSlot);
   }
 
   private async startServiceIfSynched() {
+    if (this.currentState !== P2PClientState.SYNCHING) {
+      return;
+    }
+    const tips = await this.l2Tips.getL2Tips();
+    const syncedFinalizedBlock = tips.finalized.block.number;
+    const syncedProvenBlock = tips.proven.block.number;
+    const syncedLatestBlock = tips.proposed.number;
+
     if (
-      this.currentState === P2PClientState.SYNCHING &&
-      (await this.getSyncedLatestBlockNum()) >= this.latestBlockNumberAtStart &&
-      (await this.getSyncedProvenBlockNum()) >= this.provenBlockNumberAtStart
+      syncedLatestBlock >= this.latestBlockNumberAtStart &&
+      syncedProvenBlock >= this.provenBlockNumberAtStart &&
+      syncedFinalizedBlock >= this.finalizedBlockNumberAtStart
     ) {
-      this.log.debug(`Synched to blocks at start`);
+      this.log.info(`Completed P2P client sync to block ${syncedLatestBlock}. Starting service.`, {
+        syncedLatestBlock,
+        syncedProvenBlock,
+        syncedFinalizedBlock,
+      });
       this.setCurrentState(P2PClientState.RUNNING);
       if (this.syncResolve !== undefined) {
         this.syncResolve();
@@ -751,4 +740,32 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     this.currentState = newState;
     this.log.debug(`Moved from state ${P2PClientState[oldState]} to ${P2PClientState[this.currentState]}`);
   }
+
+  public validateTxsReceivedInBlockProposal(txs: Tx[]): Promise<void> {
+    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.
+   */
+  public protectTxs(txHashes: TxHash[], blockHeader: BlockHeader): Promise<TxHash[]> {
+    return this.txPool.protectTxs(txHashes, blockHeader);
+  }
+
+  /**
+   * Prepares the pool for a new slot.
+   * Unprotects transactions from earlier slots and validates them.
+   * @param slotNumber - The slot number to prepare for
+   */
+  public async prepareForSlot(slotNumber: SlotNumber): Promise<void> {
+    await this.txPool.prepareForSlot(slotNumber);
+  }
+
+  public handleAuthRequestFromPeer(authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage> {
+    return this.p2pService.handleAuthRequestFromPeer(authRequest, peerId);
+  }
 }