@aztec/p2p 0.0.1-commit.c7c42ec → 0.0.1-commit.cf93bcc56

package/dest/client/p2p_client.js

@@ -1,21 +1,401 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
 }
-import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+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 { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
+import { L2TipsKVStore } from '@aztec/kv-store/stores';
+import { L2BlockStream } from '@aztec/stdlib/block';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
-import { Attributes, TraceableL2BlockStream, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { Attributes, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { getP2PDefaultConfig } from '../config.js';
+import { TxPoolError } from '../errors/tx-pool.error.js';
 import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
 import { chunkTxHashesRequest } from '../services/reqresp/protocols/tx.js';
 import { TxProvider } from '../services/tx_provider.js';
 import { P2PClientState } from './interface.js';
+_dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
+        [Attributes.SLOT_NUMBER]: proposal.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
+        [Attributes.P2P_ID]: (await proposal.p2pMessageLoggingIdentifier()).toString()
+    })), _dec1 = trackSpan('p2pClient.broadcastCheckpointProposal', async (proposal)=>({
+        [Attributes.SLOT_NUMBER]: proposal.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
+        [Attributes.P2P_ID]: (await proposal.p2pMessageLoggingIdentifier()).toString()
+    }));
 /**
  * The P2P client implementation.
  */ export class P2PClient extends WithTracer {
@@ -23,9 +403,25 @@ import { P2PClientState } from './interface.js';
     l2BlockSource;
     p2pService;
     txCollection;
+    txFileStore;
+    epochCache;
     _dateProvider;
     telemetry;
     log;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "broadcastProposal"
+            ],
+            [
+                _dec1,
+                2,
+                "broadcastCheckpointProposal"
+            ]
+        ], []));
+    }
     /** The JS promise that will be running to keep the client's data in sync. Can be interrupted if the client is stopped. */ runningPromise;
     currentState;
     syncPromise;
@@ -33,10 +429,7 @@ import { P2PClientState } from './interface.js';
     latestBlockNumberAtStart;
     provenBlockNumberAtStart;
     finalizedBlockNumberAtStart;
-    synchedBlockHashes;
-    synchedLatestBlockNumber;
-    synchedProvenBlockNumber;
-    synchedFinalizedBlockNumber;
+    l2Tips;
     synchedLatestSlot;
     txPool;
     attestationPool;
@@ -44,15 +437,10 @@ import { P2PClientState } from './interface.js';
     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 = 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;
+    /** Polls for slot changes and calls prepareForSlot on the tx pool */ slotMonitor;
+    constructor(_clientType, store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, 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.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
@@ -61,7 +449,8 @@ import { P2PClientState } from './interface.js';
         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 attest, and it will call getTxsForBlockProposal on its own
+        // 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)=>{
@@ -70,23 +459,19 @@ import { P2PClientState } from './interface.js';
             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.payload.header.lastArchiveRoot);
+            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;
+                return false;
             }
             const blockNumber = BlockNumber(parentBlock.getBlockNumber() + 1);
             await this.txProvider.getTxsForBlockProposal(block, blockNumber, {
                 pinnedPeer: sender,
                 deadline
             });
-            return undefined;
+            return true;
         });
-        // REFACTOR: Try replacing these with an L2TipsStore
-        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');
-        this.synchedFinalizedBlockNumber = store.openSingleton('p2p_pool_last_finalized_l2_block');
+        this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
         this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
     }
     registerThisValidatorAddresses(addresses) {
@@ -108,83 +493,40 @@ import { P2PClientState } from './interface.js';
         return Promise.resolve(this.p2pService.getPeers(includePending));
     }
     getL2BlockHash(number) {
-        return this.synchedBlockHashes.getAsync(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();
-    }
-    async getL2Tips() {
-        const latestBlockNumber = await this.getSyncedLatestBlockNum();
-        let latestBlockHash;
-        const provenBlockNumber = await this.getSyncedProvenBlockNum();
-        let provenBlockHash;
-        const finalizedBlockNumber = await this.getSyncedFinalizedBlockNum();
-        let finalizedBlockHash;
-        if (latestBlockNumber > 0) {
-            latestBlockHash = await this.synchedBlockHashes.getAsync(latestBlockNumber);
-            if (typeof latestBlockHash === 'undefined') {
-                throw new Error(`Block hash for latest block ${latestBlockNumber} not found in p2p client`);
-            }
-        }
-        if (provenBlockNumber > 0) {
-            provenBlockHash = await this.synchedBlockHashes.getAsync(provenBlockNumber);
-            if (typeof provenBlockHash === 'undefined') {
-                throw new Error(`Block hash for proven block ${provenBlockNumber} not found in p2p client`);
-            }
-        }
-        if (finalizedBlockNumber > 0) {
-            finalizedBlockHash = await this.synchedBlockHashes.getAsync(finalizedBlockNumber);
-            if (typeof finalizedBlockHash === 'undefined') {
-                throw new Error(`Block hash for finalized block ${finalizedBlockNumber} not found in p2p client`);
-            }
-        }
-        const genesisHash = GENESIS_BLOCK_HEADER_HASH.toString();
-        return {
-            latest: {
-                hash: latestBlockHash ?? genesisHash,
-                number: latestBlockNumber
-            },
-            proven: {
-                hash: provenBlockHash ?? genesisHash,
-                number: provenBlockNumber
-            },
-            finalized: {
-                hash: finalizedBlockHash ?? genesisHash,
-                number: finalizedBlockNumber
-            }
-        };
+    }
+    getL2Tips() {
+        return this.l2Tips.getL2Tips();
     }
     async handleBlockStreamEvent(event) {
         this.log.debug(`Handling block stream event ${event.type}`);
         switch(event.type){
             case 'blocks-added':
-                await this.handleLatestL2Blocks(event.blocks.map((b)=>b.block.toL2Block()));
+                await this.handleLatestL2Blocks(event.blocks);
                 break;
             case 'chain-finalized':
                 {
-                    // TODO (alexg): I think we can prune the block hashes map here
-                    await this.setBlockHash(event.block);
-                    const from = BlockNumber(await this.getSyncedFinalizedBlockNum() + 1);
+                    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.map((b)=>b.toL2Block()));
+                        await this.handleFinalizedL2Blocks(oldBlocks);
                     }
                     break;
                 }
             case 'chain-proven':
-                {
-                    await this.setBlockHash(event.block);
-                    this.txCollection.stopCollectingForBlocksUpTo(event.block.number);
-                    await this.synchedProvenBlockNumber.set(event.block.number);
-                    break;
-                }
+                this.txCollection.stopCollectingForBlocksUpTo(event.block.number);
+                break;
             case 'chain-pruned':
-                await this.setBlockHash(event.block);
                 this.txCollection.stopCollectingForBlocksAfter(event.block.number);
-                await this.handlePruneL2Blocks(event.block.number);
+                await this.handlePruneL2Blocks(event.block);
+                break;
+            case 'chain-checkpointed':
                 break;
             default:
                 {
@@ -192,14 +534,11 @@ import { P2PClientState } from './interface.js';
                     break;
                 }
         }
-    }
-    async setBlockHash(block) {
-        if (block.hash !== undefined) {
-            await this.synchedBlockHashes.set(block.number, block.hash.toString());
-        }
+        // 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');
         }
@@ -214,11 +553,13 @@ import { P2PClientState } from './interface.js';
         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.latest.number;
-        this.provenBlockNumberAtStart = latestBlockNumbers.proven.number;
-        this.finalizedBlockNumberAtStart = latestBlockNumbers.finalized.number;
+        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;
@@ -256,6 +597,10 @@ import { P2PClientState } from './interface.js';
         }
         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, handler, validator) {
@@ -264,7 +609,7 @@ import { P2PClientState } from './interface.js';
     initBlockStream(startingBlock) {
         if (!this.blockStream) {
             const { blockRequestBatchSize: batchSize, blockCheckIntervalMS: pollIntervalMS } = this.config;
-            this.blockStream = new TraceableL2BlockStream(this.l2BlockSource, this, this, this.telemetry.getTracer('P2PL2BlockStream'), 'P2PL2BlockStream', createLogger(`${this.log.module}:l2-block-stream`), {
+            this.blockStream = new L2BlockStream(this.l2BlockSource, this, this, createLogger(`${this.log.module}:l2-block-stream`), {
                 batchSize,
                 pollIntervalMS,
                 startingBlock
@@ -276,12 +621,18 @@ import { P2PClientState } from './interface.js';
    * 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
    */ 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();
         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');
@@ -290,30 +641,59 @@ import { P2PClientState } from './interface.js';
         this.initBlockStream();
         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);
+    }
+    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);
+        }
         return this.p2pService.propagate(proposal);
     }
-    async broadcastAttestations(attestations) {
-        this.log.verbose(`Broadcasting ${attestations.length} attestations to peers`);
+    async broadcastCheckpointAttestations(attestations) {
+        this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
         await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
     }
-    async getAttestationsForSlot(slot, proposalId) {
-        return await (proposalId ? this.attestationPool.getAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getAttestationsForSlot(slot));
+    async getCheckpointAttestationsForSlot(slot, proposalId) {
+        return await (proposalId ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
     }
-    addAttestations(attestations) {
-        return this.attestationPool.addAttestations(attestations);
+    addOwnCheckpointAttestations(attestations) {
+        return this.attestationPool.addOwnCheckpointAttestations(attestations);
     }
-    deleteAttestation(attestation) {
-        return this.attestationPool.deleteAttestations([
-            attestation
-        ]);
+    hasBlockProposalsForSlot(slot) {
+        return this.attestationPool.hasBlockProposalsForSlot(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);
+    }
+    registerDuplicateProposalCallback(callback) {
+        this.p2pService.registerDuplicateProposalCallback(callback);
+    }
+    registerDuplicateAttestationCallback(callback) {
+        this.p2pService.registerDuplicateAttestationCallback(callback);
+    }
     /**
    * Uses the batched Request Response protocol to request a set of transactions from the network.
    */ async requestTxsByHash(txHashes, pinnedPeerId) {
@@ -324,15 +704,30 @@ import { P2PClientState } from './interface.js';
         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);
+            await this.txPool.addPendingTxs(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;
     }
-    getPendingTxs(limit, after) {
-        return this.getTxs('pending', limit, after);
+    async getPendingTxs(limit, after) {
+        if (limit !== undefined && limit <= 0) {
+            throw new TypeError('limit must be greater than 0');
+        }
+        let txHashes = await this.txPool.getPendingTxHashes();
+        let startIndex = 0;
+        if (after) {
+            startIndex = txHashes.findIndex((txHash)=>after.equals(txHash));
+            if (startIndex === -1) {
+                return [];
+            }
+            startIndex++;
+        }
+        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);
     }
     getPendingTxCount() {
         return this.txPool.getPendingTxCount();
@@ -345,52 +740,13 @@ import { P2PClientState } from './interface.js';
             }
         }
     }
-    /**
-   * 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) {
-        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 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 [];
+    async *iterateEligiblePendingTxs() {
+        for (const txHash of (await this.txPool.getEligiblePendingTxHashes())){
+            const tx = await this.txPool.getTxByHash(txHash);
+            if (tx) {
+                yield tx;
             }
-            // increment by one because we don't want to return the same tx again
-            startIndex++;
         }
-        if (limit !== undefined) {
-            endIndex = startIndex + limit;
-        }
-        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);
-        }
-        return txs;
     }
     /**
    * Returns a transaction in the transaction pool by its hash.
@@ -453,31 +809,35 @@ import { P2PClientState } from './interface.js';
         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();
@@ -486,13 +846,11 @@ import { P2PClientState } from './interface.js';
         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.
@@ -504,16 +862,19 @@ import { P2PClientState } from './interface.js';
    * 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.
    */ async getSyncedLatestBlockNum() {
-        return await this.synchedLatestBlockNumber.getAsync() ?? BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
+        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.
    */ async getSyncedProvenBlockNum() {
-        return await this.synchedProvenBlockNumber.getAsync() ?? BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
+        const tips = await this.l2Tips.getL2Tips();
+        return tips.proven.block.number;
     }
     async getSyncedFinalizedBlockNum() {
-        return await this.synchedFinalizedBlockNumber.getAsync() ?? BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
+        const tips = await this.l2Tips.getL2Tips();
+        return tips.finalized.block.number;
     }
     /** Returns latest L2 slot for which we have seen an L2 block. */ async getSyncedLatestSlot() {
         return await this.synchedLatestSlot.getAsync() ?? BigInt(0);
@@ -533,13 +894,12 @@ import { P2PClientState } from './interface.js';
         };
     }
     /**
-   * 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);
         }
     }
     /**
@@ -548,20 +908,13 @@ import { P2PClientState } from './interface.js';
    * @returns Empty promise.
    */ async handleLatestL2Blocks(blocks) {
         if (!blocks.length) {
-            return Promise.resolve();
+            return;
         }
-        await this.markTxsAsMinedFromBlocks(blocks);
-        await this.txPool.clearNonEvictableTxs();
+        await this.handleMinedBlocks(blocks);
+        await this.maybeCallPrepareForSlot();
         await this.startCollectingMissingTxs(blocks);
         const lastBlock = blocks.at(-1);
-        await Promise.all(blocks.map(async (block)=>this.setBlockHash({
-                number: block.number,
-                hash: await block.hash().then((h)=>h.toString())
-            })));
-        await this.synchedLatestBlockNumber.set(lastBlock.number);
         await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
-        this.log.verbose(`Synched to latest block ${lastBlock.number}`);
-        await this.startServiceIfSynched();
     }
     /** Request txs for unproven blocks so the prover node has more chances to get them. */ async startCollectingMissingTxs(blocks) {
         try {
@@ -595,71 +948,35 @@ import { P2PClientState } from './interface.js';
    * @returns Empty promise.
    */ async handleFinalizedL2Blocks(blocks) {
         if (!blocks.length) {
-            return Promise.resolve();
-        }
-        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.deleteAttestationsOlderThan(lastBlockSlot);
-        await this.synchedFinalizedBlockNumber.set(lastBlockNum);
-        this.log.debug(`Synched to finalized block ${lastBlockNum} at slot ${lastBlockSlot}`);
-        await this.startServiceIfSynched();
+            return;
+        }
+        // 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.
+   * @param latestBlock - The block ID 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())
-        });
-        // 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);
-            }
-        }
-        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);
+        await this.txPool.handlePrunedBlocks(latestBlock);
+    }
+    /** Checks if the slot has changed and calls prepareForSlot if so. */ async maybeCallPrepareForSlot() {
+        const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
+        if (currentSlot <= this.lastSlotProcessed) {
+            return;
         }
-        await this.synchedLatestBlockNumber.set(latestBlock);
-    // no need to update block hashes, as they will be updated as new blocks are added
+        this.lastSlotProcessed = currentSlot;
+        await this.txPool.prepareForSlot(currentSlot);
     }
     async startServiceIfSynched() {
         if (this.currentState !== P2PClientState.SYNCHING) {
             return;
         }
-        const syncedFinalizedBlock = await this.getSyncedFinalizedBlockNum();
-        const syncedProvenBlock = await this.getSyncedProvenBlockNum();
-        const syncedLatestBlock = await this.getSyncedLatestBlockNum();
+        const tips = await this.l2Tips.getL2Tips();
+        const syncedFinalizedBlock = tips.finalized.block.number;
+        const syncedProvenBlock = tips.proven.block.number;
+        const syncedLatestBlock = tips.proposed.number;
         if (syncedLatestBlock >= this.latestBlockNumberAtStart && syncedProvenBlock >= this.provenBlockNumberAtStart && syncedFinalizedBlock >= this.finalizedBlockNumberAtStart) {
             this.log.info(`Completed P2P client sync to block ${syncedLatestBlock}. Starting service.`, {
                 syncedLatestBlock,
@@ -685,19 +1002,22 @@ import { P2PClientState } from './interface.js';
         return this.p2pService.validate(txs);
     }
     /**
-   * 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);
+   * 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);
+    }
+    /**
+   * 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);
     }
 }
-_ts_decorate([
-    trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
-            [Attributes.SLOT_NUMBER]: proposal.slotNumber,
-            [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
-            [Attributes.P2P_ID]: (await proposal.p2pMessageLoggingIdentifier()).toString()
-        }))
-], P2PClient.prototype, "broadcastProposal", null);