@aztec/p2p 0.0.1-commit.a072138 → 0.0.1-commit.a89ec08

package/src/testbench/p2p_client_testbench_worker.ts

@@ -19,7 +19,7 @@ import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { type BlockProposal, P2PClientType, P2PMessage } from '@aztec/stdlib/p2p';
+import { type BlockProposal, P2PMessage } from '@aztec/stdlib/p2p';
 import { ChonkProof } from '@aztec/stdlib/proofs';
 import { makeAztecAddress, makeBlockHeader, makeBlockProposal, mockTx } from '@aztec/stdlib/testing';
 import { Tx, TxHash, type TxValidationResult } from '@aztec/stdlib/tx';
@@ -29,22 +29,19 @@ import type { Message, PeerId } from '@libp2p/interface';
 import { TopicValidatorResult } from '@libp2p/interface';
 import { peerIdFromString } from '@libp2p/peer-id';
 
-import type { P2PClient } from '../client/p2p_client.js';
+import type { P2PClient } from '../client/index.js';
 import type { P2PConfig } from '../config.js';
 import { createP2PClient } from '../index.js';
-import type { MemPools } from '../mem_pools/interface.js';
-import { LibP2PService } from '../services/libp2p/libp2p_service.js';
+import type { MemPools } from '../mem_pools/index.js';
+import { BatchTxRequesterCollector, LibP2PService, SendBatchRequestCollector } from '../services/index.js';
 import type { PeerManager } from '../services/peer-manager/peer_manager.js';
 import type { BatchTxRequesterLibP2PService } from '../services/reqresp/batch-tx-requester/interface.js';
 import type { IBatchRequestTxValidator } from '../services/reqresp/batch-tx-requester/tx_validator.js';
 import { RateLimitStatus } from '../services/reqresp/rate-limiter/rate_limiter.js';
 import type { ReqResp } from '../services/reqresp/reqresp.js';
 import type { PeerDiscoveryService } from '../services/service.js';
-import {
-  BatchTxRequesterCollector,
-  SendBatchRequestCollector,
-} from '../services/tx_collection/proposal_tx_collector.js';
-import { AlwaysTrueCircuitVerifier } from '../test-helpers/reqresp-nodes.js';
+import { MissingTxsTracker } from '../services/tx_collection/missing_txs_tracker.js';
+import { AlwaysTrueCircuitVerifier } from '../test-helpers/index.js';
 import {
   BENCHMARK_CONSTANTS,
   type CollectorType,
@@ -55,7 +52,7 @@ import {
   createMockEpochCache,
   createMockWorldStateSynchronizer,
   filterTxsByDistribution,
-} from '../test-helpers/testbench-utils.js';
+} from '../test-helpers/index.js';
 import type { PubSubLibp2p } from '../util.js';
 
 export type { DistributionPattern, CollectorType } from '../test-helpers/testbench-utils.js';
@@ -89,12 +86,11 @@ export interface BenchReadyMessage {
 }
 const txCache = new Map<number, Tx[]>();
 
-class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends LibP2PService<T> {
+class TestLibP2PService extends LibP2PService {
   private disableTxValidation: boolean;
   private gossipMessageCount = 0;
 
   constructor(
-    clientType: T,
     config: P2PConfig,
     node: PubSubLibp2p,
     peerDiscoveryService: PeerDiscoveryService,
@@ -110,7 +106,6 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
     disableTxValidation = true,
   ) {
     super(
-      clientType,
       config,
       node,
       peerDiscoveryService,
@@ -144,7 +139,7 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
       const txHash = tx.getTxHash();
       const txHashString = txHash.toString();
       this.logger.verbose(`Received tx ${txHashString} from external peer ${source.toString()}.`);
-      await this.mempools.txPool.addTxs([tx]);
+      await this.mempools.txPool.addPendingTxs([tx]);
     } else {
       await super.handleGossipedTx(payload, msgId, source);
     }
@@ -166,7 +161,7 @@ async function generateDeterministicTxs(txCount: number, seed: number, config: P
     return cached.slice(0, txCount);
   }
 
-  const includeByTimestampBase = BigInt(seed);
+  const expirationTimestampBase = BigInt(seed);
   for (let i = cached.length; i < txCount; i++) {
     const txSeed = seed * 10000 + i;
     const tx = await mockTx(txSeed, {
@@ -182,7 +177,7 @@ async function generateDeterministicTxs(txCount: number, seed: number, config: P
       hasPublicTeardownCallRequest: false,
       publicCalldataSize: 0,
     });
-    tx.data.includeByTimestamp = includeByTimestampBase + BigInt(i);
+    tx.data.expirationTimestamp = expirationTimestampBase + BigInt(i);
     await tx.recomputeHash();
     cached.push(tx);
   }
@@ -277,7 +272,12 @@ async function runAggregatorBenchmark(
         new DateProvider(),
         noopTxValidator,
       );
-      const fetchedTxs = await collector.collectTxs(txHashes, blockProposal, pinnedPeer, timeoutMs);
+      const fetchedTxs = await collector.collectTxs(
+        MissingTxsTracker.fromArray(txHashes),
+        blockProposal,
+        pinnedPeer,
+        timeoutMs,
+      );
       const durationMs = timer.ms();
       return {
         type: 'BENCH_RESULT',
@@ -292,7 +292,12 @@ async function runAggregatorBenchmark(
       BENCHMARK_CONSTANTS.FIXED_MAX_PEERS,
       BENCHMARK_CONSTANTS.FIXED_MAX_RETRY_ATTEMPTS,
     );
-    const fetchedTxs = await collector.collectTxs(txHashes, blockProposal, pinnedPeer, timeoutMs);
+    const fetchedTxs = await collector.collectTxs(
+      MissingTxsTracker.fromArray(txHashes),
+      blockProposal,
+      pinnedPeer,
+      timeoutMs,
+    );
     const durationMs = timer.ms();
     return {
       type: 'BENCH_RESULT',
@@ -335,6 +340,7 @@ process.on('message', async msg => {
       const config: P2PConfig = {
         ...rawConfig,
         peerIdPrivateKey: rawConfig.peerIdPrivateKey ? new SecretValue(rawConfig.peerIdPrivateKey) : undefined,
+        priceBumpPercentage: 10n,
       } as P2PConfig;
 
       workerConfig = config;
@@ -358,7 +364,6 @@ process.on('message', async msg => {
       };
 
       const client = await createP2PClient(
-        P2PClientType.Full,
         config as P2PConfig & DataStoreConfig,
         l2BlockSource,
         proofVerifier as ClientProtocolCircuitVerifier,
@@ -371,7 +376,6 @@ process.on('message', async msg => {
       );
 
       const testService = new TestLibP2PService(
-        P2PClientType.Full,
         config,
         (client as any).p2pService.node,
         (client as any).p2pService.peerDiscoveryService,
@@ -447,7 +451,7 @@ process.on('message', async msg => {
         const txHashes = allTxs.map(tx => tx.getTxHash());
         const blockProposal = await createBlockProposal(benchCmd.blockNumber, txHashes, benchCmd.seed);
 
-        await workerAttestationPool.addBlockProposal(blockProposal);
+        await workerAttestationPool.tryAddBlockProposal(blockProposal);
         workerLogger.debug(
           `[BENCH] Added block proposal with archive ${blockProposal.archive.toString().slice(0, 10)}...`,
         );

package/src/testbench/worker_client_manager.ts

@@ -81,13 +81,15 @@ class WorkerClientManager {
    * Note: We send the raw peerIdPrivateKey string instead of SecretValue
    * because SecretValue.toJSON() returns '[Redacted]', losing the value.
    * The worker must re-wrap it in SecretValue.
+   * We also omit priceBumpPercentage since it's a bigint and can't be
+   * serialized over IPC (which uses JSON under the hood).
    */
   private createClientConfig(
     clientIndex: number,
     port: number,
     otherNodes: string[],
-  ): Omit<P2PConfig, 'peerIdPrivateKey'> & { peerIdPrivateKey: string } & Partial<ChainConfig> {
-    return {
+  ): Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & { peerIdPrivateKey: string } & Partial<ChainConfig> {
+    const { priceBumpPercentage: _, ...config } = {
       ...getP2PDefaultConfig(),
       p2pEnabled: true,
       peerIdPrivateKey: this.peerIdPrivateKeys[clientIndex],
@@ -96,7 +98,10 @@ class WorkerClientManager {
       p2pPort: port,
       bootstrapNodes: [...otherNodes],
       ...this.p2pConfig,
-    } as Omit<P2PConfig, 'peerIdPrivateKey'> & { peerIdPrivateKey: string } & Partial<ChainConfig>;
+    };
+    return config as Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & {
+      peerIdPrivateKey: string;
+    } & Partial<ChainConfig>;
   }
 
   /**
@@ -104,7 +109,9 @@ class WorkerClientManager {
    * Config uses raw string for peerIdPrivateKey (not SecretValue) for IPC serialization.
    */
   private spawnWorkerProcess(
-    config: Omit<P2PConfig, 'peerIdPrivateKey'> & { peerIdPrivateKey: string } & Partial<ChainConfig>,
+    config: Omit<P2PConfig, 'peerIdPrivateKey' | 'priceBumpPercentage'> & {
+      peerIdPrivateKey: string;
+    } & Partial<ChainConfig>,
     clientIndex: number,
   ): [ChildProcess, Promise<void>] {
     const useCompiled = existsSync(workerJsPath);

package/src/util.ts

@@ -23,7 +23,13 @@ export interface PubSubLibp2p extends Pick<Libp2p, 'status' | 'start' | 'stop' |
   services: {
     pubsub: Pick<
       GossipSub,
-      'addEventListener' | 'removeEventListener' | 'publish' | 'subscribe' | 'reportMessageValidationResult' | 'direct'
+      | 'addEventListener'
+      | 'removeEventListener'
+      | 'publish'
+      | 'subscribe'
+      | 'reportMessageValidationResult'
+      | 'direct'
+      | 'getMeshPeers'
     > & { score: Pick<GossipSub['score'], 'score'> };
   };
 }

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

@@ -1,40 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockProposal, CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore } from '@aztec/stdlib/p2p';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { AttestationPool } from './attestation_pool.js';
-export declare const MAX_PROPOSALS_PER_SLOT = 5;
-export declare const ATTESTATION_CAP_BUFFER = 10;
-export declare class KvAttestationPool implements AttestationPool {
-    private store;
-    private log;
-    private metrics;
-    private proposals;
-    private checkpointAttestations;
-    private checkpointProposals;
-    private checkpointProposalsForSlot;
-    private checkpointAttestationsForProposal;
-    constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    private poolStats;
-    isEmpty(): Promise<boolean>;
-    private getProposalKey;
-    private getAttestationKey;
-    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
-    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
-    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
-    addCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
-    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
-    hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean>;
-    addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
-    getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
-    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
-    deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
-    private deleteCheckpointAttestationsForSlot;
-    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
-    canAddProposal(_block: BlockProposal): Promise<boolean>;
-    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
-    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
-    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
-    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2t2X2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTdELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFDTCxhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixLQUFLLHNCQUFzQixFQUM1QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUluRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU3RCxlQUFPLE1BQU0sc0JBQXNCLElBQUksQ0FBQztBQUN4QyxlQUFPLE1BQU0sc0JBQXNCLEtBQUssQ0FBQztBQUV6QyxxQkFBYSxpQkFBa0IsWUFBVyxlQUFlO0lBZXJELE9BQU8sQ0FBQyxLQUFLO0lBRWIsT0FBTyxDQUFDLEdBQUc7SUFoQmIsT0FBTyxDQUFDLE9BQU8sQ0FBNkM7SUFFNUQsT0FBTyxDQUFDLFNBQVMsQ0FHZjtJQUdGLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBZ0M7SUFDOUQsT0FBTyxDQUFDLG1CQUFtQixDQUFnQztJQUMzRCxPQUFPLENBQUMsMEJBQTBCLENBQXFDO0lBQ3ZFLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBcUM7SUFFOUUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ2hDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxHQUFHLHlDQUF5QyxFQVdyRDtJQUVELE9BQU8sQ0FBQyxTQUFTLENBSWY7SUFFVyxPQUFPLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVF2QztJQUVELE9BQU8sQ0FBQyxjQUFjO0lBWXRCLE9BQU8sQ0FBQyxpQkFBaUI7SUFJWixnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNekU7SUFFWSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBVzVFO0lBRVksZ0JBQWdCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUdwRjtJQUVZLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNEI5RTtJQUVZLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixHQUFHLFNBQVMsQ0FBQyxDQVcxRjtJQUVZLHFCQUFxQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc5RjtJQUVZLHlCQUF5QixDQUFDLFlBQVksRUFBRSxxQkFBcUIsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQzNGO0lBRVksZ0NBQWdDLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQVNoRztJQUVZLDJDQUEyQyxDQUN0RCxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxHQUNqQixPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQWtCbEM7SUFFWSxxQ0FBcUMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7WUFFYSxtQ0FBbUM7SUF3QnBDLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBYzFGO0lBRU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc3RDtJQUVZLHdCQUF3QixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBTXBGO0lBRVksMkJBQTJCLENBQ3RDLFdBQVcsRUFBRSxxQkFBcUIsRUFDbEMsYUFBYSxFQUFFLE1BQU0sR0FDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVNsQjtJQUVZLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUcvRTtJQUVZLGtDQUFrQyxDQUM3QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBS2xCO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,sBAAsB,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,qBAAa,iBAAkB,YAAW,eAAe;IAerD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAGf;IAGF,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,0BAA0B,CAAqC;IACvE,OAAO,CAAC,iCAAiC,CAAqC;IAE9E,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC,EAWrD;IAED,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvC;IAED,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;IAEY,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAW5E;IAEY,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpF;IAEY,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B9E;IAEY,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAW1F;IAEY,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9F;IAEY,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC3F;IAEY,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAShG;IAEY,2CAA2C,CACtD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAkBlC;IAEY,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;YAEa,mCAAmC;IAwBpC,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAc1F;IAEM,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEY,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;IAEY,kCAAkC,CAC7C,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAKlB;CACF"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,218 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { toArray } from '@aztec/foundation/iterable';
-import { createLogger } from '@aztec/foundation/log';
-import { BlockProposal, CheckpointAttestation, CheckpointProposal } from '@aztec/stdlib/p2p';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-export const MAX_PROPOSALS_PER_SLOT = 5;
-export const ATTESTATION_CAP_BUFFER = 10;
-export class KvAttestationPool {
-    store;
-    log;
-    metrics;
-    proposals;
-    // Checkpoint attestation storage
-    checkpointAttestations;
-    checkpointProposals;
-    checkpointProposalsForSlot;
-    checkpointAttestationsForProposal;
-    constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
-        this.store = store;
-        this.log = log;
-        this.poolStats = async ()=>{
-            return {
-                itemCount: await this.checkpointAttestations.sizeAsync()
-            };
-        };
-        this.proposals = store.openMap('proposals');
-        // Initialize checkpoint attestation storage
-        this.checkpointAttestations = store.openMap('checkpoint_attestations');
-        this.checkpointProposals = store.openMap('checkpoint_proposals');
-        this.checkpointProposalsForSlot = store.openMultiMap('checkpoint_proposals_for_slot');
-        this.checkpointAttestationsForProposal = store.openMultiMap('checkpoint_attestations_for_proposal');
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
-    }
-    poolStats;
-    async isEmpty() {
-        for await (const _ of this.checkpointAttestations.entriesAsync()){
-            return false;
-        }
-        for await (const _ of this.proposals.entriesAsync()){
-            return false;
-        }
-        return true;
-    }
-    getProposalKey(slot, proposalId) {
-        const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
-        const proposalIdStr = typeof proposalId === 'string' ? proposalId : Buffer.isBuffer(proposalId) ? Fr.fromBuffer(proposalId).toString() : proposalId.toString();
-        return `${slotStr}-${proposalIdStr}`;
-    }
-    getAttestationKey(slot, proposalId, address) {
-        return `${this.getProposalKey(slot, proposalId)}-${address}`;
-    }
-    async addBlockProposal(blockProposal) {
-        await this.store.transactionAsync(async ()=>{
-            const proposalId = blockProposal.archive.toString();
-            // Strip signedTxs before storing to avoid persisting full tx data
-            await this.proposals.set(proposalId, blockProposal.withoutSignedTxs().toBuffer());
-        });
-    }
-    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.archive.toString();
-        return await this.proposals.hasAsync(id);
-    }
-    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()}`);
-        }
-        // 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()}`);
-        }
-        await this.store.transactionAsync(async ()=>{
-            const slotKey = proposal.slotNumber;
-            const proposalId = proposal.archive.toString();
-            await this.checkpointProposalsForSlot.set(slotKey, proposalId);
-            // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
-            await this.checkpointProposals.set(proposalId, proposal.toCore().toBuffer());
-            // Store the extracted block proposal separately
-            if (blockProposal) {
-                await this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs().toBuffer());
-            }
-        });
-    }
-    async getCheckpointProposal(id) {
-        const buffer = await this.checkpointProposals.getAsync(id);
-        try {
-            if (buffer && buffer.length > 0) {
-                return CheckpointProposal.fromBuffer(buffer);
-            }
-        } catch  {
-            return Promise.resolve(undefined);
-        }
-        return Promise.resolve(undefined);
-    }
-    async hasCheckpointProposal(idOrProposal) {
-        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
-        return await this.checkpointProposals.hasAsync(id);
-    }
-    async addCheckpointAttestations(attestations) {
-        await this.store.transactionAsync(async ()=>{
-            for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.slotNumber;
-                const proposalId = attestation.archive;
-                const sender = attestation.getSender();
-                // Skip attestations with invalid signatures
-                if (!sender) {
-                    this.log.warn(`Skipping checkpoint attestation with invalid signature for slot ${slotNumber}`, {
-                        signature: attestation.signature.toString(),
-                        slotNumber,
-                        proposalId
-                    });
-                    continue;
-                }
-                const address = sender.toString();
-                await this.checkpointAttestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
-                await this.checkpointProposalsForSlot.set(slotNumber, proposalId.toString());
-                await this.checkpointAttestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${address}`, {
-                    signature: attestation.signature.toString(),
-                    slotNumber,
-                    address,
-                    proposalId
-                });
-            }
-        });
-    }
-    async getCheckpointAttestationsForSlot(slot) {
-        const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
-        const attestations = [];
-        for (const proposalId of proposalIds){
-            attestations.push(...await this.getCheckpointAttestationsForSlotAndProposal(slot, proposalId));
-        }
-        return attestations;
-    }
-    async getCheckpointAttestationsForSlotAndProposal(slot, proposalId) {
-        const attestationIds = await toArray(this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
-        const attestations = [];
-        for (const id of attestationIds){
-            const buf = await this.checkpointAttestations.getAsync(id);
-            if (!buf) {
-                throw new Error('Checkpoint attestation not found ' + id);
-            }
-            const attestation = CheckpointAttestation.fromBuffer(buf);
-            attestations.push(attestation);
-        }
-        return attestations;
-    }
-    async deleteCheckpointAttestationsOlderThan(oldestSlot) {
-        const olderThan = await toArray(this.checkpointProposalsForSlot.keysAsync({
-            end: oldestSlot
-        }));
-        for (const oldSlot of olderThan){
-            await this.deleteCheckpointAttestationsForSlot(SlotNumber(oldSlot));
-        }
-    }
-    async deleteCheckpointAttestationsForSlot(slot) {
-        let numberOfAttestations = 0;
-        await this.store.transactionAsync(async ()=>{
-            const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
-            for (const proposalId of proposalIds){
-                const attestations = await toArray(this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
-                numberOfAttestations += attestations.length;
-                for (const attestation of attestations){
-                    await this.checkpointAttestations.delete(attestation);
-                }
-                await this.checkpointProposals.delete(proposalId);
-                await this.checkpointAttestationsForProposal.delete(this.getProposalKey(slot, proposalId));
-            }
-            await this.checkpointProposalsForSlot.delete(slot);
-            this.log.verbose(`Removed ${numberOfAttestations} checkpoint attestations for slot ${slot}`);
-        });
-    }
-    async hasCheckpointAttestation(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.checkpointAttestations.hasAsync(key);
-    }
-    canAddProposal(_block) {
-        // TODO(palla/mbps): implement proposal cap logic
-        return Promise.resolve(true);
-    }
-    async canAddCheckpointProposal(proposal) {
-        // TODO(palla/mbps): Adjust checkpoint proposal limit to 1. Also connect to slashing condition in the caller.
-        return await this.checkpointProposals.hasAsync(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
-    }
-    async canAddCheckpointAttestation(attestation, committeeSize) {
-        return await this.hasCheckpointAttestation(attestation) || !await this.hasReachedCheckpointAttestationCap(attestation.payload.header.slotNumber, attestation.archive.toString(), committeeSize);
-    }
-    async hasReachedCheckpointProposalCap(slot) {
-        const uniqueProposalCount = await this.checkpointProposalsForSlot.getValueCountAsync(slot);
-        return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
-    }
-    async hasReachedCheckpointAttestationCap(slot, proposalId, committeeSize) {
-        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
-        return await this.checkpointAttestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId)) >= limit;
-    }
-}

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

@@ -1,31 +0,0 @@
-import type { SlotNumber } from '@aztec/foundation/branded-types';
-import type { BlockProposal, CheckpointAttestation, CheckpointProposal, CheckpointProposalCore } from '@aztec/stdlib/p2p';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { AttestationPool } from './attestation_pool.js';
-export declare class InMemoryAttestationPool implements AttestationPool {
-    private log;
-    private metrics;
-    private proposals;
-    private checkpointAttestations;
-    private checkpointProposals;
-    constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    private poolStats;
-    isEmpty(): Promise<boolean>;
-    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
-    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
-    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
-    canAddProposal(_block: BlockProposal): Promise<boolean>;
-    addCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
-    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
-    hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean>;
-    addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
-    getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
-    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
-    deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
-    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
-    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
-    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
-    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
-    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X2F0dGVzdGF0aW9uX3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tZW1vcnlfYXR0ZXN0YXRpb25fcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFDVixhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixzQkFBc0IsRUFDdkIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFJbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHN0QscUJBQWEsdUJBQXdCLFlBQVcsZUFBZTtJQWUzRCxPQUFPLENBQUMsR0FBRztJQWRiLE9BQU8sQ0FBQyxPQUFPLENBQTZDO0lBRTVELE9BQU8sQ0FBQyxTQUFTLENBQTZCO0lBSTlDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FHNUI7SUFDRixPQUFPLENBQUMsbUJBQW1CLENBQXNDO0lBRWpFLFlBQ0UsU0FBUyxHQUFFLGVBQXNDLEVBQ3pDLEdBQUcseUNBQXVDLEVBTW5EO0lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FJZjtJQUVLLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWpDO0lBRU0sZ0JBQWdCLENBQUMsYUFBYSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSW5FO0lBRU0sZ0JBQWdCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQyxDQUV0RTtJQUVNLGdCQUFnQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHOUU7SUFFTSxjQUFjLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRzdEO0lBSVkscUJBQXFCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EyQjlFO0lBRU0scUJBQXFCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBRXBGO0lBRU0scUJBQXFCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBR3hGO0lBRU0seUJBQXlCLENBQUMsWUFBWSxFQUFFLHFCQUFxQixFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTZCckY7SUFFTSxnQ0FBZ0MsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBTTFGO0lBRU0sMkNBQTJDLENBQ2hELElBQUksRUFBRSxVQUFVLEVBQ2hCLFVBQVUsRUFBRSxNQUFNLEdBQ2pCLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBU2xDO0lBRU0scUNBQXFDLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0JsRjtJQUVNLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUl6RTtJQUVNLGtDQUFrQyxDQUN2QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBSWxCO0lBRVksd0JBQXdCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FLcEY7SUFFWSwyQkFBMkIsQ0FDdEMsV0FBVyxFQUFFLHFCQUFxQixFQUNsQyxhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBU2xCO0lBRU0sd0JBQXdCLENBQUMsV0FBVyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FxQnBGO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,eAAe;IAe3D,OAAO,CAAC,GAAG;IAdb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAA6B;IAI9C,OAAO,CAAC,sBAAsB,CAG5B;IACF,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,YACE,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC,EAMnD;IAED,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAEM,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAInE;IAEM,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAEtE;IAEM,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9E;IAEM,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAIY,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B9E;IAEM,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAEpF;IAEM,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxF;IAEM,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BrF;IAEM,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAM1F;IAEM,2CAA2C,CAChD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CASlC;IAEM,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;IAEM,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAIzE;IAEM,kCAAkC,CACvC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAIlB;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAKpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEM,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBpF;CACF"}