@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.24de95ac

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
 export class KvAttestationPool {
@@ -9,15 +9,29 @@ export class KvAttestationPool {
     log;
     metrics;
     attestations;
+    proposals;
     proposalsForSlot;
     attestationsForProposal;
     constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
         this.store = store;
         this.log = log;
+        this.poolStats = async ()=>{
+            return {
+                itemCount: await this.attestations.sizeAsync()
+            };
+        };
         this.attestations = store.openMap('attestations');
+        this.proposals = store.openMap('proposals');
         this.proposalsForSlot = store.openMultiMap('proposals_for_slot');
         this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
+    }
+    poolStats;
+    async isEmpty() {
+        for await (const _ of this.attestations.entriesAsync()){
+            return false;
+        }
+        return true;
     }
     getProposalKey(slot, proposalId) {
         const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
@@ -30,18 +44,41 @@ export class KvAttestationPool {
     async addAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
+                const sender = attestation.getSender();
+                // Skip attestations with invalid signatures
+                if (!sender) {
+                    this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+                        signature: attestation.signature.toString(),
+                        slotNumber,
+                        proposalId
+                    });
+                    continue;
+                }
+                const address = sender.toString();
                 await this.attestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
                 await this.proposalsForSlot.set(slotNumber.toString(), proposalId.toString());
                 await this.attestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
+                this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    address,
+                    proposalId
+                });
             }
         });
-        this.metrics.recordAddedObjects(attestations.length);
     }
-    async getAttestationsForSlot(slot, proposalId) {
+    async getAttestationsForSlot(slot) {
+        const slotFr = new Fr(slot);
+        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+        const attestations = [];
+        for (const proposalId of proposalIds){
+            attestations.push(...await this.getAttestationsForSlotAndProposal(slot, proposalId));
+        }
+        return attestations;
+    }
+    async getAttestationsForSlotAndProposal(slot, proposalId) {
         const attestationIds = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
         const attestations = [];
         // alternatively iterate this.attestaions starting from slot-proposal-EthAddress.zero
@@ -75,11 +112,11 @@ export class KvAttestationPool {
                 for (const attestation of attestations){
                     await this.attestations.delete(attestation);
                 }
+                await this.proposals.delete(proposalId);
                 await this.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
             }
+            this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
         });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
     }
     async deleteAttestationsForSlotAndProposal(slot, proposalId) {
         let numberOfAttestations = 0;
@@ -90,23 +127,64 @@ export class KvAttestationPool {
             for (const attestation of attestations){
                 await this.attestations.delete(attestation);
             }
+            await this.proposals.delete(proposalId);
             await this.proposalsForSlot.deleteValue(slotString, proposalId);
             await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
+            this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
         });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
     }
     async deleteAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
-                await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));
+                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;
+                }
+                const address = sender.toString();
+                const key = this.getAttestationKey(slotNumber, proposalId, address);
+                if (await this.attestations.hasAsync(key)) {
+                    await this.attestations.delete(key);
+                }
                 await this.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
                 this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
             }
         });
-        this.metrics.recordRemovedObjects(attestations.length);
+    }
+    async hasAttestation(attestation) {
+        const slotNumber = attestation.payload.header.slotNumber;
+        const proposalId = attestation.archive;
+        const sender = attestation.getSender();
+        // Attestations with invalid signatures are never in the pool
+        if (!sender) {
+            return false;
+        }
+        const address = sender.toString();
+        const key = this.getAttestationKey(slotNumber, proposalId, address);
+        return await this.attestations.hasAsync(key);
+    }
+    async getBlockProposal(id) {
+        const buffer = await this.proposals.getAsync(id);
+        try {
+            if (buffer && buffer.length > 0) {
+                return BlockProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(undefined);
+    }
+    async hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
+        return await this.proposals.hasAsync(id);
+    }
+    async addBlockProposal(blockProposal) {
+        await this.store.transactionAsync(async ()=>{
+            await this.proposalsForSlot.set(blockProposal.slotNumber.toString(), blockProposal.archive.toString());
+            await this.proposals.set(blockProposal.payload.archive.toString(), blockProposal.toBuffer());
+        });
     }
 }

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

@@ -1,4 +1,4 @@
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
+import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class InMemoryAttestationPool implements AttestationPool {
@@ -6,12 +6,20 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     private log;
     private metrics;
     private attestations;
+    private proposals;
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    private poolStats;
+    isEmpty(): Promise<boolean>;
+    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
     addAttestations(attestations: BlockAttestation[]): Promise<void>;
     deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
     deleteAttestationsForSlot(slot: bigint): Promise<void>;
     deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
     deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
+    hasAttestation(attestation: BlockAttestation): Promise<boolean>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
 }
 //# sourceMappingURL=memory_attestation_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAW/E,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgChE,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/E,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBjF"}
+{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAQ3D,OAAO,CAAC,GAAG;IAPb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;IACpH,OAAO,CAAC,SAAS,CAA6B;gBAG5C,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC;IAOpD,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBnE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAuB/D,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAIhE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;CAIhF"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -5,12 +5,26 @@ export class InMemoryAttestationPool {
     log;
     metrics;
     attestations;
+    proposals;
     constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
         this.log = log;
+        this.poolStats = ()=>{
+            return Promise.resolve({
+                itemCount: this.attestations.size
+            });
+        };
         this.attestations = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.proposals = new Map();
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
-    getAttestationsForSlot(slot, proposalId) {
+    poolStats;
+    isEmpty() {
+        return Promise.resolve(this.attestations.size === 0);
+    }
+    getAttestationsForSlot(slot) {
+        return Promise.resolve(Array.from(this.attestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    }
+    getAttestationsForSlotAndProposal(slot, proposalId) {
         const slotAttestationMap = this.attestations.get(slot);
         if (slotAttestationMap) {
             const proposalAttestationMap = slotAttestationMap.get(proposalId);
@@ -20,19 +34,31 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve([]);
     }
-    async addAttestations(attestations) {
+    addAttestations(attestations) {
         for (const attestation of attestations){
             // Perf: order and group by slot before insertion
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+            const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
-            const address = await attestation.getSender();
+            const sender = attestation.getSender();
+            // Skip attestations with invalid signatures
+            if (!sender) {
+                this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    proposalId
+                });
+                continue;
+            }
             const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
             const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-            proposalAttestationMap.set(address.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
+            proposalAttestationMap.set(sender.toString(), attestation);
+            this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${sender}`, {
+                signature: attestation.signature.toString(),
+                slotNumber,
+                address: sender,
+                proposalId
+            });
         }
-        // TODO: set these to pending or something ????
-        this.metrics.recordAddedObjects(attestations.length);
         return Promise.resolve();
     }
     #getNumberOfAttestationsInSlot(slot) {
@@ -66,9 +92,14 @@ export class InMemoryAttestationPool {
     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 for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
+        this.log.verbose(`Removed ${numberOfAttestations} attestations and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
         return Promise.resolve();
     }
     deleteAttestationsForSlotAndProposal(slot, proposalId) {
@@ -78,28 +109,65 @@ export class InMemoryAttestationPool {
                 const numberOfAttestations = slotAttestationMap.get(proposalId)?.size ?? 0;
                 slotAttestationMap.delete(proposalId);
                 this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-                this.metrics.recordRemovedObjects(numberOfAttestations);
             }
         }
+        this.proposals.delete(proposalId);
         return Promise.resolve();
     }
-    async deleteAttestations(attestations) {
+    deleteAttestations(attestations) {
         for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+            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 address = await attestation.getSender();
-                    proposalAttestationMap.delete(address.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
+                    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}`);
                 }
             }
         }
-        this.metrics.recordRemovedObjects(attestations.length);
         return Promise.resolve();
     }
+    hasAttestation(attestation) {
+        const slotNumber = attestation.payload.header.slotNumber;
+        const proposalId = attestation.archive.toString();
+        const sender = attestation.getSender();
+        // Attestations with invalid signatures are never in the pool
+        if (!sender) {
+            return Promise.resolve(false);
+        }
+        const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+        if (!slotAttestationMap) {
+            return Promise.resolve(false);
+        }
+        const proposalAttestationMap = slotAttestationMap.get(proposalId);
+        if (!proposalAttestationMap) {
+            return Promise.resolve(false);
+        }
+        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

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

@@ -1,7 +1,6 @@
 import type { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation } from '@aztec/stdlib/p2p';
-import { TxHash } from '@aztec/stdlib/tx';
 import { type LocalAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -15,5 +14,5 @@ export declare const generateAccount: () => LocalAccount;
  * @param slot The slot number the attestation is for
  * @returns A Block Attestation
  */
-export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr, txs?: TxHash[]) => Promise<BlockAttestation>;
+export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => BlockAttestation;
 //# sourceMappingURL=mocks.d.ts.map

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;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,KAAK,YAAY,EAA2C,MAAM,eAAe,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAO,YAGlC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAClB,eAAe,SACjB,MAAM,YACH,EAAE,QACN,MAAM,EAAE,KACZ,QAAQ,gBAAgB,CAS1B,CAAC"}
+{"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"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -1,7 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
-import { makeHeader } from '@aztec/stdlib/testing';
-import { TxHash } from '@aztec/stdlib/tx';
+import { makeL2BlockHeader } from '@aztec/stdlib/testing';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 /** Generate Account
  *
@@ -16,18 +15,13 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
  * @param signer A viem signer to create a signature
  * @param slot The slot number the attestation is for
  * @returns A Block Attestation
- */ export const mockAttestation = async (signer, slot = 0, archive = Fr.random(), txs = [
-    0,
-    1,
-    2,
-    3,
-    4,
-    5
-].map(()=>TxHash.random()))=>{
+ */ export const mockAttestation = (signer, slot = 0, archive = Fr.random())=>{
     // Use arbitrary numbers for all other than slot
-    const header = makeHeader(1, 2, slot);
-    const payload = new ConsensusPayload(header, archive, txs);
-    const hash = await getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
-    const signature = signer.sign(hash);
-    return new BlockAttestation(payload, signature);
+    const header = makeL2BlockHeader(1, 2, slot);
+    const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+    const attestationSignature = signer.sign(attestationHash);
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposerSignature = signer.sign(proposalHash);
+    return new BlockAttestation(payload, attestationSignature, proposerSignature);
 };

package/dest/mem_pools/instrumentation.d.ts

@@ -4,27 +4,23 @@ export declare enum PoolName {
     TX_POOL = "TxPool",
     ATTESTATION_POOL = "AttestationPool"
 }
+export type PoolStatsCallback = () => Promise<{
+    itemCount: number | Record<string, number>;
+}>;
 /**
  * Instrumentation class for the Pools (TxPool, AttestationPool, etc).
  */
 export declare class PoolInstrumentation<PoolObject extends Gossipable> {
+    private poolStats;
     /** The number of txs in the mempool */
     private objectsInMempool;
     /** Tracks tx size */
     private objectSize;
     private dbMetrics;
     private defaultAttributes;
-    constructor(telemetry: TelemetryClient, name: PoolName, dbStats?: LmdbStatsCallback);
+    private meter;
+    constructor(telemetry: TelemetryClient, name: PoolName, poolStats: PoolStatsCallback, dbStats?: LmdbStatsCallback);
     recordSize(poolObject: PoolObject): void;
-    /**
-     * Updates the metrics with the new objects.
-     * @param txs - The objects to record
-     */
-    recordAddedObjects(count?: number, status?: string): void;
-    /**
-     * Updates the metrics by removing objects from the mempool.
-     * @param count - The number of objects to remove from the mempool
-     */
-    recordRemovedObjects(count?: number, status?: string): void;
+    private observeStats;
 }
 //# sourceMappingURL=instrumentation.d.ts.map

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,EAIL,KAAK,iBAAiB,EAGtB,KAAK,eAAe,EAErB,MAAM,yBAAyB,CAAC;AAEjC,oBAAY,QAAQ;IAClB,OAAO,WAAW;IAClB,gBAAgB,oBAAoB;CACrC;AA4BD;;GAEG;AACH,qBAAa,mBAAmB,CAAC,UAAU,SAAS,UAAU;IAC5D,uCAAuC;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,qBAAqB;IACrB,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,iBAAiB,CAAC;gBAEd,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAwB5E,UAAU,CAAC,UAAU,EAAE,UAAU;IAIxC;;;OAGG;IACI,kBAAkB,CAAC,KAAK,SAAI,EAAE,MAAM,CAAC,EAAE,MAAM;IAiBpD;;;OAGG;IACI,oBAAoB,CAAC,KAAK,SAAI,EAAE,MAAM,CAAC,EAAE,MAAM;CAgBvD"}
+{"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"}

package/dest/mem_pools/instrumentation.js

@@ -25,60 +25,48 @@ export var PoolName = /*#__PURE__*/ function(PoolName) {
 /**
  * Instrumentation class for the Pools (TxPool, AttestationPool, etc).
  */ export class PoolInstrumentation {
+    poolStats;
     /** The number of txs in the mempool */ objectsInMempool;
     /** Tracks tx size */ objectSize;
     dbMetrics;
     defaultAttributes;
-    constructor(telemetry, name, dbStats){
-        const meter = telemetry.getMeter(name);
+    meter;
+    constructor(telemetry, name, poolStats, dbStats){
+        this.poolStats = poolStats;
+        this.observeStats = async (observer)=>{
+            const { itemCount } = await this.poolStats();
+            if (typeof itemCount === 'number') {
+                observer.observe(this.objectsInMempool, itemCount, this.defaultAttributes);
+            } else {
+                for (const [status, count] of Object.entries(itemCount)){
+                    observer.observe(this.objectsInMempool, count, {
+                        ...this.defaultAttributes,
+                        [Attributes.STATUS]: status
+                    });
+                }
+            }
+        };
+        this.meter = telemetry.getMeter(name);
         this.defaultAttributes = {
             [Attributes.POOL_NAME]: name
         };
         const metricsLabels = getMetricsLabels(name);
-        this.objectsInMempool = meter.createUpDownCounter(metricsLabels.objectInMempool, {
+        this.objectsInMempool = this.meter.createObservableGauge(metricsLabels.objectInMempool, {
             description: 'The current number of transactions in the mempool'
         });
-        this.objectSize = meter.createHistogram(metricsLabels.objectSize, {
+        this.objectSize = this.meter.createHistogram(metricsLabels.objectSize, {
             unit: 'By',
             description: 'The size of transactions in the mempool'
         });
-        this.dbMetrics = new LmdbMetrics(meter, {
+        this.dbMetrics = new LmdbMetrics(this.meter, {
             [Attributes.DB_DATA_TYPE]: 'tx-pool'
         }, dbStats);
+        this.meter.addBatchObservableCallback(this.observeStats, [
+            this.objectsInMempool
+        ]);
     }
     recordSize(poolObject) {
         this.objectSize.record(poolObject.getSize());
     }
-    /**
-   * Updates the metrics with the new objects.
-   * @param txs - The objects to record
-   */ recordAddedObjects(count = 1, status) {
-        if (count < 0) {
-            throw new Error('Count must be positive');
-        }
-        if (count === 0) {
-            return;
-        }
-        const attributes = status ? {
-            ...this.defaultAttributes,
-            [Attributes.STATUS]: status
-        } : this.defaultAttributes;
-        this.objectsInMempool.add(count, attributes);
-    }
-    /**
-   * Updates the metrics by removing objects from the mempool.
-   * @param count - The number of objects to remove from the mempool
-   */ recordRemovedObjects(count = 1, status) {
-        if (count < 0) {
-            throw new Error('Count must be positive');
-        }
-        if (count === 0) {
-            return;
-        }
-        const attributes = status ? {
-            ...this.defaultAttributes,
-            [Attributes.STATUS]: status
-        } : this.defaultAttributes;
-        this.objectsInMempool.add(-1 * count, attributes);
-    }
+    observeStats;
 }