@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.023c3e5

package/dest/services/tx_provider.d.ts

@@ -0,0 +1,51 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type Logger } from '@aztec/foundation/log';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { ITxProvider } from '@aztec/stdlib/interfaces/server';
+import type { BlockProposal } from '@aztec/stdlib/p2p';
+import { Tx, TxHash } from '@aztec/stdlib/tx';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import type { PeerId } from '@libp2p/interface';
+import type { P2PClient } from '../client/p2p_client.js';
+import type { TxPool } from '../mem_pools/index.js';
+import type { TxCollection } from './tx_collection/tx_collection.js';
+import { TxProviderInstrumentation } from './tx_provider_instrumentation.js';
+/**
+ * Gathers and returns txs given a block proposal, block, or their hashes.
+ * Loads available txs from the tx pool, and  relies on a TxCollection service to collect txs from the network and other nodes.
+ */
+export declare class TxProvider implements ITxProvider {
+    private txCollection;
+    private txPool;
+    private txValidator;
+    private log;
+    protected instrumentation: TxProviderInstrumentation;
+    constructor(txCollection: TxCollection, txPool: TxPool, txValidator: Pick<P2PClient, 'validate'>, log?: Logger, client?: TelemetryClient);
+    /** Returns txs from the tx pool given their hashes.*/
+    getAvailableTxs(txHashes: TxHash[]): Promise<{
+        txs: Tx[];
+        missingTxs: TxHash[];
+    }>;
+    /** Gathers txs from the tx pool, proposal body, remote rpc nodes, and reqresp. */
+    getTxsForBlockProposal(blockProposal: BlockProposal, blockNumber: BlockNumber, opts: {
+        pinnedPeer: PeerId | undefined;
+        deadline: Date;
+    }): Promise<{
+        txs: Tx[];
+        missingTxs: TxHash[];
+    }>;
+    /** Gathers txs from the tx pool, remote rpc nodes, and reqresp. */
+    getTxsForBlock(block: L2Block, opts: {
+        deadline: Date;
+    }): Promise<{
+        txs: Tx[];
+        missingTxs: TxHash[];
+    }>;
+    private getOrderedTxsFromAllSources;
+    private orderTxs;
+    private getTxsFromAllSources;
+    private collectFromP2P;
+    private extractFromProposal;
+    private processProposalTxs;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvdmlkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy90eF9wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBZSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUE4QixZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRyxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU3RTs7O0dBR0c7QUFDSCxxQkFBYSxVQUFXLFlBQVcsV0FBVztJQUkxQyxPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxHQUFHO0lBTmIsU0FBUyxDQUFDLGVBQWUsRUFBRSx5QkFBeUIsQ0FBQztJQUVyRCxZQUNVLFlBQVksRUFBRSxZQUFZLEVBQzFCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsV0FBVyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLEVBQ3hDLEdBQUcsR0FBRSxNQUF5QyxFQUN0RCxNQUFNLEdBQUUsZUFBc0MsRUFHL0M7SUFFRCxzREFBc0Q7SUFDekMsZUFBZSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUE7S0FBRSxDQUFDLENBa0I3RjtJQUVELGtGQUFrRjtJQUMzRSxzQkFBc0IsQ0FDM0IsYUFBYSxFQUFFLGFBQWEsRUFDNUIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsSUFBSSxFQUFFO1FBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7UUFBQyxRQUFRLEVBQUUsSUFBSSxDQUFBO0tBQUUsR0FDdkQsT0FBTyxDQUFDO1FBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFBO0tBQUUsQ0FBQyxDQU85QztJQUVELG1FQUFtRTtJQUM1RCxjQUFjLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUU7UUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUM7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUE7S0FBRSxDQUFDLENBTzVHO1lBRWEsMkJBQTJCO0lBZ0N6QyxPQUFPLENBQUMsUUFBUTtZQUtGLG9CQUFvQjtZQXlGcEIsY0FBYztJQVk1QixPQUFPLENBQUMsbUJBQW1CO1lBT2Isa0JBQWtCO0NBT2pDIn0=

package/dest/services/tx_provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_provider.d.ts","sourceRoot":"","sources":["../../src/services/tx_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAA8B,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E;;;GAGG;AACH,qBAAa,UAAW,YAAW,WAAW;IAI1C,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,GAAG;IANb,SAAS,CAAC,eAAe,EAAE,yBAAyB,CAAC;IAErD,YACU,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EACxC,GAAG,GAAE,MAAyC,EACtD,MAAM,GAAE,eAAsC,EAG/C;IAED,sDAAsD;IACzC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAkB7F;IAED,kFAAkF;IAC3E,sBAAsB,CAC3B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE;QAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,GACvD,OAAO,CAAC;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAO9C;IAED,mEAAmE;IAC5D,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAO5G;YAEa,2BAA2B;IAgCzC,OAAO,CAAC,QAAQ;YAKF,oBAAoB;YAyFpB,cAAc;IAY5B,OAAO,CAAC,mBAAmB;YAOb,kBAAkB;CAOjC"}

package/dest/services/tx_provider.js

@@ -0,0 +1,219 @@
+import { compactArray } from '@aztec/foundation/collection';
+import { createLogger } from '@aztec/foundation/log';
+import { elapsed } from '@aztec/foundation/timer';
+import { TxHash } from '@aztec/stdlib/tx';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { TxProviderInstrumentation } from './tx_provider_instrumentation.js';
+/**
+ * Gathers and returns txs given a block proposal, block, or their hashes.
+ * Loads available txs from the tx pool, and  relies on a TxCollection service to collect txs from the network and other nodes.
+ */ export class TxProvider {
+    txCollection;
+    txPool;
+    txValidator;
+    log;
+    instrumentation;
+    constructor(txCollection, txPool, txValidator, log = createLogger('p2p:tx-collector'), client = getTelemetryClient()){
+        this.txCollection = txCollection;
+        this.txPool = txPool;
+        this.txValidator = txValidator;
+        this.log = log;
+        this.instrumentation = new TxProviderInstrumentation(client, 'TxProvider');
+    }
+    /** Returns txs from the tx pool given their hashes.*/ async getAvailableTxs(txHashes) {
+        const response = await this.txPool.getTxsByHash(txHashes);
+        if (response.length !== txHashes.length) {
+            throw new Error(`Unexpected response size from tx pool: expected ${txHashes.length} but got ${response.length}`);
+        }
+        const txs = [];
+        const missingTxs = [];
+        for(let i = 0; i < txHashes.length; i++){
+            const tx = response[i];
+            if (tx === undefined) {
+                missingTxs.push(txHashes[i]);
+            } else {
+                txs.push(tx);
+            }
+        }
+        return {
+            txs,
+            missingTxs
+        };
+    }
+    /** Gathers txs from the tx pool, proposal body, remote rpc nodes, and reqresp. */ getTxsForBlockProposal(blockProposal, blockNumber, opts) {
+        return this.getOrderedTxsFromAllSources({
+            type: 'proposal',
+            blockProposal,
+            blockNumber
+        }, {
+            ...blockProposal.toBlockInfo(),
+            blockNumber
+        }, blockProposal.txHashes, {
+            ...opts,
+            pinnedPeer: opts.pinnedPeer
+        });
+    }
+    /** Gathers txs from the tx pool, remote rpc nodes, and reqresp. */ getTxsForBlock(block, opts) {
+        return this.getOrderedTxsFromAllSources({
+            type: 'block',
+            block
+        }, block.toBlockInfo(), block.body.txEffects.map((tx)=>tx.txHash), {
+            ...opts,
+            pinnedPeer: undefined
+        });
+    }
+    async getOrderedTxsFromAllSources(request, blockInfo, txHashes, opts) {
+        const [durationMs, result] = await elapsed(()=>this.getTxsFromAllSources(request, blockInfo, txHashes, opts));
+        const { missingTxHashes, txsFromMempool, txsFromNetwork, txsFromProposal } = result;
+        const txs = [
+            ...txsFromMempool ?? [],
+            ...txsFromProposal ?? [],
+            ...txsFromNetwork ?? []
+        ];
+        const missingTxs = missingTxHashes?.length ?? 0;
+        const level = missingTxs === 0 ? 'verbose' : 'warn';
+        this.log[level](`Retrieved ${txs.length} out of ${blockInfo.txCount} txs for ${request.type}`, {
+            ...blockInfo,
+            txsFromProposal: txsFromProposal?.length,
+            txsFromMempool: txsFromMempool?.length,
+            txsFromNetwork: txsFromNetwork?.length,
+            missingTxs,
+            durationMs
+        });
+        const orderedTxs = this.orderTxs(txs, txHashes);
+        if (orderedTxs.length + missingTxs !== txHashes.length) {
+            throw new Error(`Error collecting txs for ${request.type} with ${txHashes.length} txs: found ${orderedTxs.length} and flagged ${missingTxs} as missing`);
+        }
+        return {
+            txs: orderedTxs,
+            missingTxs: (missingTxHashes ?? []).map(TxHash.fromString),
+            durationMs
+        };
+    }
+    orderTxs(txs, order) {
+        const txsMap = new Map(txs.map((tx)=>[
+                tx.txHash.toString(),
+                tx
+            ]));
+        return order.map((hash)=>txsMap.get(hash.toString())).filter((tx)=>tx !== undefined);
+    }
+    async getTxsFromAllSources(request, blockInfo, txHashes, opts) {
+        const missingTxHashes = new Set(txHashes.map((txHash)=>txHash.toString()));
+        if (missingTxHashes.size === 0) {
+            this.log.debug(`Received request with no transactions`, blockInfo);
+            return {};
+        }
+        // First go to our tx pool and fetch whatever txs we have there
+        // We go to the mempool first since those txs are already validated
+        const txsFromMempool = compactArray(await this.txPool.getTxsByHash(txHashes));
+        txsFromMempool.forEach((tx)=>missingTxHashes.delete(tx.getTxHash().toString()));
+        this.instrumentation.incTxsFromMempool(txsFromMempool.length);
+        this.log.debug(`Retrieved ${txsFromMempool.length} txs from mempool for block proposal (${missingTxHashes.size} pending)`, {
+            ...blockInfo,
+            missingTxHashes: [
+                ...missingTxHashes
+            ]
+        });
+        if (missingTxHashes.size === 0) {
+            this.instrumentation.incTxsFromP2P(0, txHashes.length);
+            return {
+                txsFromMempool
+            };
+        }
+        // Take txs from the proposal body if there are any
+        // Note that we still have to validate these txs, but we do it in parallel with tx collection
+        const proposal = request.type === 'proposal' ? request.blockProposal : undefined;
+        const txsFromProposal = this.extractFromProposal(proposal, [
+            ...missingTxHashes
+        ]);
+        if (txsFromProposal.length > 0) {
+            this.instrumentation.incTxsFromProposals(txsFromProposal.length);
+            txsFromProposal.forEach((tx)=>missingTxHashes.delete(tx.txHash.toString()));
+            this.log.debug(`Retrieved ${txsFromProposal.length} txs from proposal body (${missingTxHashes.size} pending)`, {
+                ...blockInfo,
+                missingTxHashes: [
+                    ...missingTxHashes
+                ]
+            });
+        }
+        if (missingTxHashes.size === 0) {
+            await this.processProposalTxs(txsFromProposal);
+            this.instrumentation.incTxsFromP2P(0, txHashes.length);
+            return {
+                txsFromMempool,
+                txsFromProposal
+            };
+        }
+        // Start tx collection from the network if needed, while we validate the txs taken from the proposal in parallel
+        const [txsFromNetwork] = await Promise.all([
+            this.collectFromP2P(request, [
+                ...missingTxHashes
+            ], opts),
+            this.processProposalTxs(txsFromProposal)
+        ]);
+        if (txsFromNetwork.length > 0) {
+            txsFromNetwork.forEach((tx)=>missingTxHashes.delete(tx.txHash.toString()));
+            this.log.debug(`Retrieved ${txsFromNetwork.length} txs from network for block proposal (${missingTxHashes.size} pending)`, {
+                ...blockInfo,
+                missingTxHashes: [
+                    ...missingTxHashes
+                ]
+            });
+        }
+        this.instrumentation.incTxsFromP2P(txsFromNetwork.length, txHashes.length);
+        if (missingTxHashes.size === 0) {
+            return {
+                txsFromNetwork,
+                txsFromMempool,
+                txsFromProposal
+            };
+        }
+        // We are still missing txs, make one last attempt to collect them from our pool, in case they showed up somehow else
+        const moreTxsFromPool = compactArray(await this.txPool.getTxsByHash([
+            ...missingTxHashes
+        ].map(TxHash.fromString)));
+        if (moreTxsFromPool.length > 0) {
+            this.instrumentation.incTxsFromMempool(moreTxsFromPool.length);
+            this.log.debug(`Retrieved ${moreTxsFromPool.length} txs from pool retry for block proposal (${missingTxHashes.size} pending)`, {
+                ...blockInfo,
+                missingTxHashes: [
+                    ...missingTxHashes
+                ]
+            });
+        }
+        if (missingTxHashes.size > 0) {
+            this.instrumentation.incMissingTxs(missingTxHashes.size);
+        }
+        return {
+            txsFromNetwork,
+            txsFromMempool: [
+                ...txsFromMempool,
+                ...moreTxsFromPool
+            ],
+            txsFromProposal,
+            missingTxHashes: [
+                ...missingTxHashes
+            ]
+        };
+    }
+    async collectFromP2P(input, txHashes, opts) {
+        const requestedAt = Date.now();
+        const result = await this.txCollection.collectFastFor(input, txHashes, opts);
+        const requestProcessedAt = Date.now();
+        this.instrumentation.recordTxsRequestDelay(requestProcessedAt - requestedAt);
+        return result;
+    }
+    extractFromProposal(proposal, missingTxHashes) {
+        if (!proposal) {
+            return [];
+        }
+        return compactArray(proposal.txs ?? []).filter((tx)=>missingTxHashes.includes(tx.getTxHash().toString()));
+    }
+    async processProposalTxs(txs) {
+        if (txs.length === 0) {
+            return;
+        }
+        await this.txValidator.validate(txs);
+        await this.txPool.addTxs(txs);
+    }
+}

package/dest/services/tx_provider_instrumentation.d.ts

@@ -0,0 +1,16 @@
+import { type TelemetryClient } from '@aztec/telemetry-client';
+export declare class TxProviderInstrumentation {
+    private txFromProposalCount;
+    private txFromMempoolCount;
+    private txFromP2PCount;
+    private missingTxsCount;
+    private fractionOfTxsRequestedFromP2P;
+    private txsRequestDelay;
+    constructor(client: TelemetryClient, name: string);
+    incTxsFromProposals(count: number): void;
+    incTxsFromMempool(count: number): void;
+    incTxsFromP2P(count: number, total: number): void;
+    recordTxsRequestDelay(delay: number): void;
+    incMissingTxs(count: number): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvdmlkZXJfaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvdHhfcHJvdmlkZXJfaW5zdHJ1bWVudGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFHTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxxQkFBYSx5QkFBeUI7SUFDcEMsT0FBTyxDQUFDLG1CQUFtQixDQUFnQjtJQUMzQyxPQUFPLENBQUMsa0JBQWtCLENBQWdCO0lBQzFDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBRXZDLE9BQU8sQ0FBQyw2QkFBNkIsQ0FBWTtJQUNqRCxPQUFPLENBQUMsZUFBZSxDQUFZO0lBRW5DLFlBQVksTUFBTSxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQWNoRDtJQUVELG1CQUFtQixDQUFDLEtBQUssRUFBRSxNQUFNLFFBRWhDO0lBRUQsaUJBQWlCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFOUI7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxRQUd6QztJQUVELHFCQUFxQixDQUFDLEtBQUssRUFBRSxNQUFNLFFBRWxDO0lBRUQsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLFFBRTFCO0NBQ0YifQ==

package/dest/services/tx_provider_instrumentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_provider_instrumentation.d.ts","sourceRoot":"","sources":["../../src/services/tx_provider_instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,yBAAyB;IACpC,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,eAAe,CAAgB;IAEvC,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,eAAe,CAAY;IAEnC,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAchD;IAED,mBAAmB,CAAC,KAAK,EAAE,MAAM,QAEhC;IAED,iBAAiB,CAAC,KAAK,EAAE,MAAM,QAE9B;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAGzC;IAED,qBAAqB,CAAC,KAAK,EAAE,MAAM,QAElC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,QAE1B;CACF"}

package/dest/services/tx_provider_instrumentation.js

@@ -0,0 +1,34 @@
+import { Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
+export class TxProviderInstrumentation {
+    txFromProposalCount;
+    txFromMempoolCount;
+    txFromP2PCount;
+    missingTxsCount;
+    fractionOfTxsRequestedFromP2P;
+    txsRequestDelay;
+    constructor(client, name){
+        const meter = client.getMeter(name);
+        this.txFromProposalCount = createUpDownCounterWithDefault(meter, Metrics.TX_PROVIDER_TXS_FROM_PROPOSALS_COUNT);
+        this.txFromMempoolCount = createUpDownCounterWithDefault(meter, Metrics.TX_PROVIDER_TXS_FROM_MEMPOOL_COUNT);
+        this.txFromP2PCount = createUpDownCounterWithDefault(meter, Metrics.TX_PROVIDER_TXS_FROM_P2P_COUNT);
+        this.missingTxsCount = createUpDownCounterWithDefault(meter, Metrics.TX_PROVIDER_MISSING_TXS_COUNT);
+        this.fractionOfTxsRequestedFromP2P = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUESTED_FRACTION);
+        this.txsRequestDelay = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUEST_DELAY);
+    }
+    incTxsFromProposals(count) {
+        this.txFromProposalCount.add(count);
+    }
+    incTxsFromMempool(count) {
+        this.txFromMempoolCount.add(count);
+    }
+    incTxsFromP2P(count, total) {
+        this.txFromP2PCount.add(count);
+        this.fractionOfTxsRequestedFromP2P.record(count / total);
+    }
+    recordTxsRequestDelay(delay) {
+        this.txsRequestDelay.record(delay);
+    }
+    incMissingTxs(count) {
+        this.missingTxsCount.add(count);
+    }
+}

package/dest/test-helpers/generate-peer-id-private-keys.d.ts

@@ -4,4 +4,4 @@
  * @returns A list of peer id private keys
  */
 export declare function generatePeerIdPrivateKeys(numberOfPeers: number): string[];
-//# sourceMappingURL=generate-peer-id-private-keys.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGUtcGVlci1pZC1wcml2YXRlLWtleXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LWhlbHBlcnMvZ2VuZXJhdGUtcGVlci1pZC1wcml2YXRlLWtleXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7Ozs7R0FJRztBQUNILHdCQUFnQix5QkFBeUIsQ0FBQyxhQUFhLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQU96RSJ9

package/dest/test-helpers/get-ports.d.ts

@@ -4,4 +4,4 @@
  * @returns A list of ports
  */
 export declare const getPorts: (numberOfPeers: number) => Promise<number[]>;
-//# sourceMappingURL=get-ports.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LXBvcnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC1oZWxwZXJzL2dldC1wb3J0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQTs7OztHQUlHO0FBQ0gsZUFBTyxNQUFNLFFBQVEsOENBQWlHLENBQUMifQ==

package/dest/test-helpers/get-ports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-ports.d.ts","sourceRoot":"","sources":["../../src/test-helpers/get-ports.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,kBAAmB,MAAM,sBAAwE,CAAC"}
+{"version":3,"file":"get-ports.d.ts","sourceRoot":"","sources":["../../src/test-helpers/get-ports.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,8CAAiG,CAAC"}

package/dest/test-helpers/index.d.ts

@@ -3,4 +3,7 @@ export * from './get-ports.js';
 export * from './make-enrs.js';
 export * from './make-test-p2p-clients.js';
 export * from './reqresp-nodes.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './mock-pubsub.js';
+export * from './test_tx_provider.js';
+export * from './testbench-utils.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LWhlbHBlcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHNCQUFzQixDQUFDIn0=

package/dest/test-helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC;AACnD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC;AACnD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC"}

package/dest/test-helpers/index.js

@@ -3,3 +3,6 @@ export * from './get-ports.js';
 export * from './make-enrs.js';
 export * from './make-test-p2p-clients.js';
 export * from './reqresp-nodes.js';
+export * from './mock-pubsub.js';
+export * from './test_tx_provider.js';
+export * from './testbench-utils.js';

package/dest/test-helpers/make-enrs.d.ts

@@ -13,4 +13,4 @@ export declare function makeEnrs(p2pPrivateKeys: string[], ports: number[], conf
  * @returns The ENR of the p2p node
  */
 export declare function makeEnr(p2pPrivateKey: string, port: number, config: ChainConfig): Promise<string>;
-//# sourceMappingURL=make-enrs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS1lbnJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC1oZWxwZXJzL21ha2UtZW5ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQVF4RDs7Ozs7R0FLRztBQUNILHdCQUFzQixRQUFRLENBQUMsY0FBYyxFQUFFLE1BQU0sRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxxQkFNNUY7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQixPQUFPLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxXQUFXLG1CQWNyRiJ9

package/dest/test-helpers/make-enrs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-enrs.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-enrs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAQxD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,qBAM5F;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,mBAerF"}
+{"version":3,"file":"make-enrs.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-enrs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAQxD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,qBAM5F;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,mBAcrF"}

package/dest/test-helpers/make-enrs.js

@@ -1,5 +1,5 @@
-import { SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
+import { SignableENR } from '@nethermindeth/enr';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
 import { setAztecEnrKey } from '../versioning.js';
 /**
@@ -20,10 +20,9 @@ import { setAztecEnrKey } from '../versioning.js';
  */ export async function makeEnr(p2pPrivateKey, port, config) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(p2pPrivateKey);
     const enr = SignableENR.createFromPeerId(peerId);
-    const udpAnnounceAddress = `127.0.0.1:${port}`;
-    const tcpAnnounceAddress = `127.0.0.1:${port}`;
-    const udpPublicAddr = multiaddr(convertToMultiaddr(udpAnnounceAddress, 'udp'));
-    const tcpPublicAddr = multiaddr(convertToMultiaddr(tcpAnnounceAddress, 'tcp'));
+    const p2pIp = `127.0.0.1`;
+    const udpPublicAddr = multiaddr(convertToMultiaddr(p2pIp, port, 'udp'));
+    const tcpPublicAddr = multiaddr(convertToMultiaddr(p2pIp, port, 'tcp'));
     // ENRS must include the network and a discoverable address (udp for discv5)
     setAztecEnrKey(enr, config);
     enr.setLocationMultiaddr(udpPublicAddr);

package/dest/test-helpers/make-test-p2p-clients.d.ts

@@ -6,7 +6,8 @@ import type { P2PClient } from '../client/p2p_client.js';
 import type { P2PConfig } from '../config.js';
 import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { TxPool } from '../mem_pools/tx_pool/index.js';
-interface MakeTestP2PClientOptions {
+import { type MockGossipSubNetwork } from './mock-pubsub.js';
+export interface MakeTestP2PClientOptions {
     mockAttestationPool: AttestationPool;
     mockTxPool: TxPool;
     mockEpochCache: EpochCache;
@@ -15,7 +16,17 @@ interface MakeTestP2PClientOptions {
     p2pBaseConfig: P2PConfig;
     p2pConfigOverrides?: Partial<P2PConfig>;
     logger?: Logger;
+    mockGossipSubNetwork?: MockGossipSubNetwork;
 }
+/**
+ * Creates a single P2P client and immediately starts it for testing purposes.
+ * @param peerIdPrivateKey - The private key of the peer.
+ * @param port - The port to run the client on.
+ * @param peers - The peers to connect to.
+ * @param options - The options for the client.
+ * @returns The created and already started client.
+ */
+export declare function makeAndStartTestP2PClient(peerIdPrivateKey: string, port: number, peers: string[], options: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>>;
 /**
  * Creates a single P2P client for testing purposes.
  * @param peerIdPrivateKey - The private key of the peer.
@@ -24,13 +35,30 @@ interface MakeTestP2PClientOptions {
  * @param options - The options for the client.
  * @returns The created client.
  */
-export declare function makeTestP2PClient(peerIdPrivateKey: string, port: number, peers: string[], { alwaysTrueVerifier, p2pBaseConfig, p2pConfigOverrides, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, logger, }: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>>;
+export declare function makeTestP2PClient(peerIdPrivateKey: string, port: number, peers: string[], { alwaysTrueVerifier, p2pBaseConfig, p2pConfigOverrides, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, mockGossipSubNetwork, logger }: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>>;
+/**
+ * Creates a number of P2P clients and immediately starts them for testing purposes.
+ * @param numberOfPeers - The number of clients to create.
+ * @param options - The options for the clients.
+ * @returns The created and started clients.
+ */
+export declare function makeAndStartTestP2PClients(numberOfPeers: number, testConfig: MakeTestP2PClientOptions): Promise<{
+    client: P2PClient<P2PClientType.Full>;
+    peerPrivateKey: string;
+    port: number;
+    enr: string;
+}[]>;
 /**
  * Creates a number of P2P clients for testing purposes.
  * @param numberOfPeers - The number of clients to create.
  * @param options - The options for the clients.
  * @returns The created clients.
  */
-export declare function makeTestP2PClients(numberOfPeers: number, testConfig: MakeTestP2PClientOptions): Promise<P2PClient<P2PClientType.Full>[]>;
-export {};
-//# sourceMappingURL=make-test-p2p-clients.d.ts.map
+export declare function makeTestP2PClients(numberOfPeers: number, testConfig: MakeTestP2PClientOptions): Promise<{
+    client: P2PClient<P2PClientType.Full>;
+    peerPrivateKey: string;
+    port: number;
+    enr: string;
+}[]>;
+export declare function startTestP2PClients(clients: P2PClient[]): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10ZXN0LXAycC1jbGllbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC1oZWxwZXJzL21ha2UtdGVzdC1wMnAtY2xpZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVyRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFLbEUsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHbEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1EQUFtRCxDQUFDO0FBQ3pGLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFrQyxNQUFNLGtCQUFrQixDQUFDO0FBRzdGLE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMsbUJBQW1CLEVBQUUsZUFBZSxDQUFDO0lBQ3JDLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsY0FBYyxFQUFFLFVBQVUsQ0FBQztJQUMzQixjQUFjLEVBQUUsc0JBQXNCLENBQUM7SUFDdkMsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDN0IsYUFBYSxFQUFFLFNBQVMsQ0FBQztJQUN6QixrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN4QyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsb0JBQW9CLENBQUMsRUFBRSxvQkFBb0IsQ0FBQztDQUM3QztBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IseUJBQXlCLENBQzdDLGdCQUFnQixFQUFFLE1BQU0sRUFDeEIsSUFBSSxFQUFFLE1BQU0sRUFDWixLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQ2YsT0FBTyxFQUFFLHdCQUF3QiwwQ0FNbEM7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLGlCQUFpQixDQUNyQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLElBQUksRUFBRSxNQUFNLEVBQ1osS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUNmLEVBQ0Usa0JBQXlCLEVBQ3pCLGFBQWEsRUFDYixrQkFBdUIsRUFDdkIsbUJBQW1CLEVBQ25CLFVBQVUsRUFDVixjQUFjLEVBQ2QsY0FBYyxFQUNkLG9CQUFvQixFQUNwQixNQUF3QyxFQUN6QyxFQUFFLHdCQUF3QiwwQ0EyQzVCO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsd0JBQXdCOzs7OztLQXVDM0c7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxhQUFhLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSx3QkFBd0I7Ozs7O0tBZ0NuRztBQUVELHdCQUFzQixtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsU0FBUyxFQUFFLGlCQUc3RCJ9

package/dest/test-helpers/make-test-p2p-clients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAM5D,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,cAAc,EACd,MAAwC,GACzC,EAAE,wBAAwB,0CA8C5B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,4CAiBnG"}
+{"version":3,"file":"make-test-p2p-clients.d.ts","sourceRoot":"","sources":["../../src/test-helpers/make-test-p2p-clients.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAKlE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAI5D,OAAO,EAAE,KAAK,oBAAoB,EAAkC,MAAM,kBAAkB,CAAC;AAG7F,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,cAAc,EAAE,sBAAsB,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,wBAAwB,0CAMlC;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE,EACf,EACE,kBAAyB,EACzB,aAAa,EACb,kBAAuB,EACvB,mBAAmB,EACnB,UAAU,EACV,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,MAAwC,EACzC,EAAE,wBAAwB,0CA2C5B;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB;;;;;KAuC3G;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB;;;;;KAgCnG;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,iBAG7D"}

package/dest/test-helpers/make-test-p2p-clients.js

@@ -1,12 +1,28 @@
 import { MockL2BlockSource } from '@aztec/archiver/test';
+import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { sleep } from '@aztec/foundation/sleep';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { createP2PClient } from '../client/index.js';
 import { generatePeerIdPrivateKeys } from '../test-helpers/generate-peer-id-private-keys.js';
 import { getPorts } from './get-ports.js';
 import { makeEnrs } from './make-enrs.js';
+import { getMockPubSubP2PServiceFactory } from './mock-pubsub.js';
 import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp-nodes.js';
+/**
+ * Creates a single P2P client and immediately starts it for testing purposes.
+ * @param peerIdPrivateKey - The private key of the peer.
+ * @param port - The port to run the client on.
+ * @param peers - The peers to connect to.
+ * @param options - The options for the client.
+ * @returns The created and already started client.
+ */ export async function makeAndStartTestP2PClient(peerIdPrivateKey, port, peers, options) {
+    const client = await makeTestP2PClient(peerIdPrivateKey, port, peers, options);
+    await client.start();
+    return client;
+}
 /**
  * Creates a single P2P client for testing purposes.
  * @param peerIdPrivateKey - The private key of the peer.
@@ -14,18 +30,15 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
  * @param peers - The peers to connect to.
  * @param options - The options for the client.
  * @returns The created client.
- */ export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysTrueVerifier = true, p2pBaseConfig, p2pConfigOverrides = {}, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, logger = createLogger('p2p-test-client') }) {
-    const addr = `127.0.0.1:${port}`;
-    const listenAddr = `0.0.0.0:${port}`;
+ */ export async function makeTestP2PClient(peerIdPrivateKey, port, peers, { alwaysTrueVerifier = true, p2pBaseConfig, p2pConfigOverrides = {}, mockAttestationPool, mockTxPool, mockEpochCache, mockWorldState, mockGossipSubNetwork, logger = createLogger('p2p-test-client') }) {
     // Filter nodes so that we only dial active peers
     const config = {
         ...p2pBaseConfig,
         p2pEnabled: true,
-        peerIdPrivateKey,
-        tcpListenAddress: listenAddr,
-        udpListenAddress: listenAddr,
-        tcpAnnounceAddress: addr,
-        udpAnnounceAddress: addr,
+        peerIdPrivateKey: new SecretValue(peerIdPrivateKey),
+        p2pIp: `127.0.0.1`,
+        listenAddress: `127.0.0.1`,
+        p2pPort: port,
         bootstrapNodes: peers,
         peerCheckIntervalMS: 1000,
         maxPeerCount: 10,
@@ -36,16 +49,55 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
     await l2BlockSource.createBlocks(100);
     const proofVerifier = alwaysTrueVerifier ? new AlwaysTrueCircuitVerifier() : new AlwaysFalseCircuitVerifier();
     const kvStore = await openTmpStore('test');
-    const deps = {
+    const client = await createP2PClient(P2PClientType.Full, config, l2BlockSource, proofVerifier, mockWorldState, mockEpochCache, 'test-p2p-client', undefined, undefined, {
         txPool: mockTxPool,
         attestationPool: mockAttestationPool,
         store: kvStore,
-        logger
-    };
-    const client = await createP2PClient(P2PClientType.Full, config, l2BlockSource, proofVerifier, mockWorldState, mockEpochCache, undefined, deps);
-    await client.start();
+        logger,
+        p2pServiceFactory: mockGossipSubNetwork && getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
+    });
     return client;
 }
+/**
+ * Creates a number of P2P clients and immediately starts them for testing purposes.
+ * @param numberOfPeers - The number of clients to create.
+ * @param options - The options for the clients.
+ * @returns The created and started clients.
+ */ export async function makeAndStartTestP2PClients(numberOfPeers, testConfig) {
+    const clients = [];
+    const peerIdPrivateKeys = generatePeerIdPrivateKeys(numberOfPeers);
+    let ports = [];
+    while(true){
+        try {
+            ports = await getPorts(numberOfPeers);
+            break;
+        } catch  {
+            await sleep(1000);
+        }
+    }
+    const peerEnrs = await makeEnrs(peerIdPrivateKeys, ports, testConfig.p2pBaseConfig);
+    for(let i = 0; i < numberOfPeers; i++){
+        const client = await makeAndStartTestP2PClient(peerIdPrivateKeys[i], ports[i], peerEnrs, {
+            ...testConfig,
+            logger: createLogger(`p2p:${i}`)
+        });
+        clients.push(client);
+    }
+    await retryUntil(()=>clients.every((c)=>c.isReady()), 'p2p clients started', 10, 0.5);
+    testConfig.logger?.info(`Created and started ${clients.length} P2P clients at ports ${ports.join(',')}`, {
+        ports,
+        peerEnrs,
+        peerIdPrivateKeys
+    });
+    return clients.map((client, index)=>{
+        return {
+            client,
+            peerPrivateKey: peerIdPrivateKeys[index],
+            port: ports[index],
+            enr: peerEnrs[index]
+        };
+    });
+}
 /**
  * Creates a number of P2P clients for testing purposes.
  * @param numberOfPeers - The number of clients to create.
@@ -54,7 +106,15 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
  */ export async function makeTestP2PClients(numberOfPeers, testConfig) {
     const clients = [];
     const peerIdPrivateKeys = generatePeerIdPrivateKeys(numberOfPeers);
-    const ports = await getPorts(numberOfPeers);
+    let ports = [];
+    while(true){
+        try {
+            ports = await getPorts(numberOfPeers);
+            break;
+        } catch  {
+            await sleep(1000);
+        }
+    }
     const peerEnrs = await makeEnrs(peerIdPrivateKeys, ports, testConfig.p2pBaseConfig);
     for(let i = 0; i < numberOfPeers; i++){
         const client = await makeTestP2PClient(peerIdPrivateKeys[i], ports[i], peerEnrs, {
@@ -63,6 +123,16 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
         });
         clients.push(client);
     }
-    await Promise.all(clients.map((client)=>client.isReady()));
-    return clients;
+    return clients.map((client, index)=>{
+        return {
+            client,
+            peerPrivateKey: peerIdPrivateKeys[index],
+            port: ports[index],
+            enr: peerEnrs[index]
+        };
+    });
+}
+export async function startTestP2PClients(clients) {
+    await Promise.all(clients.map((c)=>c.start()));
+    await retryUntil(()=>clients.every((c)=>c.isReady()), 'p2p clients started', 10, 0.5);
 }