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

package/dest/client/interface.d.ts

@@ -0,0 +1,183 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { EthAddress, L2BlockId } from '@aztec/stdlib/block';
+import type { ITxProvider, P2PClient } from '@aztec/stdlib/interfaces/server';
+import type { BlockProposal, CheckpointAttestation, CheckpointProposal, TopicType } from '@aztec/stdlib/p2p';
+import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
+import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
+import type { P2PConfig } from '../config.js';
+import type { AuthRequest, StatusMessage } from '../services/index.js';
+import type { ReqRespSubProtocol, ReqRespSubProtocolHandler, ReqRespSubProtocolValidators } from '../services/reqresp/interface.js';
+import type { DuplicateAttestationInfo, DuplicateProposalInfo, P2PBlockReceivedCallback, P2PCheckpointReceivedCallback } from '../services/service.js';
+/**
+ * Enum defining the possible states of the p2p client.
+ */
+export declare enum P2PClientState {
+    IDLE = 0,
+    SYNCHING = 1,
+    RUNNING = 2,
+    STOPPED = 3
+}
+/**
+ * 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 = P2PClient & {
+    /**
+     * Broadcasts a block proposal to other peers.
+     *
+     * @param proposal - the block proposal
+     */
+    broadcastProposal(proposal: BlockProposal): Promise<void>;
+    /**
+     * Broadcasts a checkpoint proposal (last block in a checkpoint) to other peers.
+     *
+     * @param proposal - the checkpoint proposal
+     */
+    broadcastCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
+    /** Broadcasts checkpoint attestations to other peers. */
+    broadcastCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<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
+     */
+    registerBlockProposalHandler(callback: P2PBlockReceivedCallback): void;
+    /**
+     * Registers a callback from the validator client that determines how to behave when
+     * foreign checkpoint proposals are received
+     *
+     * @param handler - A function taking a received checkpoint proposal and producing attestations
+     */
+    registerCheckpointProposalHandler(callback: P2PCheckpointReceivedCallback): void;
+    /**
+     * Registers a callback invoked when a duplicate proposal is detected (equivocation).
+     * The callback is triggered on the first duplicate (when count goes from 1 to 2).
+     *
+     * @param callback - Function called with info about the duplicate proposal
+     */
+    registerDuplicateProposalCallback(callback: (info: DuplicateProposalInfo) => void): void;
+    /**
+     * Registers a callback invoked when a duplicate attestation is detected (equivocation).
+     * A validator signing attestations for different proposals at the same slot.
+     * The callback is triggered on the first duplicate (when count goes from 1 to 2).
+     *
+     * @param callback - Function called with info about the duplicate attestation
+     */
+    registerDuplicateAttestationCallback(callback: (info: DuplicateAttestationInfo) => void): void;
+    /**
+     * 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>;
+    /**
+     * Handles failed transaction execution by removing txs from the pool.
+     * @param txHashes - Hashes of the transactions that failed execution.
+     **/
+    handleFailedExecution(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 transactions in the transaction pool by hash.
+     * @param txHashes  - Hashes of txs to return.
+     * @returns An array of txs or undefined.
+     */
+    getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+    /**
+     * Checks if transactions exist in the pool
+     * @param txHashes - The hashes of the transactions to check for
+     * @returns True or False for each hash
+     */
+    hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]>;
+    /**
+     * 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, mined, or deleted.
+     * @param txHash - Hash of the tx to query.
+     * @returns Pending, mined, or deleted depending on its status, or undefined if not found.
+     */
+    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined>;
+    /** Returns an iterator over pending txs on the mempool. */
+    iteratePendingTxs(): AsyncIterableIterator<Tx>;
+    /** Returns an iterator over pending txs that have been in the pool long enough to be eligible for block building. */
+    iterateEligiblePendingTxs(): AsyncIterableIterator<Tx>;
+    /** Returns the number of pending txs in the mempool. */
+    getPendingTxCount(): Promise<number>;
+    /**
+     * 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: TxHash[], blockHeader: BlockHeader): Promise<TxHash[]>;
+    /**
+     * Prepares the pool for a new slot.
+     * Unprotects transactions from earlier slots and validates them before
+     * returning to pending state.
+     * @param slotNumber - The slot number to prepare for
+     */
+    prepareForSlot(slotNumber: SlotNumber): Promise<void>;
+    /**
+     * 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;
+    /** Returns the tx provider used for fetching transactions. */
+    getTxProvider(): ITxProvider;
+    updateP2PConfig(config: Partial<P2PConfig>): Promise<void>;
+    /** Validates a set of txs received in a block proposal. */
+    validateTxsReceivedInBlockProposal(txs: Tx[]): Promise<void>;
+    /** Clears the db. */
+    clear(): Promise<void>;
+    addReqRespSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler, validator?: ReqRespSubProtocolValidators[ReqRespSubProtocol]): Promise<void>;
+    handleAuthRequestFromPeer(authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage>;
+    /** Checks if any block proposals exist for the given slot. */
+    hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean>;
+    /** If node running this P2P stack is validator, passes in validator address to P2P layer */
+    registerThisValidatorAddresses(address: EthAddress[]): void;
+    /** Returns the number of peers in the GossipSub mesh for a given topic type. */
+    getGossipMeshPeerCount(topicType: TopicType): Promise<number>;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxxQkFBcUIsRUFBRSxrQkFBa0IsRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3RyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM5QyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQ1Ysa0JBQWtCLEVBQ2xCLHlCQUF5QixFQUN6Qiw0QkFBNEIsRUFDN0IsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxQyxPQUFPLEtBQUssRUFDVix3QkFBd0IsRUFDeEIscUJBQXFCLEVBQ3JCLHdCQUF3QixFQUN4Qiw2QkFBNkIsRUFDOUIsTUFBTSx3QkFBd0IsQ0FBQztBQUVoQzs7R0FFRztBQUNILG9CQUFZLGNBQWM7SUFDeEIsSUFBSSxJQUFBO0lBQ0osUUFBUSxJQUFBO0lBQ1IsT0FBTyxJQUFBO0lBQ1AsT0FBTyxJQUFBO0NBQ1I7QUFFRDs7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

package/dest/client/interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/client/interface.ts"],"names":[],"mappings":"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"}

package/dest/client/interface.js

@@ -0,0 +1,9 @@
+/**
+ * Enum defining the possible states of the p2p client.
+ */ export var P2PClientState = /*#__PURE__*/ function(P2PClientState) {
+    P2PClientState[P2PClientState["IDLE"] = 0] = "IDLE";
+    P2PClientState[P2PClientState["SYNCHING"] = 1] = "SYNCHING";
+    P2PClientState[P2PClientState["RUNNING"] = 2] = "RUNNING";
+    P2PClientState[P2PClientState["STOPPED"] = 3] = "STOPPED";
+    return P2PClientState;
+}({});

package/dest/client/p2p_client.d.ts

@@ -1,135 +1,37 @@
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { 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 { type EthAddress, type L2BlockSource, type L2BlockStreamEvent, type L2Tips } from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { type PeerInfo } 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 { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
-import type { ENR } from '@chainsafe/enr';
+import type { PeerId } from '@libp2p/interface';
+import type { ENR } from '@nethermindeth/enr';
 import { type P2PConfig } from '../config.js';
 import type { MemPools } from '../mem_pools/interface.js';
-import type { P2PService } from '../services/service.js';
-/**
- * Enum defining the possible states of the p2p client.
- */
-export declare enum P2PClientState {
-    IDLE = 0,
-    SYNCHING = 1,
-    RUNNING = 2,
-    STOPPED = 3
-}
-/**
- * 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
-     */
-    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 { 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, type P2PSyncState } from './interface.js';
 /**
  * The P2P client implementation.
  */
-export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> extends WithTracer implements P2P, P2P<P2PClientType.Prover> {
+export declare class P2PClient extends WithTracer implements P2P {
     #private;
+    private store;
     private l2BlockSource;
     private p2pService;
+    private txCollection;
+    private txFileStore;
+    private epochCache;
+    private _dateProvider;
+    private telemetry;
     private log;
     /** 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;
@@ -138,29 +40,28 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
     private syncResolve?;
     private latestBlockNumberAtStart;
     private provenBlockNumberAtStart;
-    private synchedBlockHashes;
-    private synchedLatestBlockNumber;
-    private synchedProvenBlockNumber;
+    private finalizedBlockNumberAtStart;
+    private l2Tips;
+    private synchedLatestSlot;
     private txPool;
     private attestationPool;
-    /** How many slots to keep attestations for. */
-    private keepAttestationsInPoolFor;
-    /** How many slots to keep proven txs for. */
-    private keepProvenTxsFor;
+    private config;
     private blockStream;
-    /**
-     * 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, l2BlockSource: L2BlockSource, mempools: MemPools<T>, p2pService: P2PService, config?: Partial<P2PConfig>, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    private txProvider;
+    private validatorAddresses;
+    /** Tracks the last slot for which we called prepareForSlot */
+    private lastSlotProcessed;
+    /** Polls for slot changes and calls prepareForSlot on the tx pool */
+    private slotMonitor;
+    constructor(store: AztecAsyncKVStore, l2BlockSource: L2BlockSource & ContractDataSource, mempools: MemPools, p2pService: P2PService, txCollection: TxCollection, txFileStore: TxFileStore | undefined, epochCache: EpochCacheInterface, config?: Partial<P2PConfig>, _dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    registerThisValidatorAddresses(addresses: EthAddress[]): void;
+    clear(): Promise<void>;
     isP2PClient(): true;
+    getTxProvider(): TxProvider;
     getPeers(includePending?: boolean): Promise<PeerInfo[]>;
-    getL2BlockHash(number: number): Promise<string | undefined>;
+    getGossipMeshPeerCount(topicType: TopicType): Promise<number>;
+    getL2BlockHash(number: BlockNumber): Promise<string | undefined>;
+    updateP2PConfig(config: Partial<P2PConfig>): Promise<void>;
     getL2Tips(): Promise<L2Tips>;
     handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
     /**
@@ -168,66 +69,42 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
      * @returns An empty promise signalling the synching process.
      */
     start(): Promise<void>;
+    addReqRespSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler, validator: ReqRespSubProtocolValidators[ReqRespSubProtocol]): Promise<void>;
+    private initBlockStream;
     /**
      * 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.
      */
     stop(): Promise<void>;
-    broadcastProposal(proposal: BlockProposal): void;
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
-    registerBlockProposalHandler(handler: (block: BlockProposal) => Promise<BlockAttestation | undefined>): void;
-    /**
-     * 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.
-     */
-    requestTxs(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
-    /**
-     * 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.
-     */
-    requestTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-    /**
-     * Uses the batched Request Response protocol to request a set of transactions from the network.
-     */
-    requestTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
-    getPendingTxs(): Promise<Tx[]>;
+    /** Triggers a sync to the archiver. Used for testing. */
+    sync(): Promise<void>;
+    broadcastProposal(proposal: BlockProposal): Promise<void>;
+    broadcastCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
+    broadcastCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
+    getCheckpointAttestationsForSlot(slot: SlotNumber, proposalId?: string): Promise<CheckpointAttestation[]>;
+    addOwnCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
+    hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean>;
+    registerBlockProposalHandler(handler: P2PBlockReceivedCallback): void;
+    registerCheckpointProposalHandler(handler: P2PCheckpointReceivedCallback): void;
+    registerDuplicateProposalCallback(callback: (info: DuplicateProposalInfo) => void): void;
+    registerDuplicateAttestationCallback(callback: (info: DuplicateAttestationInfo) => void): void;
+    getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]>;
     getPendingTxCount(): Promise<number>;
     iteratePendingTxs(): AsyncIterableIterator<Tx>;
-    /**
-     * Returns all transactions in the transaction pool.
-     * @returns An array of Txs.
-     */
-    getTxs(filter: 'all' | 'pending' | 'mined'): Promise<Tx[]>;
+    iterateEligiblePendingTxs(): AsyncIterableIterator<Tx>;
     /**
      * Returns a transaction in the transaction pool by its hash.
      * @param txHash - Hash of the transaction to look for in the pool.
      * @returns A single tx or undefined.
      */
     getTxByHashFromPool(txHash: TxHash): Promise<Tx | undefined>;
-    /**
-     * 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.
-     */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
     /**
      * 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.
      */
-    getTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
+    getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+    hasTxsInPool(txHashes: TxHash[]): Promise<boolean[]>;
     /**
      * Returns an archived transaction in the transaction pool by its hash.
      * @param txHash - Hash of the archived transaction to look for.
@@ -235,8 +112,8 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
      */
     getArchivedTxByHash(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 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.
      **/
     sendTx(tx: Tx): Promise<void>;
@@ -245,16 +122,14 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
      * @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>;
+    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined>;
     getEnr(): ENR | undefined;
     getEncodedEnr(): Promise<string | undefined>;
     /**
-     * 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.
      **/
-    deleteTxs(txHashes: TxHash[]): Promise<void>;
+    handleFailedExecution(txHashes: TxHash[]): Promise<void>;
     /**
      * Public function to check if the p2p client is fully synced and ready to receive txs.
      * @returns True if the P2P client is ready to receive txs.
@@ -264,51 +139,48 @@ export declare class P2PClient<T extends P2PClientType = P2PClientType.Full> ext
      * 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.
      */
-    getSyncedLatestBlockNum(): Promise<number>;
+    getSyncedLatestBlockNum(): Promise<BlockNumber>;
     /**
      * 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.
      */
-    getSyncedProvenBlockNum(): Promise<number>;
+    getSyncedProvenBlockNum(): Promise<BlockNumber>;
+    getSyncedFinalizedBlockNum(): Promise<BlockNumber>;
+    /** Returns latest L2 slot for which we have seen an L2 block. */
+    getSyncedLatestSlot(): Promise<bigint>;
     /**
      * Method to check the status the p2p client.
      * @returns Information about p2p client status: state & syncedToBlockNum.
      */
     getStatus(): Promise<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 markTxsAsMinedFromBlocks;
-    /**
-     * Deletes txs from these blocks.
-     * @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 deleteTxsFromBlocks;
-    /**
-     * Handles new 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 handleMinedBlocks;
     private handleLatestL2Blocks;
-    /**
-     * 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.
-     * @returns Empty promise.
-     */
-    private handleProvenL2Blocks;
-    /**
-     * Updates the tx pool after a chain prune.
-     * @param latestBlock - The block number the chain was pruned to.
-     */
+    private startCollectingMissingTxs;
+    private handleFinalizedL2Blocks;
     private handlePruneL2Blocks;
+    private isEpochPrune;
+    private maybeCallPrepareForSlot;
     private startServiceIfSynched;
     /**
      * Method to set the value of the current state.
      * @param newState - New state value.
      */
     private setCurrentState;
+    validateTxsReceivedInBlockProposal(txs: Tx[]): Promise<void>;
+    /**
+     * 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: TxHash[], blockHeader: BlockHeader): Promise<TxHash[]>;
+    /**
+     * Prepares the pool for a new slot.
+     * Unprotects transactions from earlier slots and validates them.
+     * @param slotNumber - The slot number to prepare for
+     */
+    prepareForSlot(slotNumber: SlotNumber): Promise<void>;
+    handleAuthRequestFromPeer(authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage>;
 }
-//# sourceMappingURL=p2p_client.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDJwX2NsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9wMnBfY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFdBQVcsRUFBb0IsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHNUYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRTlFLE9BQU8sRUFFTCxLQUFLLFVBQVUsRUFHZixLQUFLLGFBQWEsRUFFbEIsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxNQUFNLEVBRVosTUFBTSxxQkFBcUIsQ0FBQztBQUM3QixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBVyxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBRSxxQkFBcUIsRUFBRSxLQUFLLGtCQUFrQixFQUFFLEtBQUssU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdkgsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNoRSxPQUFPLEVBQWMsS0FBSyxlQUFlLEVBQUUsVUFBVSxFQUFpQyxNQUFNLHlCQUF5QixDQUFDO0FBRXRILE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBdUIsTUFBTSxjQUFjLENBQUM7QUFHbkUsT0FBTyxLQUFLLEVBQUUsUUFB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