@aztec/p2p 0.87.6 → 0.87.8

package/dest/services/tx_collector.js

@@ -1,11 +1,51 @@
 import { compactArray } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { TxCollectorInstrumentation } from './tx_collect_instrumentation.js';
 export class TxCollector {
     p2pClient;
     log;
-    constructor(p2pClient, log = createLogger('p2p:tx-collector')){
+    instrumentation;
+    constructor(p2pClient, log = createLogger('p2p:tx-collector'), client = getTelemetryClient()){
         this.p2pClient = p2pClient;
         this.log = log;
+        this.instrumentation = new TxCollectorInstrumentation(client, 'TxCollector');
+    }
+    // Checks the proposal for transactions we don't already have, validates them and adds them to our pool
+    async collectFromProposal(proposal) {
+        // Does this proposal have any transactions?
+        if (!proposal.txs || proposal.txs.length === 0) {
+            return 0;
+        }
+        const proposalHashes = new Set((proposal.payload.txHashes ?? []).map((txHash)=>txHash.toString()));
+        // Get the transactions from the proposal and their hashes
+        // also, we are only interested in txs that are part of the proposal
+        const txsFromProposal = compactArray(await Promise.all(proposal.txs.map((tx)=>tx === undefined ? Promise.resolve(undefined) : tx.getTxHash().then((hash)=>({
+                    txHash: hash,
+                    tx
+                }))))).filter((tx)=>proposalHashes.has(tx.txHash.toString()));
+        // Of the transactions from the proposal, retrieve those that we have in the pool already
+        const txsToValidate = [];
+        const txsWeAlreadyHave = await this.p2pClient.getTxsByHashFromPool(txsFromProposal.map((tx)=>tx.txHash));
+        // Txs we already have will have holes where we did not find them
+        // Where that is the case we need to validate the tx in the proposal
+        for(let i = 0; i < txsWeAlreadyHave.length; i++){
+            if (txsWeAlreadyHave[i] === undefined) {
+                txsToValidate.push(txsFromProposal[i].tx);
+            }
+        }
+        // Now validate all the transactions from the proposal that we don't have
+        // This will throw if any of the transactions are invalid, this is probably correct, if someone sends us a proposal with invalid
+        // transactions we probably shouldn't spend any more effort on it
+        try {
+            await this.p2pClient.validate(txsToValidate);
+        } catch (err) {
+            this.log.error(`Received proposal with invalid transactions, skipping`);
+            throw err;
+        }
+        // Now store these transactions in our pool, provided these are the txs in proposal.payload.txHashes they will be pinned already
+        await this.p2pClient.addTxsToPool(txsToValidate);
+        return txsToValidate.length;
     }
     async collectForBlockProposal(proposal, peerWhoSentTheProposal) {
         if (proposal.payload.txHashes.length === 0) {
@@ -14,57 +54,32 @@ export class TxCollector {
                 txs: []
             };
         }
-        // Is this a new style proposal?
-        if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
-            // Yes, any txs that we already have we should use
-            this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
-            // Request from the pool based on the signed hashes in the payload
-            const hashesFromPayload = proposal.payload.txHashes;
-            const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
-            const missingTxs = txsToUse.filter((tx)=>tx === undefined).length;
-            if (missingTxs > 0) {
-                this.log.verbose(`Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`);
-            }
-            let usedFromProposal = 0;
-            // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
-            for(let i = 0; i < txsToUse.length; i++){
-                if (txsToUse[i] === undefined) {
-                    // We don't have the transaction, take from the proposal, provided the hash is the same
-                    const hashOfTxInProposal = await proposal.txs[i].getTxHash();
-                    if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
-                        // Hash is equal, we can use the tx from the proposal
-                        txsToUse[i] = proposal.txs[i];
-                        usedFromProposal++;
-                    } else {
-                        this.log.warn(`Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[i].toString()}`);
-                    }
-                }
-            }
-            // See if we still have any holes, if there are then we were not successful and will try the old method
-            if (txsToUse.some((tx)=>tx === undefined)) {
-                this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
-            } else {
-                this.log.info(`Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`);
-                await this.p2pClient.validate(txsToUse);
-                return {
-                    txs: txsToUse
-                };
-            }
-        }
-        this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
-        // Old style proposal, we will perform a request by hash from pool
-        // This will request from network any txs that are missing
+        const txsInMempool = (await this.p2pClient.hasTxsInPool(proposal.payload.txHashes)).filter(Boolean).length;
+        this.instrumentation.incTxsFromMempool(txsInMempool);
+        // Take txs from the proposal if there are any
+        const txTakenFromProposal = await this.collectFromProposal(proposal);
+        this.instrumentation.incTxsFromProposals(txTakenFromProposal);
+        // Now get the txs we need, either from the pool or the p2p network
         const txHashes = proposal.payload.txHashes;
-        // This part is just for logging that we are requesting from the network
-        const availability = await this.p2pClient.hasTxsInPool(txHashes);
-        const notAvailable = availability.filter((availability)=>availability === false);
-        if (notAvailable.length) {
-            this.log.verbose(`Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`);
-        }
         // This will request from the network any txs that are missing
-        const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes, peerWhoSentTheProposal);
-        const missingTxs = compactArray(retrievedTxs.map((tx, index)=>tx === undefined ? txHashes[index] : undefined));
-        await this.p2pClient.validate(retrievedTxs);
+        // NOTE: this could still return missing txs so we need to (1) be careful to handle undefined and (2) keep the txs in the correct order for re-execution
+        const maybeRetrievedTxs = await this.p2pClient.getTxsByHash(txHashes, peerWhoSentTheProposal);
+        // Get the txs that we didn't get from the network, if any. This will be empty if we got them al
+        const missingTxs = compactArray(maybeRetrievedTxs.map((tx, index)=>tx === undefined ? txHashes[index] : undefined));
+        this.instrumentation.incMissingTxs(missingTxs.length);
+        const txsFromP2P = txHashes.length - txTakenFromProposal - txsInMempool - missingTxs.length;
+        this.instrumentation.incTxsFromP2P(txsFromP2P);
+        // if we found all txs, this is a noop. If we didn't find all txs then tell the validator to skip attestations because missingTxs.length > 0
+        const retrievedTxs = compactArray(maybeRetrievedTxs);
+        this.log.info(`Retrieved ${retrievedTxs.length}/${txHashes.length} txs for block proposal`, {
+            blockNumber: proposal.blockNumber.toNumber(),
+            slotNumber: proposal.slotNumber.toNumber(),
+            totalTxsInProposal: txHashes.length,
+            txsFromProposal: txTakenFromProposal,
+            txsFromMempool: txsInMempool,
+            txsFromP2P,
+            missingTxs: missingTxs.length
+        });
         return {
             txs: retrievedTxs,
             missing: missingTxs

package/dest/test-helpers/reqresp-nodes.d.ts

@@ -49,9 +49,11 @@ export declare const stopNodes: (nodes: ReqRespNode[]) => Promise<void>;
 export declare const createReqResp: (peerScoring: PeerScoring, rateLimits?: Partial<ReqRespSubProtocolRateLimits>) => Promise<ReqRespNode>;
 export declare const connectToPeers: (nodes: ReqRespNode[]) => Promise<void>;
 export declare class AlwaysTrueCircuitVerifier implements ClientProtocolCircuitVerifier {
+    stop(): Promise<void>;
     verifyProof(_tx: Tx): Promise<boolean>;
 }
 export declare class AlwaysFalseCircuitVerifier implements ClientProtocolCircuitVerifier {
+    stop(): Promise<void>;
     verifyProof(_tx: Tx): Promise<boolean>;
 }
 export declare function createBootstrapNodeConfig(privateKey: string, port: number, chainConfig: ChainConfig): BootnodeConfig;

package/dest/test-helpers/reqresp-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reqresp-nodes.d.ts","sourceRoot":"","sources":["../../src/test-helpers/reqresp-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAM7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAKhD,OAAO,EAAE,KAAK,MAAM,EAAoC,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,cAAc,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EAElC,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAGzD;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,GAAE,MAAM,EAAO,EAC5B,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,eAAe,GAAE,OAAe,EAChC,KAAK,GAAE,OAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,aAAa,EACnE,UAAU,EAAE,CAAC,EACb,aAAa,EAAE,MAAM,EAAE,YAAK,EAC5B,QAAQ,EAAE,aAAa,GAAG,kBAAkB,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,SAAS,EAAE,eAAe,EAC1B,IAAI,GAAE,MAAU,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,GAAE,WAA8B,6BAgC5C;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAGF,eAAO,MAAM,0BAA0B,EAAE,0BAMxC,CAAC;AAIF,eAAO,MAAM,4BAA4B,EAAE,4BAM1C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,aAAa,WAAW,EACxB,eAAe,MAAM,EACrB,aAAY,OAAO,CAAC,4BAA4B,CAAM,KACrD,OAAO,CAAC,WAAW,EAAE,CAEvB,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,OAAO,WAAW,EAAE,EACpB,gDAAgD,EAChD,oDAAoD,kBAKrD,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,OAAO,WAAW,EAAE,KAAG,OAAO,CAAC,IAAI,CAGlE,CAAC;AAGF,eAAO,MAAM,aAAa,GACxB,aAAa,WAAW,EACxB,aAAY,OAAO,CAAC,4BAA4B,CAAM,KACrD,OAAO,CAAC,WAAW,CAQrB,CAAC;AAGF,eAAO,MAAM,cAAc,GAAU,OAAO,WAAW,EAAE,KAAG,OAAO,CAAC,IAAI,CAUvE,CAAC;AAGF,qBAAa,yBAA0B,YAAW,6BAA6B;IAC7E,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGvC;AACD,qBAAa,0BAA2B,YAAW,6BAA6B;IAC9E,WAAW,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGvC;AAGD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,cAAc,CAWpH;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,eAAsC,EACjD,WAAW,GAAE,WAA8B,GAC1C,OAAO,CAAC,aAAa,CAAC,CAGxB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,wBAOzE;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,eAAsC,EACjD,WAAW,GAAE,WAA8B,GAC1C,OAAO,CAAC,aAAa,CAAC,CAKxB"}
+{"version":3,"file":"reqresp-nodes.d.ts","sourceRoot":"","sources":["../../src/test-helpers/reqresp-nodes.ts"],"names":[],"mappings":"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"}

package/dest/test-helpers/reqresp-nodes.js

@@ -154,11 +154,17 @@ export const connectToPeers = async (nodes)=>{
 };
 // Mock circuit verifier for testing - reimplementation from bb to avoid dependency
 export class AlwaysTrueCircuitVerifier {
+    stop() {
+        return Promise.resolve();
+    }
     verifyProof(_tx) {
         return Promise.resolve(true);
     }
 }
 export class AlwaysFalseCircuitVerifier {
+    stop() {
+        return Promise.resolve();
+    }
     verifyProof(_tx) {
         return Promise.resolve(false);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.87.6",
+  "version": "0.87.8",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -63,16 +63,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.87.6",
-    "@aztec/epoch-cache": "0.87.6",
-    "@aztec/foundation": "0.87.6",
-    "@aztec/kv-store": "0.87.6",
-    "@aztec/noir-contracts.js": "0.87.6",
-    "@aztec/noir-protocol-circuits-types": "0.87.6",
-    "@aztec/protocol-contracts": "0.87.6",
-    "@aztec/simulator": "0.87.6",
-    "@aztec/stdlib": "0.87.6",
-    "@aztec/telemetry-client": "0.87.6",
+    "@aztec/constants": "0.87.8",
+    "@aztec/epoch-cache": "0.87.8",
+    "@aztec/foundation": "0.87.8",
+    "@aztec/kv-store": "0.87.8",
+    "@aztec/noir-contracts.js": "0.87.8",
+    "@aztec/noir-protocol-circuits-types": "0.87.8",
+    "@aztec/protocol-contracts": "0.87.8",
+    "@aztec/simulator": "0.87.8",
+    "@aztec/stdlib": "0.87.8",
+    "@aztec/telemetry-client": "0.87.8",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
@@ -101,7 +101,7 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.87.6",
+    "@aztec/archiver": "0.87.8",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^22.15.17",

package/src/client/interface.ts

@@ -78,7 +78,7 @@ export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApi<T> & {
    * Adds transactions to the pool. Does not send to peers or validate the tx.
    * @param txs - The transactions.
    **/
-  addTxs(txs: Tx[]): Promise<void>;
+  addTxsToPool(txs: Tx[]): Promise<void>;
 
   /**
    * Deletes 'txs' from the pool, given hashes.

package/src/client/p2p_client.ts

@@ -444,7 +444,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   /**
    * Returns transactions in the transaction pool by hash.
    * @param txHashes - Hashes of the transactions to look for.
-   * @returns The txs found, not necessarily on the same order as the hashes.
+   * @returns The txs found, in the same order as the requested hashes. If a tx is not found, it will be undefined.
    */
   getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
     return this.txPool.getTxsByHash(txHashes);
@@ -527,7 +527,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @returns Empty promise.
    **/
   public async sendTx(tx: Tx): Promise<void> {
-    await this.addTxs([tx]);
+    await this.addTxsToPool([tx]);
     await this.p2pService.propagate(tx);
   }
 
@@ -535,7 +535,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * Adds transactions to the pool. Does not send to peers or validate the txs.
    * @param txs - The transactions.
    **/
-  public async addTxs(txs: Tx[]): Promise<void> {
+  public async addTxsToPool(txs: Tx[]): Promise<void> {
     this.#assertIsReady();
     await this.txPool.addTxs(txs);
   }

package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts

@@ -49,9 +49,6 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     await ap.addAttestations(attestations);
 
-    // Check metrics have been updated.
-    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-
     const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
     expect(retrievedAttestations.length).toBe(attestations.length);
     compareAttestations(retrievedAttestations, attestations);
@@ -63,7 +60,6 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     // Add another one
     const newAttestation = mockAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
     await ap.addAttestations([newAttestation]);
-    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(1);
     const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(
       BigInt(slotNumber),
       archive.toString(),
@@ -76,7 +72,6 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     // Delete by slot
     await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-    expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length + 1);
 
     const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(
       BigInt(slotNumber),
@@ -154,16 +149,12 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     await ap.addAttestations(attestations);
 
-    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-
     const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
     compareAttestations(retreivedAttestations, attestations);
 
     await ap.deleteAttestations(attestations);
 
-    expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-
     const gottenAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(gottenAfterDelete.length).toBe(0);
   });
@@ -200,17 +191,12 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     await ap.addAttestations(attestations);
     await ap.addAttestations(attestations2);
 
-    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-    expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations2.length);
-
     const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
     compareAttestations(retreivedAttestations, attestations);
 
     await ap.deleteAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
 
-    expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-
     const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
 

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -5,7 +5,7 @@ import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@azte
 import { BlockAttestation } from '@aztec/stdlib/p2p';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+import { PoolInstrumentation, PoolName, type PoolStatsCallback } from '../instrumentation.js';
 import type { AttestationPool } from './attestation_pool.js';
 
 export class KvAttestationPool implements AttestationPool {
@@ -24,9 +24,15 @@ export class KvAttestationPool implements AttestationPool {
     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);
   }
 
+  private poolStats: PoolStatsCallback = async () => {
+    return {
+      itemCount: await this.attestations.sizeAsync(),
+    };
+  };
+
   public async isEmpty(): Promise<boolean> {
     for await (const _ of this.attestations.entriesAsync()) {
       return false;
@@ -73,8 +79,6 @@ export class KvAttestationPool implements AttestationPool {
         });
       }
     });
-
-    this.metrics.recordAddedObjects(attestations.length);
   }
 
   public async getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
@@ -135,10 +139,9 @@ export class KvAttestationPool implements AttestationPool {
 
         await this.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
       }
-    });
 
-    this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-    this.metrics.recordRemovedObjects(numberOfAttestations);
+      this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
+    });
   }
 
   public async deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void> {
@@ -156,10 +159,9 @@ export class KvAttestationPool implements AttestationPool {
 
       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.metrics.recordRemovedObjects(numberOfAttestations);
+      this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
+    });
   }
 
   public async deleteAttestations(attestations: BlockAttestation[]): Promise<void> {
@@ -168,8 +170,12 @@ export class KvAttestationPool implements AttestationPool {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive;
         const address = attestation.getSender().toString();
+        const key = this.getAttestationKey(slotNumber, proposalId, address);
+
+        if (await this.attestations.hasAsync(key)) {
+          await this.attestations.delete(key);
+        }
 
-        await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));
         await this.attestationsForProposal.deleteValue(
           this.getProposalKey(slotNumber, proposalId),
           this.getAttestationKey(slotNumber, proposalId, address),
@@ -178,6 +184,5 @@ export class KvAttestationPool implements AttestationPool {
         this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
       }
     });
-    this.metrics.recordRemovedObjects(attestations.length);
   }
 }

package/src/mem_pools/attestation_pool/memory_attestation_pool.ts

@@ -2,7 +2,7 @@ import { createLogger } from '@aztec/foundation/log';
 import type { BlockAttestation } from '@aztec/stdlib/p2p';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+import { PoolInstrumentation, PoolName, type PoolStatsCallback } from '../instrumentation.js';
 import type { AttestationPool } from './attestation_pool.js';
 
 export class InMemoryAttestationPool implements AttestationPool {
@@ -15,9 +15,15 @@ export class InMemoryAttestationPool implements AttestationPool {
     private log = createLogger('p2p:attestation_pool'),
   ) {
     this.attestations = new Map();
-    this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+    this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
   }
 
+  private poolStats: PoolStatsCallback = () => {
+    return Promise.resolve({
+      itemCount: this.attestations.size,
+    });
+  };
+
   public isEmpty(): Promise<boolean> {
     return Promise.resolve(this.attestations.size === 0);
   }
@@ -61,8 +67,6 @@ export class InMemoryAttestationPool implements AttestationPool {
       });
     }
 
-    // TODO: set these to pending or something ????
-    this.metrics.recordAddedObjects(attestations.length);
     return Promise.resolve();
   }
 
@@ -106,7 +110,6 @@ export class InMemoryAttestationPool implements AttestationPool {
     this.attestations.delete(slot);
     this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
 
-    this.metrics.recordRemovedObjects(numberOfAttestations);
     return Promise.resolve();
   }
 
@@ -119,7 +122,6 @@ export class InMemoryAttestationPool implements AttestationPool {
         slotAttestationMap.delete(proposalId);
 
         this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
       }
     }
     return Promise.resolve();
@@ -139,7 +141,6 @@ export class InMemoryAttestationPool implements AttestationPool {
         }
       }
     }
-    this.metrics.recordRemovedObjects(attestations.length);
     return Promise.resolve();
   }
 }

package/src/mem_pools/instrumentation.ts

@@ -1,13 +1,15 @@
 import type { Gossipable } from '@aztec/stdlib/p2p';
 import {
   Attributes,
+  type BatchObservableResult,
   type Histogram,
   LmdbMetrics,
   type LmdbStatsCallback,
+  type Meter,
   Metrics,
   type MetricsType,
+  type ObservableGauge,
   type TelemetryClient,
-  type UpDownCounter,
 } from '@aztec/telemetry-client';
 
 export enum PoolName {
@@ -41,86 +43,70 @@ function getMetricsLabels(name: PoolName): MetricsLabels {
   throw new Error('Invalid pool type');
 }
 
+export type PoolStatsCallback = () => Promise<{
+  itemCount: number | Record<string, number>;
+}>;
+
 /**
  * Instrumentation class for the Pools (TxPool, AttestationPool, etc).
  */
 export class PoolInstrumentation<PoolObject extends Gossipable> {
   /** The number of txs in the mempool */
-  private objectsInMempool: UpDownCounter;
+  private objectsInMempool: ObservableGauge;
   /** Tracks tx size */
   private objectSize: Histogram;
 
   private dbMetrics: LmdbMetrics;
 
   private defaultAttributes;
-
-  constructor(telemetry: TelemetryClient, name: PoolName, dbStats?: LmdbStatsCallback) {
-    const meter = telemetry.getMeter(name);
+  private meter: Meter;
+
+  constructor(
+    telemetry: TelemetryClient,
+    name: PoolName,
+    private poolStats: PoolStatsCallback,
+    dbStats?: LmdbStatsCallback,
+  ) {
+    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.meter,
       {
         [Attributes.DB_DATA_TYPE]: 'tx-pool',
       },
       dbStats,
     );
+
+    this.meter.addBatchObservableCallback(this.observeStats, [this.objectsInMempool]);
   }
 
   public recordSize(poolObject: PoolObject) {
     this.objectSize.record(poolObject.getSize());
   }
 
-  /**
-   * Updates the metrics with the new objects.
-   * @param txs - The objects to record
-   */
-  public recordAddedObjects(count = 1, status?: string) {
-    if (count < 0) {
-      throw new Error('Count must be positive');
-    }
-    if (count === 0) {
-      return;
-    }
-    const attributes = status
-      ? {
+  private observeStats = async (observer: BatchObservableResult) => {
+    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.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
-   */
-  public recordRemovedObjects(count = 1, status?: string) {
-    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);
-  }
+  };
 }