@aztec/p2p 0.87.7 → 1.0.0-nightly.20250605

package/dest/services/reqresp/interface.js

@@ -1,6 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
+import { StatusMessage } from './protocols/status.js';
 /*
  * Request Response Sub Protocols
  */ export const PING_PROTOCOL = '/aztec/req/ping/0.1.0';
@@ -66,8 +67,8 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
         response: RequestableBuffer
     },
     [ReqRespSubProtocol.STATUS]: {
-        request: RequestableBuffer,
-        response: RequestableBuffer
+        request: StatusMessage,
+        response: StatusMessage
     },
     [ReqRespSubProtocol.TX]: {
         request: TxHash,

package/dest/services/reqresp/protocols/status.d.ts

@@ -1,7 +1,38 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+import type { WorldStateSyncStatus, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { PeerId } from '@libp2p/interface';
+export declare class StatusMessage {
+    readonly compressedComponentsVersion: string;
+    readonly latestBlockNumber: number;
+    readonly latestBlockHash: string;
+    readonly finalisedBlockNumber: number;
+    constructor(compressedComponentsVersion: string, latestBlockNumber: number, latestBlockHash: string, finalisedBlockNumber: number);
+    /**
+     * Deserializes the StatusMessage object from a Buffer.
+     * @param buffer - Buffer or BufferReader object to deserialize.
+     * @returns An instance of StatusMessage.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): StatusMessage;
+    /**
+     * Serializes the StatusMessage object into a Buffer.
+     * @returns Buffer representation of the StatusMessage object.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    /**
+     * Builds Status message
+     * @param  version - Compressed Components Version
+     * @param  worldStateSyncStatus - Info about the current sync status
+     * @returns StatusMessage instance
+     */
+    static fromWorldStateSyncStatus(version: string, syncStatus: WorldStateSyncStatus): StatusMessage;
+    validate(peerStatus: StatusMessage): boolean;
+}
 /**
- * Handles the status request.
- * @param _msg - The status request message.
- * @returns A resolved promise with the ok response.
+ * Handles the status request. By immediately responding  with the current node status.
+ * @param compressedComponentsVersion - Compressed Components Version
+ * @param worldStateSynchronizer - World State Synchronizer to fetch the sync status from.
+ * Note the WorldStateSynchronizer must be injected to fetch the fresh sync status, we cannot pass in pre-built StatusMessage.
+ * @returns Status message handler
  */
-export declare function statusHandler(_msg: any): Promise<Buffer>;
+export declare function reqRespStatusHandler(compressedComponentsVersion: string, worldStateSynchronizer: WorldStateSynchronizer): (_peerId: PeerId, _msg: Buffer) => Promise<Buffer<ArrayBufferLike>>;
 //# sourceMappingURL=status.d.ts.map

package/dest/services/reqresp/protocols/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/status.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAExD"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEpG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAQhD,qBAAa,aAAa;IAEtB,QAAQ,CAAC,2BAA2B,EAAE,MAAM;IAC5C,QAAQ,CAAC,iBAAiB,EAAE,MAAM;IAClC,QAAQ,CAAC,eAAe,EAAE,MAAM;IAChC,QAAQ,CAAC,oBAAoB,EAAE,MAAM;gBAH5B,2BAA2B,EAAE,MAAM,EACnC,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,oBAAoB,EAAE,MAAM;IAKvC;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAY/D;;;OAGG;IACH,QAAQ;IAWR;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,GAAG,aAAa;IAUjG,QAAQ,CAAC,UAAU,EAAE,aAAa,GAAG,OAAO;CAI7C;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,2BAA2B,EAAE,MAAM,EACnC,sBAAsB,EAAE,sBAAsB,IAEhC,SAAS,MAAM,EAAE,MAAM,MAAM,sCAO5C"}

package/dest/services/reqresp/protocols/status.js

@@ -1,7 +1,61 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+/*
+ * P2P Status Message
+ * It is used to establish Status handshake between to peers
+ * By validating Status handshake we ensure peers are on the same Blockchain fork
+ * And get peer sync status
+ */ export class StatusMessage {
+    compressedComponentsVersion;
+    latestBlockNumber;
+    latestBlockHash;
+    finalisedBlockNumber;
+    constructor(compressedComponentsVersion, latestBlockNumber, latestBlockHash, finalisedBlockNumber){
+        this.compressedComponentsVersion = compressedComponentsVersion;
+        this.latestBlockNumber = latestBlockNumber;
+        this.latestBlockHash = latestBlockHash;
+        this.finalisedBlockNumber = finalisedBlockNumber;
+    }
+    /**
+   * Deserializes the StatusMessage object from a Buffer.
+   * @param buffer - Buffer or BufferReader object to deserialize.
+   * @returns An instance of StatusMessage.
+   */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new StatusMessage(reader.readString(), reader.readNumber(), reader.readString(), reader.readNumber());
+    }
+    /**
+   * Serializes the StatusMessage object into a Buffer.
+   * @returns Buffer representation of the StatusMessage object.
+   */ toBuffer() {
+        return serializeToBuffer([
+            this.compressedComponentsVersion,
+            this.latestBlockNumber,
+            this.latestBlockHash,
+            this.finalisedBlockNumber
+        ]);
+    }
+    /**
+   * Builds Status message
+   * @param  version - Compressed Components Version
+   * @param  worldStateSyncStatus - Info about the current sync status
+   * @returns StatusMessage instance
+   */ static fromWorldStateSyncStatus(version, syncStatus) {
+        return new StatusMessage(version, syncStatus.latestBlockNumber, syncStatus.latestBlockHash, syncStatus.finalisedBlockNumber);
+    }
+    validate(peerStatus) {
+        // TODO: Validate other fields as well
+        return this.compressedComponentsVersion === peerStatus.compressedComponentsVersion;
+    }
+}
 /**
- * Handles the status request.
- * @param _msg - The status request message.
- * @returns A resolved promise with the ok response.
- */ export function statusHandler(_msg) {
-    return Promise.resolve(Buffer.from('ok'));
+ * Handles the status request. By immediately responding  with the current node status.
+ * @param compressedComponentsVersion - Compressed Components Version
+ * @param worldStateSynchronizer - World State Synchronizer to fetch the sync status from.
+ * Note the WorldStateSynchronizer must be injected to fetch the fresh sync status, we cannot pass in pre-built StatusMessage.
+ * @returns Status message handler
+ */ export function reqRespStatusHandler(compressedComponentsVersion, worldStateSynchronizer) {
+    return async (_peerId, _msg)=>{
+        const status = StatusMessage.fromWorldStateSyncStatus(compressedComponentsVersion, (await worldStateSynchronizer.status()).syncSummary);
+        return Promise.resolve(status.toBuffer());
+    };
 }

package/dest/services/service.d.ts

@@ -9,7 +9,7 @@ export declare enum PeerDiscoveryState {
     RUNNING = "running",
     STOPPED = "stopped"
 }
-export type P2PBlockReceivedCallback = (block: BlockProposal, sender: PeerId) => Promise<BlockAttestation | undefined>;
+export type P2PBlockReceivedCallback = (block: BlockProposal, sender: PeerId) => Promise<BlockAttestation[] | undefined>;
 /**
  * The interface for a P2P service implementation.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"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"}

package/dest/services/tx_collector.d.ts

@@ -1,12 +1,14 @@
 import { type Logger } from '@aztec/foundation/log';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import type { PeerId } from '@libp2p/interface';
 import type { P2PClient } from '../client/p2p_client.js';
 export declare class TxCollector {
     private p2pClient;
     private log;
-    constructor(p2pClient: Pick<P2PClient, 'getTxsByHashFromPool' | 'hasTxsInPool' | 'getTxsByHash' | 'validate' | 'requestTxsByHash'>, log?: Logger);
-    collectForBlockProposal(proposal: BlockProposal, peerWhoSentTheProposal: any): Promise<{
+    constructor(p2pClient: Pick<P2PClient, 'getTxsByHashFromPool' | 'hasTxsInPool' | 'getTxsByHash' | 'validate' | 'requestTxsByHash' | 'addTxsToPool'>, log?: Logger);
+    private collectFromProposal;
+    collectForBlockProposal(proposal: BlockProposal, peerWhoSentTheProposal: PeerId | undefined): Promise<{
         txs: Tx[];
         missing?: TxHash[];
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"tx_collector.d.ts","sourceRoot":"","sources":["../../src/services/tx_collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,qBAAa,WAAW;IAEpB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,GAAG;gBAJH,SAAS,EAAE,IAAI,CACrB,SAAS,EACT,sBAAsB,GAAG,cAAc,GAAG,cAAc,GAAG,UAAU,GAAG,kBAAkB,CAC3F,EACO,GAAG,GAAE,MAAyC;IAGlD,uBAAuB,CAC3B,QAAQ,EAAE,aAAa,EACvB,sBAAsB,EAAE,GAAG,GAC1B,OAAO,CAAC;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAmF9C"}
+{"version":3,"file":"tx_collector.d.ts","sourceRoot":"","sources":["../../src/services/tx_collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,qBAAa,WAAW;IAEpB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,GAAG;gBAJH,SAAS,EAAE,IAAI,CACrB,SAAS,EACT,sBAAsB,GAAG,cAAc,GAAG,cAAc,GAAG,UAAU,GAAG,kBAAkB,GAAG,cAAc,CAC5G,EACO,GAAG,GAAE,MAAyC;YAI1C,mBAAmB;IAqD3B,uBAAuB,CAC3B,QAAQ,EAAE,aAAa,EACvB,sBAAsB,EAAE,MAAM,GAAG,SAAS,GACzC,OAAO,CAAC;QAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAyB9C"}

package/dest/services/tx_collector.js

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

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

@@ -16,6 +16,15 @@ interface MakeTestP2PClientOptions {
     p2pConfigOverrides?: Partial<P2PConfig>;
     logger?: Logger;
 }
+/**
+ * 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.
@@ -25,6 +34,18 @@ interface MakeTestP2PClientOptions {
  * @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>>;
+/**
+ * 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.

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;AAIlE,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,0CA2C5B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB;;;;;KAiCnG"}
+{"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;AAIlE,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,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,MAAwC,GACzC,EAAE,wBAAwB,0CAyC5B;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB;;;;;KAiC3G;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB;;;;;KAgCnG"}

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

@@ -8,6 +8,18 @@ import { generatePeerIdPrivateKeys } from '../test-helpers/generate-peer-id-priv
 import { getPorts } from './get-ports.js';
 import { makeEnrs } from './make-enrs.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.
@@ -41,9 +53,43 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
         logger
     };
     const client = await createP2PClient(P2PClientType.Full, config, l2BlockSource, proofVerifier, mockWorldState, mockEpochCache, 'test-p2p-client', undefined, deps);
-    await client.start();
     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 Promise.all(clients.map((client)=>client.isReady()));
+    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.
@@ -69,7 +115,6 @@ import { AlwaysFalseCircuitVerifier, AlwaysTrueCircuitVerifier } from './reqresp
         });
         clients.push(client);
     }
-    await Promise.all(clients.map((client)=>client.isReady()));
     return clients.map((client, index)=>{
         return {
             client,

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

@@ -17,7 +17,7 @@ import { BootstrapNode } from '../bootstrap/bootstrap.js';
 import { DiscV5Service } from '../services/discv5/discV5_service.js';
 import { LibP2PService } from '../services/libp2p/libp2p_service.js';
 import { ReqRespSubProtocol, noopValidator } from '../services/reqresp/interface.js';
-import { pingHandler, statusHandler } from '../services/reqresp/protocols/index.js';
+import { pingHandler } from '../services/reqresp/protocols/index.js';
 import { ReqResp } from '../services/reqresp/reqresp.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
 /**
@@ -95,7 +95,7 @@ import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js
 // Mock sub protocol handlers
 export const MOCK_SUB_PROTOCOL_HANDLERS = {
     [ReqRespSubProtocol.PING]: pingHandler,
-    [ReqRespSubProtocol.STATUS]: statusHandler,
+    [ReqRespSubProtocol.STATUS]: (_msg)=>Promise.resolve(Buffer.from('status')),
     [ReqRespSubProtocol.TX]: (_msg)=>Promise.resolve(Buffer.from('tx')),
     [ReqRespSubProtocol.GOODBYE]: (_msg)=>Promise.resolve(Buffer.from('goodbye')),
     [ReqRespSubProtocol.BLOCK]: (_msg)=>Promise.resolve(Buffer.from('block'))

package/dest/testbench/p2p_client_testbench_worker.js

@@ -19,7 +19,7 @@ function mockTxPool() {
     // Mock all methods
     return {
         isEmpty: ()=>Promise.resolve(false),
-        addTxs: ()=>Promise.resolve(),
+        addTxs: ()=>Promise.resolve(1),
         getTxByHash: ()=>Promise.resolve(undefined),
         getArchivedTxByHash: ()=>Promise.resolve(undefined),
         markAsMined: ()=>Promise.resolve(),
@@ -63,7 +63,7 @@ function mockEpochCache() {
                 ts: 0n
             }),
         computeProposerIndex: ()=>0n,
-        getProposerInCurrentOrNextSlot: ()=>Promise.resolve({
+        getProposerAttesterAddressInCurrentOrNextSlot: ()=>Promise.resolve({
                 currentProposer: EthAddress.ZERO,
                 nextProposer: EthAddress.ZERO,
                 currentSlot: 0n,
@@ -72,6 +72,19 @@ function mockEpochCache() {
         isInCommittee: ()=>Promise.resolve(false)
     };
 }
+function mockWorldStateSynchronizer() {
+    return {
+        status: ()=>Promise.resolve({
+                syncSummary: {
+                    latestBlockNumber: 0,
+                    latestBlockHash: '',
+                    finalisedBlockNumber: 0,
+                    treesAreSynched: false,
+                    oldestHistoricBlockNumber: 0
+                }
+            })
+    };
+}
 class TestLibP2PService extends LibP2PService {
     disableTxValidation;
     gossipMessageCount = 0;
@@ -117,7 +130,7 @@ process.on('message', async (msg)=>{
             const txPool = mockTxPool();
             const attestationPool = mockAttestationPool();
             const epochCache = mockEpochCache();
-            const worldState = {};
+            const worldState = mockWorldStateSynchronizer();
             const l2BlockSource = new MockL2BlockSource();
             const proofVerifier = new AlwaysTrueCircuitVerifier();
             const kvStore = await openTmpStore(`test-${clientIndex}`);

package/package.json

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

package/src/client/interface.ts

@@ -1,5 +1,5 @@
 import type { L2BlockId } from '@aztec/stdlib/block';
-import type { P2PApi } from '@aztec/stdlib/interfaces/server';
+import type { P2PApiFull } from '@aztec/stdlib/interfaces/server';
 import type { BlockProposal, P2PClientType } from '@aztec/stdlib/p2p';
 import type { Tx, TxHash } from '@aztec/stdlib/tx';
 
@@ -36,7 +36,7 @@ export interface P2PSyncState {
 /**
  * Interface of a P2P client.
  **/
-export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApi<T> & {
+export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApiFull<T> & {
   /**
    * Broadcasts a block proposal to other peers.
    *
@@ -77,8 +77,9 @@ export type P2P<T extends P2PClientType = P2PClientType.Full> = P2PApi<T> & {
   /**
    * Adds transactions to the pool. Does not send to peers or validate the tx.
    * @param txs - The transactions.
+   * @returns The number of txs added to the pool. Note if the transaction already exists, it will not be added again.
    **/
-  addTxs(txs: Tx[]): Promise<void>;
+  addTxsToPool(txs: Tx[]): Promise<number>;
 
   /**
    * Deletes 'txs' from the pool, given hashes.

package/src/client/p2p_client.ts

@@ -31,7 +31,7 @@ import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_
 import type { MemPools } from '../mem_pools/interface.js';
 import type { TxPool } from '../mem_pools/tx_pool/index.js';
 import { ReqRespSubProtocol } from '../services/reqresp/interface.js';
-import type { P2PService } from '../services/service.js';
+import type { P2PBlockReceivedCallback, P2PService } from '../services/service.js';
 import { TxCollector } from '../services/tx_collector.js';
 import { type P2P, P2PClientState, type P2PSyncState } from './interface.js';
 
@@ -331,15 +331,13 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
     );
   }
 
-  public addAttestation(attestation: BlockAttestation): Promise<void> {
-    return this.attestationPool?.addAttestations([attestation]) ?? Promise.resolve();
+  public addAttestations(attestations: BlockAttestation[]): Promise<void> {
+    return this.attestationPool?.addAttestations(attestations) ?? Promise.resolve();
   }
 
   // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
   // ^ This pattern is not my favorite (md)
-  public registerBlockProposalHandler(
-    handler: (block: BlockProposal, sender: any) => Promise<BlockAttestation | undefined>,
-  ): void {
+  public registerBlockProposalHandler(handler: P2PBlockReceivedCallback): void {
     this.p2pService.registerBlockReceivedCallback(handler);
   }
 
@@ -444,7 +442,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   /**
    * Returns transactions in the transaction pool by hash.
    * @param txHashes - Hashes of the transactions to look for.
-   * @returns The txs found, not necessarily on the same order as the hashes.
+   * @returns The txs found, in the same order as the requested hashes. If a tx is not found, it will be undefined.
    */
   getTxsByHashFromPool(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
     return this.txPool.getTxsByHash(txHashes);
@@ -527,17 +525,20 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
    * @returns Empty promise.
    **/
   public async sendTx(tx: Tx): Promise<void> {
-    await this.addTxs([tx]);
-    await this.p2pService.propagate(tx);
+    const addedCount = await this.addTxsToPool([tx]);
+    const txAddedSuccessfully = addedCount === 1;
+    if (txAddedSuccessfully) {
+      await this.p2pService.propagate(tx);
+    }
   }
 
   /**
    * Adds transactions to the pool. Does not send to peers or validate the txs.
    * @param txs - The transactions.
    **/
-  public async addTxs(txs: Tx[]): Promise<void> {
+  public async addTxsToPool(txs: Tx[]): Promise<number> {
     this.#assertIsReady();
-    await this.txPool.addTxs(txs);
+    return await this.txPool.addTxs(txs);
   }
 
   /**

package/src/mem_pools/attestation_pool/attestation_pool.ts

@@ -8,7 +8,7 @@ import type { BlockAttestation } from '@aztec/stdlib/p2p';
  */
 export interface AttestationPool {
   /**
-   * AddAttestation
+   * AddAttestations
    *
    * @param attestations - Attestations to add into the pool
    */