@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.c2595eba

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -1,58 +1,93 @@
 import { createLogger } from '@aztec/foundation/log';
 import { getTelemetryClient } from '@aztec/telemetry-client';
+import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation_pool.js';
 export class InMemoryAttestationPool {
     log;
     metrics;
-    attestations;
     proposals;
+    // Checkpoint attestations
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+    checkpointAttestations;
+    checkpointProposals;
     constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
         this.log = log;
         this.poolStats = ()=>{
             return Promise.resolve({
-                itemCount: this.attestations.size
+                itemCount: this.checkpointAttestations.size
             });
         };
-        this.attestations = new Map();
         this.proposals = new Map();
+        this.checkpointAttestations = new Map();
+        this.checkpointProposals = new Map();
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
     poolStats;
     isEmpty() {
-        return Promise.resolve(this.attestations.size === 0);
+        return Promise.resolve(this.checkpointAttestations.size === 0 && this.proposals.size === 0);
     }
-    getAttestationsForSlot(slot) {
-        return Promise.resolve(Array.from(this.attestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    addBlockProposal(blockProposal) {
+        // Strip signedTxs before storing to avoid holding full tx data in memory
+        this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
+        return Promise.resolve();
     }
-    getAttestationsForSlotAndProposal(slot, proposalId) {
-        const slotAttestationMap = this.attestations.get(slot);
-        if (slotAttestationMap) {
-            const proposalAttestationMap = slotAttestationMap.get(proposalId);
-            if (proposalAttestationMap) {
-                return Promise.resolve(Array.from(proposalAttestationMap.values()));
-            }
+    getBlockProposal(id) {
+        return Promise.resolve(this.proposals.get(id));
+    }
+    hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return Promise.resolve(this.proposals.has(id));
+    }
+    canAddProposal(_block) {
+        // TODO(palla/mbps): See when to allow
+        return Promise.resolve(true);
+    }
+    // Checkpoint attestation methods
+    async addCheckpointProposal(proposal) {
+        if (!await this.canAddCheckpointProposal(proposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum checkpoint proposals per slot reached: slot=${proposal.slotNumber} cap=${MAX_PROPOSALS_PER_SLOT} proposal=${proposal.archive.toString()}`);
         }
-        return Promise.resolve([]);
+        // Extract and validate the block proposal if present
+        const blockProposal = proposal.getBlockProposal();
+        if (blockProposal && !await this.canAddProposal(blockProposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum block proposals per slot reached when extracting from checkpoint: slot=${proposal.slotNumber} proposal=${blockProposal.archive.toString()}`);
+        }
+        const slotProposalMapping = getCheckpointSlotOrDefault(this.checkpointAttestations, proposal.slotNumber);
+        slotProposalMapping.set(proposal.archive.toString(), new Map());
+        // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
+        this.checkpointProposals.set(proposal.archive.toString(), proposal.toCore());
+        // Store the extracted block proposal separately
+        if (blockProposal) {
+            this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
+        }
+        return Promise.resolve();
     }
-    addAttestations(attestations) {
+    getCheckpointProposal(id) {
+        return Promise.resolve(this.checkpointProposals.get(id));
+    }
+    hasCheckpointProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return Promise.resolve(this.checkpointProposals.has(id));
+    }
+    addCheckpointAttestations(attestations) {
         for (const attestation of attestations){
-            // Perf: order and group by slot before insertion
             const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
             const sender = attestation.getSender();
             // Skip attestations with invalid signatures
             if (!sender) {
-                this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+                this.log.warn(`Skipping checkpoint attestation with invalid signature for slot ${slotNumber}`, {
                     signature: attestation.signature.toString(),
                     slotNumber,
                     proposalId
                 });
                 continue;
             }
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
-            const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
+            const slotAttestationMap = getCheckpointSlotOrDefault(this.checkpointAttestations, slotNumber);
+            const proposalAttestationMap = getCheckpointProposalOrDefault(slotAttestationMap, proposalId);
             proposalAttestationMap.set(sender.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${sender}`, {
+            this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${sender}`, {
                 signature: attestation.signature.toString(),
                 slotNumber,
                 address: sender,
@@ -61,22 +96,22 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve();
     }
-    #getNumberOfAttestationsInSlot(slot) {
-        let total = 0;
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
+    getCheckpointAttestationsForSlot(slot) {
+        return Promise.resolve(Array.from(this.checkpointAttestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    }
+    getCheckpointAttestationsForSlotAndProposal(slot, proposalId) {
+        const slotAttestationMap = this.checkpointAttestations.get(slot);
         if (slotAttestationMap) {
-            for (const proposalAttestationMap of slotAttestationMap.values() ?? []){
-                total += proposalAttestationMap.size;
+            const proposalAttestationMap = slotAttestationMap.get(proposalId);
+            if (proposalAttestationMap) {
+                return Promise.resolve(Array.from(proposalAttestationMap.values()));
             }
         }
-        return total;
+        return Promise.resolve([]);
     }
-    async deleteAttestationsOlderThan(oldestSlot) {
+    deleteCheckpointAttestationsOlderThan(oldestSlot) {
         const olderThan = [];
-        // Entries are iterated in insertion order, so we can break as soon as we find a slot that is older than the oldestSlot.
-        // Note: this will only prune correctly if attestations are added in order of rising slot, it is important that we do not allow
-        // insertion of attestations that are old. #(https://github.com/AztecProtocol/aztec-packages/issues/10322)
-        const slots = this.attestations.keys();
+        const slots = this.checkpointAttestations.keys();
         for (const slot of slots){
             if (slot < oldestSlot) {
                 olderThan.push(slot);
@@ -85,57 +120,32 @@ export class InMemoryAttestationPool {
             }
         }
         for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(oldSlot);
+            const proposalIds = this.checkpointAttestations.get(oldSlot)?.keys();
+            proposalIds?.forEach((proposalId)=>this.checkpointProposals.delete(proposalId));
+            this.checkpointAttestations.delete(oldSlot);
         }
         return Promise.resolve();
     }
-    deleteAttestationsForSlot(slot) {
-        // We count the number of attestations we are removing
-        const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
-        const proposalIdsToDelete = this.attestations.get(slot)?.keys();
-        let proposalIdsToDeleteCount = 0;
-        proposalIdsToDelete?.forEach((proposalId)=>{
-            this.proposals.delete(proposalId);
-            proposalIdsToDeleteCount++;
-        });
-        this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
-        return Promise.resolve();
+    hasReachedCheckpointProposalCap(slot) {
+        const slotAttestationMap = this.checkpointAttestations.get(slot);
+        const proposalCount = slotAttestationMap?.size ?? 0;
+        return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
     }
-    deleteAttestationsForSlotAndProposal(slot, proposalId) {
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
-        if (slotAttestationMap) {
-            if (slotAttestationMap.has(proposalId)) {
-                const numberOfAttestations = slotAttestationMap.get(proposalId)?.size ?? 0;
-                slotAttestationMap.delete(proposalId);
-                this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-            }
-        }
-        this.proposals.delete(proposalId);
-        return Promise.resolve();
+    hasReachedCheckpointAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        const count = this.checkpointAttestations.get(slot)?.get(proposalId)?.size ?? 0;
+        return Promise.resolve(limit <= 0 || count >= limit);
     }
-    deleteAttestations(attestations) {
-        for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
-            if (slotAttestationMap) {
-                const proposalId = attestation.archive.toString();
-                const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-                if (proposalAttestationMap) {
-                    const sender = attestation.getSender();
-                    // Skip attestations with invalid signatures
-                    if (!sender) {
-                        this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber.toBigInt()}`);
-                        continue;
-                    }
-                    proposalAttestationMap.delete(sender.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${sender}`);
-                }
-            }
-        }
-        return Promise.resolve();
+    async canAddCheckpointProposal(proposal) {
+        return this.checkpointProposals.has(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
     }
-    hasAttestation(attestation) {
+    async canAddCheckpointAttestation(attestation, committeeSize) {
+        const sender = attestation.getSender();
+        const slot = attestation.payload.header.slotNumber;
+        const pid = attestation.archive.toString();
+        return !!sender && ((this.checkpointAttestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) || !await this.hasReachedCheckpointAttestationCap(slot, pid, committeeSize));
+    }
+    hasCheckpointAttestation(attestation) {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive.toString();
         const sender = attestation.getSender();
@@ -143,7 +153,7 @@ export class InMemoryAttestationPool {
         if (!sender) {
             return Promise.resolve(false);
         }
-        const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+        const slotAttestationMap = this.checkpointAttestations.get(slotNumber);
         if (!slotAttestationMap) {
             return Promise.resolve(false);
         }
@@ -153,43 +163,16 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve(proposalAttestationMap.has(sender.toString()));
     }
-    addBlockProposal(blockProposal) {
-        // We initialize slot-proposal mapping if it does not exist
-        // This is important to ensure we can delete this proposal if there were not attestations for it
-        const slotProposalMapping = getSlotOrDefault(this.attestations, blockProposal.slotNumber.toBigInt());
-        slotProposalMapping.set(blockProposal.payload.archive.toString(), new Map());
-        this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
-        return Promise.resolve();
-    }
-    getBlockProposal(id) {
-        return Promise.resolve(this.proposals.get(id));
-    }
-    hasBlockProposal(idOrProposal) {
-        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
-        return Promise.resolve(this.proposals.has(id));
-    }
 }
-/**
- * Get Slot or Default
- *
- * Fetch the slot mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param slot - The slot to fetch
- * @returns The slot mapping
- */ function getSlotOrDefault(map, slot) {
+// Checkpoint attestation helper functions
+function getCheckpointSlotOrDefault(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+map, slot) {
     if (!map.has(slot)) {
         map.set(slot, new Map());
     }
     return map.get(slot);
 }
-/**
- * Get Proposal or Default
- *
- * Fetch the proposal mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param proposalId - The proposal id to fetch
- * @returns The proposal mapping
- */ function getProposalOrDefault(map, proposalId) {
+function getCheckpointProposalOrDefault(map, proposalId) {
     if (!map.has(proposalId)) {
         map.set(proposalId, new Map());
     }

package/dest/mem_pools/attestation_pool/mocks.d.ts

@@ -1,18 +1,242 @@
-import type { Secp256k1Signer } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
-import { type LocalAccount } from 'viem/accounts';
+import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { CheckpointAttestation } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 /** Generate Account
  *
  * Create a random signer
  * @returns A random viem signer
  */
-export declare const generateAccount: () => LocalAccount;
-/** Mock Attestation
+export declare const generateAccount: () => {
+    address: `0x${string}`;
+    nonceManager?: import("viem/accounts").NonceManager | undefined;
+    sign?: ((parameters: {
+        hash: `0x${string}`;
+    }) => Promise<`0x${string}`>) | undefined;
+    signAuthorization?: ((parameters: import("viem").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>) | undefined;
+    signMessage: ({ message }: {
+        message: import("viem").SignableMessage;
+    }) => Promise<`0x${string}`>;
+    signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
+        serializer?: serializer | undefined;
+    } | undefined) => Promise<`0x${string}`>;
+    signTypedData: <const typedData extends Record<string, unknown> | {
+        [x: string]: readonly import("viem").TypedDataParameter[];
+        [x: `address[${string}]`]: undefined;
+        [x: `bool[${string}]`]: undefined;
+        [x: `bytes10[${string}]`]: undefined;
+        [x: `bytes11[${string}]`]: undefined;
+        [x: `bytes12[${string}]`]: undefined;
+        [x: `bytes13[${string}]`]: undefined;
+        [x: `bytes14[${string}]`]: undefined;
+        [x: `bytes15[${string}]`]: undefined;
+        [x: `bytes16[${string}]`]: undefined;
+        [x: `bytes17[${string}]`]: undefined;
+        [x: `bytes18[${string}]`]: undefined;
+        [x: `bytes19[${string}]`]: undefined;
+        [x: `bytes1[${string}]`]: undefined;
+        [x: `bytes20[${string}]`]: undefined;
+        [x: `bytes21[${string}]`]: undefined;
+        [x: `bytes22[${string}]`]: undefined;
+        [x: `bytes23[${string}]`]: undefined;
+        [x: `bytes24[${string}]`]: undefined;
+        [x: `bytes25[${string}]`]: undefined;
+        [x: `bytes26[${string}]`]: undefined;
+        [x: `bytes27[${string}]`]: undefined;
+        [x: `bytes28[${string}]`]: undefined;
+        [x: `bytes29[${string}]`]: undefined;
+        [x: `bytes2[${string}]`]: undefined;
+        [x: `bytes30[${string}]`]: undefined;
+        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes32[${string}]`]: undefined;
+        [x: `bytes3[${string}]`]: undefined;
+        [x: `bytes4[${string}]`]: undefined;
+        [x: `bytes5[${string}]`]: undefined;
+        [x: `bytes6[${string}]`]: undefined;
+        [x: `bytes7[${string}]`]: undefined;
+        [x: `bytes8[${string}]`]: undefined;
+        [x: `bytes9[${string}]`]: undefined;
+        [x: `bytes[${string}]`]: undefined;
+        [x: `function[${string}]`]: undefined;
+        [x: `int104[${string}]`]: undefined;
+        [x: `int112[${string}]`]: undefined;
+        [x: `int120[${string}]`]: undefined;
+        [x: `int128[${string}]`]: undefined;
+        [x: `int136[${string}]`]: undefined;
+        [x: `int144[${string}]`]: undefined;
+        [x: `int152[${string}]`]: undefined;
+        [x: `int160[${string}]`]: undefined;
+        [x: `int168[${string}]`]: undefined;
+        [x: `int16[${string}]`]: undefined;
+        [x: `int176[${string}]`]: undefined;
+        [x: `int184[${string}]`]: undefined;
+        [x: `int192[${string}]`]: undefined;
+        [x: `int200[${string}]`]: undefined;
+        [x: `int208[${string}]`]: undefined;
+        [x: `int216[${string}]`]: undefined;
+        [x: `int224[${string}]`]: undefined;
+        [x: `int232[${string}]`]: undefined;
+        [x: `int240[${string}]`]: undefined;
+        [x: `int248[${string}]`]: undefined;
+        [x: `int24[${string}]`]: undefined;
+        [x: `int256[${string}]`]: undefined;
+        [x: `int32[${string}]`]: undefined;
+        [x: `int40[${string}]`]: undefined;
+        [x: `int48[${string}]`]: undefined;
+        [x: `int56[${string}]`]: undefined;
+        [x: `int64[${string}]`]: undefined;
+        [x: `int72[${string}]`]: undefined;
+        [x: `int80[${string}]`]: undefined;
+        [x: `int88[${string}]`]: undefined;
+        [x: `int8[${string}]`]: undefined;
+        [x: `int96[${string}]`]: undefined;
+        [x: `int[${string}]`]: undefined;
+        [x: `string[${string}]`]: undefined;
+        [x: `uint104[${string}]`]: undefined;
+        [x: `uint112[${string}]`]: undefined;
+        [x: `uint120[${string}]`]: undefined;
+        [x: `uint128[${string}]`]: undefined;
+        [x: `uint136[${string}]`]: undefined;
+        [x: `uint144[${string}]`]: undefined;
+        [x: `uint152[${string}]`]: undefined;
+        [x: `uint160[${string}]`]: undefined;
+        [x: `uint168[${string}]`]: undefined;
+        [x: `uint16[${string}]`]: undefined;
+        [x: `uint176[${string}]`]: undefined;
+        [x: `uint184[${string}]`]: undefined;
+        [x: `uint192[${string}]`]: undefined;
+        [x: `uint200[${string}]`]: undefined;
+        [x: `uint208[${string}]`]: undefined;
+        [x: `uint216[${string}]`]: undefined;
+        [x: `uint224[${string}]`]: undefined;
+        [x: `uint232[${string}]`]: undefined;
+        [x: `uint240[${string}]`]: undefined;
+        [x: `uint248[${string}]`]: undefined;
+        [x: `uint24[${string}]`]: undefined;
+        [x: `uint256[${string}]`]: undefined;
+        [x: `uint32[${string}]`]: undefined;
+        [x: `uint40[${string}]`]: undefined;
+        [x: `uint48[${string}]`]: undefined;
+        [x: `uint56[${string}]`]: undefined;
+        [x: `uint64[${string}]`]: undefined;
+        [x: `uint72[${string}]`]: undefined;
+        [x: `uint80[${string}]`]: undefined;
+        [x: `uint88[${string}]`]: undefined;
+        [x: `uint8[${string}]`]: undefined;
+        [x: `uint96[${string}]`]: undefined;
+        [x: `uint[${string}]`]: undefined;
+        address?: undefined;
+        bool?: undefined;
+        bytes?: undefined;
+        bytes1?: undefined;
+        bytes10?: undefined;
+        bytes11?: undefined;
+        bytes12?: undefined;
+        bytes13?: undefined;
+        bytes14?: undefined;
+        bytes15?: undefined;
+        bytes16?: undefined;
+        bytes17?: undefined;
+        bytes18?: undefined;
+        bytes19?: undefined;
+        bytes2?: undefined;
+        bytes20?: undefined;
+        bytes21?: undefined;
+        bytes22?: undefined;
+        bytes23?: undefined;
+        bytes24?: undefined;
+        bytes25?: undefined;
+        bytes26?: undefined;
+        bytes27?: undefined;
+        bytes28?: undefined;
+        bytes29?: undefined;
+        bytes3?: undefined;
+        bytes30?: undefined;
+        bytes31?: undefined;
+        bytes32?: undefined;
+        bytes4?: undefined;
+        bytes5?: undefined;
+        bytes6?: undefined;
+        bytes7?: undefined;
+        bytes8?: undefined;
+        bytes9?: undefined;
+        int104?: undefined;
+        int112?: undefined;
+        int120?: undefined;
+        int128?: undefined;
+        int136?: undefined;
+        int144?: undefined;
+        int152?: undefined;
+        int16?: undefined;
+        int160?: undefined;
+        int168?: undefined;
+        int176?: undefined;
+        int184?: undefined;
+        int192?: undefined;
+        int200?: undefined;
+        int208?: undefined;
+        int216?: undefined;
+        int224?: undefined;
+        int232?: undefined;
+        int24?: undefined;
+        int240?: undefined;
+        int248?: undefined;
+        int256?: undefined;
+        int32?: undefined;
+        int40?: undefined;
+        int48?: undefined;
+        int56?: undefined;
+        int64?: undefined;
+        int72?: undefined;
+        int8?: undefined;
+        int80?: undefined;
+        int88?: undefined;
+        int96?: undefined;
+        string?: undefined;
+        uint104?: undefined;
+        uint112?: undefined;
+        uint120?: undefined;
+        uint128?: undefined;
+        uint136?: undefined;
+        uint144?: undefined;
+        uint152?: undefined;
+        uint16?: undefined;
+        uint160?: undefined;
+        uint168?: undefined;
+        uint176?: undefined;
+        uint184?: undefined;
+        uint192?: undefined;
+        uint200?: undefined;
+        uint208?: undefined;
+        uint216?: undefined;
+        uint224?: undefined;
+        uint232?: undefined;
+        uint24?: undefined;
+        uint240?: undefined;
+        uint248?: undefined;
+        uint256?: undefined;
+        uint32?: undefined;
+        uint40?: undefined;
+        uint48?: undefined;
+        uint56?: undefined;
+        uint64?: undefined;
+        uint72?: undefined;
+        uint8?: undefined;
+        uint80?: undefined;
+        uint88?: undefined;
+        uint96?: undefined;
+    }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
+    publicKey: `0x${string}`;
+    source: string;
+    type: "local";
+};
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
+ * @param archive The archive root (defaults to random)
+ * @param header The checkpoint header (defaults to random with given slot)
+ * @returns A Checkpoint Attestation
  */
-export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => BlockAttestation;
-//# sourceMappingURL=mocks.d.ts.map
+export declare const mockCheckpointAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr, header?: CheckpointHeader | undefined) => CheckpointAttestation;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLHFCQUFxQixFQUl0QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSXhEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBRzNCLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsZUFBTyxNQUFNLHlCQUF5Qix3SEFtQnJDLENBQUMifQ==

package/dest/mem_pools/attestation_pool/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,eAAe,EACvB,OAAM,MAAU,EAChB,UAAS,EAAgB,KACxB,gBAYF,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,qBAAqB,EAItB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG3B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,wHAmBrC,CAAC"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -1,6 +1,7 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
-import { makeL2BlockHeader } from '@aztec/stdlib/testing';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { CheckpointAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -10,18 +11,21 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
     const privateKey = generatePrivateKey();
     return privateKeyToAccount(privateKey);
 };
-/** Mock Attestation
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
- */ export const mockAttestation = (signer, slot = 0, archive = Fr.random())=>{
-    // Use arbitrary numbers for all other than slot
-    const header = makeL2BlockHeader(1, 2, slot);
-    const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
-    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+ * @param archive The archive root (defaults to random)
+ * @param header The checkpoint header (defaults to random with given slot)
+ * @returns A Checkpoint Attestation
+ */ export const mockCheckpointAttestation = (signer, slot = 0, archive = Fr.random(), header)=>{
+    header = header ?? CheckpointHeader.random({
+        slotNumber: SlotNumber(slot)
+    });
+    const payload = new ConsensusPayload(header, archive);
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointAttestation);
     const attestationSignature = signer.sign(attestationHash);
-    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointProposal);
     const proposerSignature = signer.sign(proposalHash);
-    return new BlockAttestation(payload, attestationSignature, proposerSignature);
+    return new CheckpointAttestation(payload, attestationSignature, proposerSignature);
 };

package/dest/mem_pools/index.d.ts

@@ -1,4 +1,4 @@
 export { type AttestationPool } from './attestation_pool/attestation_pool.js';
 export { type MemPools } from './interface.js';
 export { type TxPool } from './tx_pool/tx_pool.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZW1fcG9vbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDOUUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDL0MsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sc0JBQXNCLENBQUMifQ==

package/dest/mem_pools/instrumentation.d.ts

@@ -1,4 +1,5 @@
 import type { Gossipable } from '@aztec/stdlib/p2p';
+import type { Tx } from '@aztec/stdlib/tx';
 import { type LmdbStatsCallback, type TelemetryClient } from '@aztec/telemetry-client';
 export declare enum PoolName {
     TX_POOL = "TxPool",
@@ -14,13 +15,20 @@ export declare class PoolInstrumentation<PoolObject extends Gossipable> {
     private poolStats;
     /** The number of txs in the mempool */
     private objectsInMempool;
+    private addObjectCounter;
     /** Tracks tx size */
     private objectSize;
+    /** Track delay between transaction added and evicted */
+    private minedDelay;
     private dbMetrics;
     private defaultAttributes;
     private meter;
+    private txAddedTimestamp;
     constructor(telemetry: TelemetryClient, name: PoolName, poolStats: PoolStatsCallback, dbStats?: LmdbStatsCallback);
     recordSize(poolObject: PoolObject): void;
+    incrementAddedObjects(count: number): void;
+    transactionsAdded(transactions: Tx[]): void;
+    transactionsRemoved(hashes: Iterable<bigint> | Iterable<string>): void;
     private observeStats;
 }
-//# sourceMappingURL=instrumentation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWVtX3Bvb2xzL2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzQyxPQUFPLEVBS0wsS0FBSyxpQkFBaUIsRUFLdEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFFakMsb0JBQVksUUFBUTtJQUNsQixPQUFPLFdBQVc7SUFDbEIsZ0JBQWdCLG9CQUFvQjtDQUNyQztBQWtDRCxNQUFNLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxPQUFPLENBQUM7SUFDNUMsU0FBUyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0NBQzVDLENBQUMsQ0FBQztBQUVIOztHQUVHO0FBQ0gscUJBQWEsbUJBQW1CLENBQUMsVUFBVSxTQUFTLFVBQVU7SUFtQjFELE9BQU8sQ0FBQyxTQUFTO0lBbEJuQix1Q0FBdUM7SUFDdkMsT0FBTyxDQUFDLGdCQUFnQixDQUFrQjtJQUMxQyxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBQ3hDLHFCQUFxQjtJQUNyQixPQUFPLENBQUMsVUFBVSxDQUFZO0lBQzlCLHdEQUF3RDtJQUN4RCxPQUFPLENBQUMsVUFBVSxDQUFZO0lBRTlCLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGlCQUFpQixDQUFDO0lBQzFCLE9BQU8sQ0FBQyxLQUFLLENBQVE7SUFFckIsT0FBTyxDQUFDLGdCQUFnQixDQUFrRDtJQUUxRSxZQUNFLFNBQVMsRUFBRSxlQUFlLEVBQzFCLElBQUksRUFBRSxRQUFRLEVBQ04sU0FBUyxFQUFFLGlCQUFpQixFQUNwQyxPQUFPLENBQUMsRUFBRSxpQkFBaUIsRUF3QjVCO0lBRU0sVUFBVSxDQUFDLFVBQVUsRUFBRSxVQUFVLFFBRXZDO0lBRU0scUJBQXFCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFekM7SUFFTSxpQkFBaUIsQ0FBQyxZQUFZLEVBQUUsRUFBRSxFQUFFLFFBSzFDO0lBRU0sbUJBQW1CLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBWXJFO0lBRUQsT0FBTyxDQUFDLFlBQVksQ0FZbEI7Q0FDSCJ9

package/dest/mem_pools/instrumentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/mem_pools/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAKL,KAAK,iBAAiB,EAKtB,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,oBAAY,QAAQ;IAClB,OAAO,WAAW;IAClB,gBAAgB,oBAAoB;CACrC;AA4BD,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,mBAAmB,CAAC,UAAU,SAAS,UAAU;IAc1D,OAAO,CAAC,SAAS;IAbnB,uCAAuC;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,qBAAqB;IACrB,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,iBAAiB,CAAC;IAC1B,OAAO,CAAC,KAAK,CAAQ;gBAGnB,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,QAAQ,EACN,SAAS,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,iBAAiB;IA2BtB,UAAU,CAAC,UAAU,EAAE,UAAU;IAIxC,OAAO,CAAC,YAAY,CAYlB;CACH"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/mem_pools/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAKL,KAAK,iBAAiB,EAKtB,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,oBAAY,QAAQ;IAClB,OAAO,WAAW;IAClB,gBAAgB,oBAAoB;CACrC;AAkCD,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,mBAAmB,CAAC,UAAU,SAAS,UAAU;IAmB1D,OAAO,CAAC,SAAS;IAlBnB,uCAAuC;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,qBAAqB;IACrB,OAAO,CAAC,UAAU,CAAY;IAC9B,wDAAwD;IACxD,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,iBAAiB,CAAC;IAC1B,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,gBAAgB,CAAkD;IAE1E,YACE,SAAS,EAAE,eAAe,EAC1B,IAAI,EAAE,QAAQ,EACN,SAAS,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,iBAAiB,EAwB5B;IAEM,UAAU,CAAC,UAAU,EAAE,UAAU,QAEvC;IAEM,qBAAqB,CAAC,KAAK,EAAE,MAAM,QAEzC;IAEM,iBAAiB,CAAC,YAAY,EAAE,EAAE,EAAE,QAK1C;IAEM,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,QAYrE;IAED,OAAO,CAAC,YAAY,CAYlB;CACH"}