@aztec/p2p 0.0.1-commit.d3ec352c → 0.0.1-commit.e3c1de76

package/dest/client/p2p_client.js

@@ -1,21 +1,399 @@
-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);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+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 { 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 { 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 {
@@ -26,6 +404,20 @@ import { P2PClientState } from './interface.js';
     _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 +425,7 @@ import { P2PClientState } from './interface.js';
     latestBlockNumberAtStart;
     provenBlockNumberAtStart;
     finalizedBlockNumberAtStart;
-    synchedBlockHashes;
-    synchedLatestBlockNumber;
-    synchedProvenBlockNumber;
-    synchedFinalizedBlockNumber;
+    l2Tips;
     synchedLatestSlot;
     txPool;
     attestationPool;
@@ -52,7 +441,7 @@ import { P2PClientState } from './interface.js';
    * @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 = [];
+        super(telemetry, 'P2PClient'), this.store = store, this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.txCollection = txCollection, this._dateProvider = _dateProvider, this.telemetry = telemetry, this.log = log, this.currentState = (_initProto(this), P2PClientState.IDLE), this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1, this.finalizedBlockNumberAtStart = -1, this.validatorAddresses = [];
         this.config = {
             ...getP2PDefaultConfig(),
             ...config
@@ -61,7 +450,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 +460,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,53 +494,15 @@ 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);
         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}`);
@@ -164,38 +512,33 @@ import { P2PClientState } from './interface.js';
                 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) {
-                        await this.handleFinalizedL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
+                        const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+                        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);
                 break;
+            case 'chain-checkpointed':
+                break;
             default:
                 {
                     const _ = event;
                     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);
@@ -215,13 +558,13 @@ import { P2PClientState } from './interface.js';
         }
         // 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;
-        if (await this.txPool.isEmpty() && (this.attestationPool === undefined || await this.attestationPool?.isEmpty())) {
+        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);
@@ -263,7 +606,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
@@ -289,30 +632,34 @@ 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
+        await this.attestationPool.addBlockProposal(proposal);
         return this.p2pService.propagate(proposal);
     }
-    async broadcastAttestations(attestations) {
-        this.log.verbose(`Broadcasting ${attestations.length} attestations to peers`);
-        await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
+    broadcastCheckpointProposal(proposal) {
+        this.log.verbose(`Broadcasting checkpoint proposal for slot ${proposal.slotNumber} to peers`);
+        return this.p2pService.propagate(proposal);
     }
-    async getAttestationsForSlot(slot, proposalId) {
-        return await (proposalId ? this.attestationPool?.getAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool?.getAttestationsForSlot(slot)) ?? [];
+    async broadcastCheckpointAttestations(attestations) {
+        this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
+        await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
     }
-    addAttestations(attestations) {
-        return this.attestationPool?.addAttestations(attestations) ?? Promise.resolve();
+    async getCheckpointAttestationsForSlot(slot, proposalId) {
+        return await (proposalId ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
     }
-    deleteAttestation(attestation) {
-        return this.attestationPool?.deleteAttestations([
-            attestation
-        ]) ?? Promise.resolve();
+    addCheckpointAttestations(attestations) {
+        return this.attestationPool.addCheckpointAttestations(attestations);
     }
     // 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);
+    }
     /**
    * Uses the batched Request Response protocol to request a set of transactions from the network.
    */ async requestTxsByHash(txHashes, pinnedPeerId) {
@@ -503,16 +850,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);
@@ -538,7 +888,7 @@ import { P2PClientState } from './interface.js';
    */ async markTxsAsMinedFromBlocks(blocks) {
         for (const block of blocks){
             const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
-            await this.txPool.markAsMined(txHashes, block.getBlockHeader());
+            await this.txPool.markAsMined(txHashes, block.header);
         }
     }
     /**
@@ -549,17 +899,12 @@ import { P2PClientState } from './interface.js';
         if (!blocks.length) {
             return Promise.resolve();
         }
-        await this.markTxsAsMinedFromBlocks(blocks.map((b)=>b.block));
-        await this.startCollectingMissingTxs(blocks.map((b)=>b.block));
-        const lastBlock = blocks.at(-1).block;
-        await Promise.all(blocks.map(async (block)=>this.setBlockHash({
-                number: block.block.number,
-                hash: await block.block.hash().then((h)=>h.toString())
-            })));
-        await this.synchedLatestBlockNumber.set(lastBlock.number);
+        await this.markTxsAsMinedFromBlocks(blocks);
+        await this.txPool.clearNonEvictableTxs();
+        await this.startCollectingMissingTxs(blocks);
+        const lastBlock = blocks.at(-1);
         await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
         this.log.verbose(`Synched to latest block ${lastBlock.number}`);
-        await this.startServiceIfSynched();
     }
     /** Request txs for unproven blocks so the prover node has more chances to get them. */ async startCollectingMissingTxs(blocks) {
         try {
@@ -604,10 +949,8 @@ import { P2PClientState } from './interface.js';
             permanently: true
         });
         await this.txPool.cleanupDeletedMinedTxs(lastBlockNum);
-        await this.attestationPool?.deleteAttestationsOlderThan(lastBlockSlot);
-        await this.synchedFinalizedBlockNumber.set(lastBlockNum);
+        await this.attestationPool.deleteCheckpointAttestationsOlderThan(lastBlockSlot);
         this.log.debug(`Synched to finalized block ${lastBlockNum} at slot ${lastBlockSlot}`);
-        await this.startServiceIfSynched();
     }
     /**
    * Updates the tx pool after a chain prune.
@@ -646,19 +989,17 @@ import { P2PClientState } from './interface.js';
             this.log.info(`Deleting ${minedTxsFromReorg.length} mined txs from reorg`);
             await this.txPool.deleteTxs(minedTxsFromReorg);
         } else {
-            this.log.info(`Moving ${minedTxsFromReorg.length} mined txs from reorg back to pending`);
-            await this.txPool.markMinedAsPending(minedTxsFromReorg);
+            await this.txPool.markMinedAsPending(minedTxsFromReorg, latestBlock);
         }
-        await this.synchedLatestBlockNumber.set(latestBlock);
-    // no need to update block hashes, as they will be updated as new blocks are added
     }
     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,
@@ -693,10 +1034,3 @@ import { P2PClientState } from './interface.js';
         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);