@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/services/tx_collection/tx_collection_sink.js

@@ -0,0 +1,111 @@
+import { elapsed } from '@aztec/foundation/timer';
+import EventEmitter from 'node:events';
+import { TxCollectionInstrumentation } from './instrumentation.js';
+/**
+ * Executes collection requests from the fast and slow collection loops, and handles collected txs
+ * by adding them to the tx pool and emitting events, as well as handling logging and metrics.
+ */ export class TxCollectionSink extends EventEmitter {
+    txPool;
+    log;
+    instrumentation;
+    constructor(txPool, telemetryClient, log){
+        super(), this.txPool = txPool, this.log = log;
+        this.instrumentation = new TxCollectionInstrumentation(telemetryClient, 'TxCollection');
+    }
+    async collect(collectValidTxsFn, requested, info) {
+        this.log.trace(`Requesting ${requested.length} txs via ${info.description}`, {
+            ...info,
+            requestedTxs: requested.map((t)=>t.toString())
+        });
+        // Execute collection function and measure the time taken, catching any errors.
+        const [duration, txs] = await elapsed(async ()=>{
+            try {
+                const response = await collectValidTxsFn(requested);
+                return response.filter((tx)=>tx !== undefined);
+            } catch (err) {
+                this.log.error(`Error collecting txs via ${info.description}`, err, {
+                    ...info,
+                    requestedTxs: requested.map((hash)=>hash.toString())
+                });
+                return [];
+            }
+        });
+        if (txs.length === 0) {
+            this.log.trace(`No txs found via ${info.description}`, {
+                ...info,
+                requestedTxs: requested.map((t)=>t.toString())
+            });
+            return {
+                txs,
+                requested,
+                duration
+            };
+        }
+        // Validate tx hashes for all collected txs from external sources
+        const validTxs = [];
+        const invalidTxHashes = [];
+        await Promise.all(txs.map(async (tx)=>{
+            const isValid = await tx.validateTxHash();
+            if (isValid) {
+                validTxs.push(tx);
+            } else {
+                invalidTxHashes.push(tx.getTxHash().toString());
+            }
+        }));
+        if (invalidTxHashes.length > 0) {
+            this.log.warn(`Rejecting ${invalidTxHashes.length} txs with invalid hashes from ${info.description}`, {
+                ...info,
+                invalidTxHashes
+            });
+        }
+        if (validTxs.length === 0) {
+            this.log.trace(`No valid txs found via ${info.description} after validation`, {
+                ...info,
+                requestedTxs: requested.map((t)=>t.toString()),
+                invalidTxHashes
+            });
+            return {
+                txs: [],
+                requested,
+                duration
+            };
+        }
+        this.log.verbose(`Collected ${validTxs.length} txs out of ${requested.length} requested via ${info.description} in ${duration}ms`, {
+            ...info,
+            duration,
+            txs: validTxs.map((t)=>t.getTxHash().toString()),
+            requestedTxs: requested.map((t)=>t.toString()),
+            rejectedCount: invalidTxHashes.length
+        });
+        return await this.foundTxs(validTxs, {
+            ...info,
+            duration
+        });
+    }
+    async foundTxs(txs, info) {
+        // Report metrics for the collection
+        this.instrumentation.increaseTxsFor(info.method, txs.length, info.duration);
+        // Mark txs as found in the slow missing txs set and all fast requests
+        this.emit('txs-added', {
+            txs
+        });
+        // Add the txs to the tx pool (should not fail, but we catch it just in case)
+        try {
+            await this.txPool.addTxs(txs, {
+                source: `tx-collection`
+            });
+        } catch (err) {
+            this.log.error(`Error adding txs to the pool via ${info.description}`, err, {
+                ...info,
+                txs: txs.map((tx)=>tx.txHash.toString())
+            });
+            // Return no txs since none have been added
+            return {
+                txs: []
+            };
+        }
+        return {
+            txs
+        };
+    }
+}

package/dest/services/tx_collection/tx_source.d.ts

@@ -0,0 +1,18 @@
+import type { ChainConfig } from '@aztec/stdlib/config';
+import { type AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import { type ComponentsVersions } from '@aztec/stdlib/versioning';
+export interface TxSource {
+    getInfo(): string;
+    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+}
+export declare class NodeRpcTxSource implements TxSource {
+    private readonly client;
+    private readonly info;
+    constructor(client: Pick<AztecNode, 'getTxsByHash'>, info: string);
+    static fromUrl(nodeUrl: string, versions: ComponentsVersions): NodeRpcTxSource;
+    getInfo(): string;
+    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
+}
+export declare function createNodeRpcTxSources(urls: string[], chainConfig: ChainConfig): NodeRpcTxSource[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBbUMsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRyxNQUFNLFdBQVcsUUFBUTtJQUN2QixPQUFPLElBQUksTUFBTSxDQUFDO0lBQ2xCLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztDQUMvRDtBQUVELHFCQUFhLGVBQWdCLFlBQVcsUUFBUTtJQUU1QyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBRnZCLFlBQ21CLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUN2QyxJQUFJLEVBQUUsTUFBTSxFQUMzQjtJQUVKLE9BQWMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixHQUFHLGVBQWUsQ0FHcEY7SUFFTSxPQUFPLFdBRWI7SUFFTSxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRSxDQUFDLENBRW5FO0NBQ0Y7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLFdBQVcsRUFBRSxXQUFXLHFCQUc5RSJ9

package/dest/services/tx_collection/tx_source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAmC,MAAM,0BAA0B,CAAC;AAGpG,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFvB,YACmB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvC,IAAI,EAAE,MAAM,EAC3B;IAEJ,OAAc,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,eAAe,CAGpF;IAEM,OAAO,WAEb;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAEnE;CACF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,qBAG9E"}

package/dest/services/tx_collection/tx_source.js

@@ -0,0 +1,31 @@
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
+import { makeTracedFetch } from '@aztec/telemetry-client';
+export class NodeRpcTxSource {
+    client;
+    info;
+    constructor(client, info){
+        this.client = client;
+        this.info = info;
+    }
+    static fromUrl(nodeUrl, versions) {
+        const client = createAztecNodeClient(nodeUrl, versions, makeTracedFetch([
+            1,
+            2,
+            3
+        ], false));
+        return new NodeRpcTxSource(client, nodeUrl);
+    }
+    getInfo() {
+        return this.info;
+    }
+    getTxsByHash(txHashes) {
+        return this.client.getTxsByHash(txHashes);
+    }
+}
+export function createNodeRpcTxSources(urls, chainConfig) {
+    const versions = getComponentsVersionsFromConfig(chainConfig, protocolContractsHash, getVKTreeRoot());
+    return urls.map((url)=>NodeRpcTxSource.fromUrl(url, versions));
+}

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 { L2BlockNew } 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: L2BlockNew, 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvdmlkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy90eF9wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sS0FBSyxFQUFlLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUE4QixZQUFZLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRyxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU3RTs7O0dBR0c7QUFDSCxxQkFBYSxVQUFXLFlBQVcsV0FBVztJQUkxQyxPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxHQUFHO0lBTmIsU0FBUyxDQUFDLGVBQWUsRUFBRSx5QkFBeUIsQ0FBQztJQUVyRCxZQUNVLFlBQVksRUFBRSxZQUFZLEVBQzFCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsV0FBVyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLEVBQ3hDLEdBQUcsR0FBRSxNQUF5QyxFQUN0RCxNQUFNLEdBQUUsZUFBc0MsRUFHL0M7SUFFRCxzREFBc0Q7SUFDekMsZUFBZSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUE7S0FBRSxDQUFDLENBa0I3RjtJQUVELGtGQUFrRjtJQUMzRSxzQkFBc0IsQ0FDM0IsYUFBYSxFQUFFLGFBQWEsRUFDNUIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsSUFBSSxFQUFFO1FBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7UUFBQyxRQUFRLEVBQUUsSUFBSSxDQUFBO0tBQUUsR0FDdkQsT0FBTyxDQUFDO1FBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFBO0tBQUUsQ0FBQyxDQU85QztJQUVELG1FQUFtRTtJQUM1RCxjQUFjLENBQUMsS0FBSyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUU7UUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUM7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUE7S0FBRSxDQUFDLENBTy9HO1lBRWEsMkJBQTJCO0lBZ0N6QyxPQUFPLENBQUMsUUFBUTtZQUtGLG9CQUFvQjtZQXNGcEIsY0FBYztJQVk1QixPQUFPLENBQUMsbUJBQW1CO1lBT2Isa0JBQWtCO0NBT2pDIn0=

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,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACnE,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,UAAU,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,CAO/G;YAEa,2BAA2B;IAgCzC,OAAO,CAAC,QAAQ;YAKF,oBAAoB;YAsFpB,cAAc;IAY5B,OAAO,CAAC,mBAAmB;YAOb,kBAAkB;CAOjC"}

package/dest/services/tx_provider.js

@@ -0,0 +1,217 @@
+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) {
+            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);
+            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.instrumentation.incTxsFromP2P(txsFromNetwork.length, txHashes.length);
+            this.log.debug(`Retrieved ${txsFromNetwork.length} txs from network for block proposal (${missingTxHashes.size} pending)`, {
+                ...blockInfo,
+                missingTxHashes: [
+                    ...missingTxHashes
+                ]
+            });
+        }
+        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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvdmlkZXJfaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvdHhfcHJvdmlkZXJfaW5zdHJ1bWVudGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBMkIsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFFNUcscUJBQWEseUJBQXlCO0lBQ3BDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBZ0I7SUFDM0MsT0FBTyxDQUFDLGtCQUFrQixDQUFnQjtJQUMxQyxPQUFPLENBQUMsY0FBYyxDQUFnQjtJQUN0QyxPQUFPLENBQUMsZUFBZSxDQUFnQjtJQUV2QyxPQUFPLENBQUMsNkJBQTZCLENBQVk7SUFDakQsT0FBTyxDQUFDLGVBQWUsQ0FBWTtJQUVuQyxZQUFZLE1BQU0sRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUEyQmhEO0lBRUQsbUJBQW1CLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFaEM7SUFFRCxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxRQUU5QjtJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBR3pDO0lBRUQscUJBQXFCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFbEM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFMUI7Q0FDRiJ9

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,EAA2B,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAE5G,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,EA2BhD;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,47 @@
+import { Metrics } from '@aztec/telemetry-client';
+export class TxProviderInstrumentation {
+    txFromProposalCount;
+    txFromMempoolCount;
+    txFromP2PCount;
+    missingTxsCount;
+    fractionOfTxsRequestedFromP2P;
+    txsRequestDelay;
+    constructor(client, name){
+        const meter = client.getMeter(name);
+        this.txFromProposalCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_PROPOSALS_COUNT, {
+            description: 'The number of txs taken from block proposals'
+        });
+        this.txFromMempoolCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_MEMPOOL_COUNT, {
+            description: 'The number of txs taken from the local mempool'
+        });
+        this.txFromP2PCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_P2P_COUNT, {
+            description: 'The number of txs taken from the p2p network'
+        });
+        this.missingTxsCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_MISSING_TXS_COUNT, {
+            description: 'The number of txs not found anywhere'
+        });
+        this.fractionOfTxsRequestedFromP2P = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUESTED_FRACTION, {
+            description: 'The fraction of transaction requested from peers'
+        });
+        this.txsRequestDelay = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUEST_DELAY, {
+            unit: 'ms',
+            description: 'The time it took to request missing transactions from p2p'
+        });
+    }
+    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,5 @@ 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';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LWhlbHBlcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsa0JBQWtCLENBQUMifQ==

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"}

package/dest/test-helpers/index.js

@@ -3,3 +3,4 @@ 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';

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);