@aztec/p2p 0.57.0 → 0.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -59,11 +59,11 @@
     "testTimeout": 15000
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.57.0",
-    "@aztec/circuits.js": "0.57.0",
-    "@aztec/foundation": "0.57.0",
-    "@aztec/kv-store": "0.57.0",
-    "@aztec/telemetry-client": "0.57.0",
+    "@aztec/circuit-types": "0.58.0",
+    "@aztec/circuits.js": "0.58.0",
+    "@aztec/foundation": "0.58.0",
+    "@aztec/kv-store": "0.58.0",
+    "@aztec/telemetry-client": "0.58.0",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",

package/src/client/index.ts

@@ -5,16 +5,17 @@ import { type DataStoreConfig, createStore } from '@aztec/kv-store/utils';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
-import { type AttestationPool } from '../attestation_pool/attestation_pool.js';
-import { InMemoryAttestationPool } from '../attestation_pool/memory_attestation_pool.js';
 import { P2PClient } from '../client/p2p_client.js';
 import { type P2PConfig } from '../config.js';
-import { type EpochProofQuotePool } from '../epoch_proof_quote_pool/epoch_proof_quote_pool.js';
-import { MemoryEpochProofQuotePool } from '../epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js';
+import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
+import { InMemoryAttestationPool } from '../mem_pools/attestation_pool/memory_attestation_pool.js';
+import { type EpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+import { MemoryEpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js';
+import { type MemPools } from '../mem_pools/interface.js';
+import { AztecKVTxPool, type TxPool } from '../mem_pools/tx_pool/index.js';
 import { DiscV5Service } from '../service/discV5_service.js';
 import { DummyP2PService } from '../service/dummy_service.js';
 import { LibP2PService, createLibP2PPeerId } from '../service/index.js';
-import { AztecKVTxPool, type TxPool } from '../tx_pool/index.js';
 import { getPublicIp, resolveAddressIfNecessary, splitAddressPort } from '../util.js';
 
 export * from './p2p_client.js';
@@ -28,15 +29,18 @@ export const createP2PClient = async (
   deps: {
     txPool?: TxPool;
     store?: AztecKVStore;
-    attestationsPool?: AttestationPool;
+    attestationPool?: AttestationPool;
     epochProofQuotePool?: EpochProofQuotePool;
   } = {},
 ) => {
   let config = { ..._config };
   const store = deps.store ?? (await createStore('p2p', config, createDebugLogger('aztec:p2p:lmdb')));
-  const txPool = deps.txPool ?? new AztecKVTxPool(store, telemetry);
-  const attestationsPool = deps.attestationsPool ?? new InMemoryAttestationPool();
-  const epochProofQuotePool = deps.epochProofQuotePool ?? new MemoryEpochProofQuotePool();
+
+  const mempools: MemPools = {
+    txPool: deps.txPool ?? new AztecKVTxPool(store, telemetry),
+    attestationPool: deps.attestationPool ?? new InMemoryAttestationPool(telemetry),
+    epochProofQuotePool: deps.epochProofQuotePool ?? new MemoryEpochProofQuotePool(telemetry),
+  };
 
   let p2pService;
 
@@ -51,25 +55,17 @@ export const createP2PClient = async (
       config,
       discoveryService,
       peerId,
-      txPool,
-      attestationsPool,
+      mempools,
       l2BlockSource,
       proofVerifier,
       worldStateSynchronizer,
       store,
+      telemetry,
     );
   } else {
     p2pService = new DummyP2PService();
   }
-  return new P2PClient(
-    store,
-    l2BlockSource,
-    txPool,
-    attestationsPool,
-    epochProofQuotePool,
-    p2pService,
-    config.keepProvenTxsInPoolFor,
-  );
+  return new P2PClient(store, l2BlockSource, mempools, p2pService, config.keepProvenTxsInPoolFor, telemetry);
 };
 
 async function configureP2PClientAddresses(_config: P2PConfig & DataStoreConfig): Promise<P2PConfig & DataStoreConfig> {

package/src/client/p2p_client.ts

@@ -4,6 +4,7 @@ import {
   type EpochProofQuote,
   type L2Block,
   L2BlockDownloader,
+  type L2BlockId,
   type L2BlockSource,
   type Tx,
   type TxHash,
@@ -11,15 +12,17 @@ import {
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { type AztecKVStore, type AztecSingleton } from '@aztec/kv-store';
+import { Attributes, type TelemetryClient, WithTracer, trackSpan } from '@aztec/telemetry-client';
 
 import { type ENR } from '@chainsafe/enr';
 
-import { type AttestationPool } from '../attestation_pool/attestation_pool.js';
 import { getP2PConfigEnvVars } from '../config.js';
-import { type EpochProofQuotePool } from '../epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
+import { type EpochProofQuotePool } from '../mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+import { type MemPools } from '../mem_pools/interface.js';
+import { type TxPool } from '../mem_pools/tx_pool/index.js';
 import { TX_REQ_PROTOCOL } from '../service/reqresp/interface.js';
 import type { P2PService } from '../service/service.js';
-import { type TxPool } from '../tx_pool/index.js';
 
 /**
  * Enum defining the possible states of the p2p client.
@@ -42,7 +45,7 @@ export interface P2PSyncState {
   /**
    * The block number that the p2p client is synced to.
    */
-  syncedToL2Block: number;
+  syncedToL2Block: L2BlockId;
 }
 
 /**
@@ -168,7 +171,7 @@ export interface P2P {
 /**
  * The P2P client implementation.
  */
-export class P2PClient implements P2P {
+export class P2PClient extends WithTracer implements P2P {
   /** L2 block download to stay in sync with latest blocks. */
   private latestBlockDownloader: L2BlockDownloader;
 
@@ -190,6 +193,10 @@ export class P2PClient implements P2P {
   private synchedLatestBlockNumber: AztecSingleton<number>;
   private synchedProvenBlockNumber: AztecSingleton<number>;
 
+  private txPool: TxPool;
+  private attestationPool: AttestationPool;
+  private epochProofQuotePool: EpochProofQuotePool;
+
   /**
    * In-memory P2P client constructor.
    * @param store - The client's instance of the KV store.
@@ -202,13 +209,14 @@ export class P2PClient implements P2P {
   constructor(
     store: AztecKVStore,
     private l2BlockSource: L2BlockSource,
-    private txPool: TxPool,
-    private attestationPool: AttestationPool,
-    private epochProofQuotePool: EpochProofQuotePool,
+    mempools: MemPools,
     private p2pService: P2PService,
     private keepProvenTxsFor: number,
+    telemetryClient: TelemetryClient,
     private log = createDebugLogger('aztec:p2p'),
   ) {
+    super(telemetryClient, 'P2PClient');
+
     const { blockCheckIntervalMS: checkInterval, l2QueueSize: p2pL2QueueSize } = getP2PConfigEnvVars();
     const l2DownloaderOpts = { maxQueueSize: p2pL2QueueSize, pollIntervalMS: checkInterval };
     // TODO(palla/prover-node): This effectively downloads blocks twice from the archiver, which is an issue
@@ -219,6 +227,10 @@ export class P2PClient implements P2P {
 
     this.synchedLatestBlockNumber = store.openSingleton('p2p_pool_last_l2_block');
     this.synchedProvenBlockNumber = store.openSingleton('p2p_pool_last_proven_l2_block');
+
+    this.txPool = mempools.txPool;
+    this.attestationPool = mempools.attestationPool;
+    this.epochProofQuotePool = mempools.epochProofQuotePool;
   }
 
   #assertIsReady() {
@@ -311,6 +323,12 @@ export class P2PClient implements P2P {
     this.log.info('P2P client stopped.');
   }
 
+  @trackSpan('p2pClient.broadcastProposal', proposal => ({
+    [Attributes.BLOCK_NUMBER]: proposal.payload.header.globalVariables.blockNumber.toNumber(),
+    [Attributes.SLOT_NUMBER]: proposal.payload.header.globalVariables.slotNumber.toNumber(),
+    [Attributes.BLOCK_ARCHIVE]: proposal.archive.toString(),
+    [Attributes.P2P_ID]: proposal.p2pMessageIdentifier().toString(),
+  }))
   public broadcastProposal(proposal: BlockProposal): void {
     this.log.verbose(`Broadcasting proposal ${proposal.p2pMessageIdentifier()} to peers`);
     return this.p2pService.propagate(proposal);
@@ -455,10 +473,15 @@ export class P2PClient implements P2P {
    * Method to check the status the p2p client.
    * @returns Information about p2p client status: state & syncedToBlockNum.
    */
-  public getStatus(): Promise<P2PSyncState> {
+  public async getStatus(): Promise<P2PSyncState> {
+    const blockNumber = this.getSyncedLatestBlockNum();
+    const blockHash =
+      blockNumber == 0
+        ? ''
+        : await this.l2BlockSource.getBlockHeader(blockNumber).then(header => header?.hash().toString());
     return Promise.resolve({
       state: this.currentState,
-      syncedToL2Block: this.getSyncedLatestBlockNum(),
+      syncedToL2Block: { number: blockNumber, hash: blockHash },
     } as P2PSyncState);
   }
 

package/src/config.ts

@@ -174,12 +174,12 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
     ...numberConfigHelper(1_000),
   },
   tcpListenAddress: {
-    env: 'TCP_LISTEN_ADDR',
+    env: 'P2P_TCP_LISTEN_ADDR',
     defaultValue: '0.0.0.0:40400',
     description: 'The listen address for TCP. Format: <IP_ADDRESS>:<PORT>.',
   },
   udpListenAddress: {
-    env: 'UDP_LISTEN_ADDR',
+    env: 'P2P_UDP_LISTEN_ADDR',
     defaultValue: '0.0.0.0:40400',
     description: 'The listen address for UDP. Format: <IP_ADDRESS>:<PORT>.',
   },

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from './attestation_pool/index.js';
+export * from './mem_pools/attestation_pool/index.js';
 export * from './bootstrap/bootstrap.js';
 export * from './client/index.js';
 export * from './config.js';
-export * from './epoch_proof_quote_pool/index.js';
+export * from './mem_pools/epoch_proof_quote_pool/index.js';
 export * from './service/index.js';
-export * from './tx_pool/index.js';
+export * from './mem_pools/tx_pool/index.js';
 export * from './tx_validator/index.js';

package/src/{attestation_pool → mem_pools/attestation_pool}/memory_attestation_pool.ts

@@ -1,13 +1,19 @@
 import { type BlockAttestation } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
+import { PoolInstrumentation } from '../instrumentation.js';
 import { type AttestationPool } from './attestation_pool.js';
 
 export class InMemoryAttestationPool implements AttestationPool {
+  private metrics: PoolInstrumentation<BlockAttestation>;
+
   private attestations: Map</*slot=*/ bigint, Map</*proposalId*/ string, Map</*address=*/ string, BlockAttestation>>>;
 
-  constructor(private log = createDebugLogger('aztec:attestation_pool')) {
+  constructor(_telemetry: TelemetryClient, private log = createDebugLogger('aztec:attestation_pool')) {
     this.attestations = new Map();
+    this.metrics = new PoolInstrumentation(new NoopTelemetryClient(), 'InMemoryAttestationPool');
   }
 
   public getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
@@ -26,7 +32,7 @@ export class InMemoryAttestationPool implements AttestationPool {
       // Perf: order and group by slot before insertion
       const slotNumber = attestation.payload.header.globalVariables.slotNumber;
 
-      const proposalId = attestation.p2pMessageIdentifier().toString();
+      const proposalId = attestation.archive.toString();
       const address = attestation.getSender();
 
       const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
@@ -35,21 +41,46 @@ export class InMemoryAttestationPool implements AttestationPool {
 
       this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
     }
+
+    // TODO: set these to pending or something ????
+    this.metrics.recordAddedObjects(attestations.length);
     return Promise.resolve();
   }
 
+  #getNumberOfAttestationsInSlot(slot: bigint): number {
+    let total = 0;
+    const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
+
+    if (slotAttestationMap) {
+      for (const proposalAttestationMap of slotAttestationMap.values() ?? []) {
+        total += proposalAttestationMap.size;
+      }
+    }
+    return total;
+  }
+
   public deleteAttestationsForSlot(slot: bigint): Promise<void> {
-    // TODO(md): check if this will free the memory of the inner hash map
+    // We count the number of attestations we are removing
+    const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
+
     this.attestations.delete(slot);
-    this.log.verbose(`Removed attestation for slot ${slot}`);
+    this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
+
+    this.metrics.recordRemovedObjects(numberOfAttestations);
     return Promise.resolve();
   }
 
   public deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void> {
-    const slotAttestationMap = this.attestations.get(slot);
+    const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
     if (slotAttestationMap) {
-      slotAttestationMap.delete(proposalId);
-      this.log.verbose(`Removed attestation for slot ${slot}`);
+      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.metrics.recordRemovedObjects(numberOfAttestations);
+      }
     }
     return Promise.resolve();
   }
@@ -59,7 +90,7 @@ export class InMemoryAttestationPool implements AttestationPool {
       const slotNumber = attestation.payload.header.globalVariables.slotNumber;
       const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
       if (slotAttestationMap) {
-        const proposalId = attestation.p2pMessageIdentifier().toString();
+        const proposalId = attestation.archive.toString();
         const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
         if (proposalAttestationMap) {
           const address = attestation.getSender();
@@ -68,6 +99,7 @@ export class InMemoryAttestationPool implements AttestationPool {
         }
       }
     }
+    this.metrics.recordRemovedObjects(attestations.length);
     return Promise.resolve();
   }
 }

package/src/{epoch_proof_quote_pool → mem_pools/epoch_proof_quote_pool}/memory_epoch_proof_quote_pool.ts

@@ -1,26 +1,42 @@
 import { type EpochProofQuote } from '@aztec/circuit-types';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
+import { PoolInstrumentation } from '../instrumentation.js';
 import { type EpochProofQuotePool } from './epoch_proof_quote_pool.js';
 
 export class MemoryEpochProofQuotePool implements EpochProofQuotePool {
   private quotes: Map<bigint, EpochProofQuote[]>;
-  constructor() {
+  private metrics: PoolInstrumentation<EpochProofQuote>;
+
+  constructor(_telemetry: TelemetryClient) {
     this.quotes = new Map();
+    this.metrics = new PoolInstrumentation(new NoopTelemetryClient(), 'MemoryEpochProofQuotePool');
   }
+
   addQuote(quote: EpochProofQuote) {
     const epoch = quote.payload.epochToProve;
     if (!this.quotes.has(epoch)) {
       this.quotes.set(epoch, []);
     }
     this.quotes.get(epoch)!.push(quote);
+
+    this.metrics.recordAddedObjects(1);
   }
   getQuotes(epoch: bigint): EpochProofQuote[] {
     return this.quotes.get(epoch) || [];
   }
   deleteQuotesToEpoch(epoch: bigint): void {
     const expiredEpochs = Array.from(this.quotes.keys()).filter(k => k <= epoch);
+
+    let removedObjectsCount = 0;
     for (const expiredEpoch of expiredEpochs) {
+      // For logging
+      removedObjectsCount += this.quotes.get(expiredEpoch)?.length || 0;
+
       this.quotes.delete(expiredEpoch);
     }
+
+    this.metrics.recordRemovedObjects(removedObjectsCount);
   }
 }

package/src/mem_pools/index.ts

@@ -0,0 +1,4 @@
+export { TxPool } from './tx_pool/tx_pool.js';
+export { AttestationPool } from './attestation_pool/attestation_pool.js';
+export { EpochProofQuotePool } from './epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+export { type MemPools } from './interface.js';

package/src/mem_pools/instrumentation.ts

@@ -0,0 +1,85 @@
+import { type Gossipable } from '@aztec/circuit-types';
+import { Attributes, type Histogram, Metrics, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client';
+
+/**
+ * Instrumentation class for the Pools (TxPool, AttestationPool, etc).
+ */
+export class PoolInstrumentation<PoolObject extends Gossipable> {
+  /** The number of txs in the mempool */
+  private objectsInMempool: UpDownCounter;
+  /** Tracks tx size */
+  private objectSize: Histogram;
+
+  private defaultAttributes;
+
+  constructor(telemetry: TelemetryClient, name: string) {
+    const meter = telemetry.getMeter(name);
+    this.defaultAttributes = { [Attributes.POOL_NAME]: name };
+
+    this.objectsInMempool = meter.createUpDownCounter(Metrics.MEMPOOL_TX_COUNT, {
+      description: 'The current number of transactions in the mempool',
+    });
+
+    this.objectSize = meter.createHistogram(Metrics.MEMPOOL_TX_SIZE, {
+      unit: 'By',
+      description: 'The size of transactions in the mempool',
+      advice: {
+        explicitBucketBoundaries: [
+          5_000, // 5KB
+          10_000,
+          20_000,
+          50_000,
+          75_000,
+          100_000, // 100KB
+          200_000,
+        ],
+      },
+    });
+  }
+
+  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
+      ? {
+          ...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);
+  }
+}

package/src/mem_pools/interface.ts

@@ -0,0 +1,12 @@
+import { type AttestationPool } from './attestation_pool/attestation_pool.js';
+import { type EpochProofQuotePool } from './epoch_proof_quote_pool/epoch_proof_quote_pool.js';
+import { type TxPool } from './tx_pool/tx_pool.js';
+
+/**
+ * A interface the combines all mempools
+ */
+export interface MemPools {
+  txPool: TxPool;
+  attestationPool: AttestationPool;
+  epochProofQuotePool: EpochProofQuotePool;
+}

package/src/{tx_pool → mem_pools/tx_pool}/aztec_kv_tx_pool.ts

@@ -4,7 +4,7 @@ import { type Logger, createDebugLogger } from '@aztec/foundation/log';
 import { type AztecKVStore, type AztecMap, type AztecSet } from '@aztec/kv-store';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 
-import { TxPoolInstrumentation } from './instrumentation.js';
+import { PoolInstrumentation } from '../instrumentation.js';
 import { type TxPool } from './tx_pool.js';
 
 /**
@@ -23,7 +23,7 @@ export class AztecKVTxPool implements TxPool {
 
   #log: Logger;
 
-  #metrics: TxPoolInstrumentation;
+  #metrics: PoolInstrumentation<Tx>;
 
   /**
    * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
@@ -37,7 +37,7 @@ export class AztecKVTxPool implements TxPool {
 
     this.#store = store;
     this.#log = log;
-    this.#metrics = new TxPoolInstrumentation(telemetry, 'AztecKVTxPool');
+    this.#metrics = new PoolInstrumentation(telemetry, 'AztecKVTxPool');
   }
 
   public markAsMined(txHashes: TxHash[]): Promise<void> {
@@ -51,8 +51,8 @@ export class AztecKVTxPool implements TxPool {
           void this.#pendingTxs.delete(key);
         }
       }
-      this.#metrics.recordRemovedTxs('pending', deleted);
-      this.#metrics.recordAddedTxs('mined', txHashes.length);
+      this.#metrics.recordRemovedObjects(deleted, 'pending');
+      this.#metrics.recordAddedObjects(txHashes.length, 'mined');
     });
   }
 
@@ -107,11 +107,11 @@ export class AztecKVTxPool implements TxPool {
           pendingCount++;
           // REFACTOR: Use an lmdb conditional write to avoid race conditions with this write tx
           void this.#pendingTxs.add(key);
-          this.#metrics.recordTxSize(tx);
+          this.#metrics.recordSize(tx);
         }
       }
 
-      this.#metrics.recordAddedTxs('pending', pendingCount);
+      this.#metrics.recordAddedObjects(pendingCount, 'pending');
     });
   }
 
@@ -138,8 +138,8 @@ export class AztecKVTxPool implements TxPool {
         }
       }
 
-      this.#metrics.recordRemovedTxs('pending', pendingDeleted);
-      this.#metrics.recordRemovedTxs('mined', minedDeleted);
+      this.#metrics.recordRemovedObjects(pendingDeleted, 'pending');
+      this.#metrics.recordRemovedObjects(minedDeleted, 'mined');
     });
   }
 

package/src/{tx_pool → mem_pools/tx_pool}/memory_tx_pool.ts

@@ -3,7 +3,7 @@ import { type TxAddedToPoolStats } from '@aztec/circuit-types/stats';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 
-import { TxPoolInstrumentation } from './instrumentation.js';
+import { PoolInstrumentation } from '../instrumentation.js';
 import { type TxPool } from './tx_pool.js';
 
 /**
@@ -17,7 +17,7 @@ export class InMemoryTxPool implements TxPool {
   private minedTxs: Set<bigint>;
   private pendingTxs: Set<bigint>;
 
-  private metrics: TxPoolInstrumentation;
+  private metrics: PoolInstrumentation<Tx>;
 
   /**
    * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
@@ -27,7 +27,7 @@ export class InMemoryTxPool implements TxPool {
     this.txs = new Map<bigint, Tx>();
     this.minedTxs = new Set();
     this.pendingTxs = new Set();
-    this.metrics = new TxPoolInstrumentation(telemetry, 'InMemoryTxPool');
+    this.metrics = new PoolInstrumentation(telemetry, 'InMemoryTxPool');
   }
 
   public markAsMined(txHashes: TxHash[]): Promise<void> {
@@ -36,8 +36,8 @@ export class InMemoryTxPool implements TxPool {
       this.minedTxs.add(key);
       this.pendingTxs.delete(key);
     }
-    this.metrics.recordRemovedTxs('pending', txHashes.length);
-    this.metrics.recordAddedTxs('mined', txHashes.length);
+    this.metrics.recordRemovedObjects(txHashes.length, 'pending');
+    this.metrics.recordAddedObjects(txHashes.length, 'mined');
     return Promise.resolve();
   }
 
@@ -88,12 +88,12 @@ export class InMemoryTxPool implements TxPool {
       this.txs.set(key, tx);
       if (!this.minedTxs.has(key)) {
         pending++;
-        this.metrics.recordTxSize(tx);
+        this.metrics.recordSize(tx);
         this.pendingTxs.add(key);
       }
     }
 
-    this.metrics.recordAddedTxs('pending', pending);
+    this.metrics.recordAddedObjects(pending, 'pending');
     return Promise.resolve();
   }
 
@@ -113,8 +113,8 @@ export class InMemoryTxPool implements TxPool {
       deletedMined += this.minedTxs.delete(key) ? 1 : 0;
     }
 
-    this.metrics.recordRemovedTxs('pending', deletedPending);
-    this.metrics.recordRemovedTxs('mined', deletedMined);
+    this.metrics.recordRemovedObjects(deletedPending, 'pending');
+    this.metrics.recordRemovedObjects(deletedMined, 'mined');
 
     return Promise.resolve();
   }