@aztec/p2p 1.2.1 → 2.0.0-nightly.20250813

package/dest/services/reqresp/config.js

@@ -1,7 +1,7 @@
 import { booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
-export const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 2000;
-export const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 4000;
-export const DEFAULT_REQRESP_DIAL_TIMEOUT_MS = 1000;
+export const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 10_000;
+export const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 10_000; // Not currently used
+export const DEFAULT_REQRESP_DIAL_TIMEOUT_MS = 5_000;
 export const DEFAULT_OPTIMISTIC_NEGOTIATION = false;
 // For use in tests.
 export const DEFAULT_P2P_REQRESP_CONFIG = {

package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts

@@ -15,10 +15,9 @@ export declare class ConnectionSampler {
     private readonly logger;
     private readonly opts;
     private cleanupInterval;
-    private dialAttempts;
-    private readonly activeConnectionsCount;
-    private readonly streams;
-    private dialQueue;
+    protected readonly activeConnectionsCount: Map<string, number>;
+    protected readonly streams: Set<Stream>;
+    private abortOnStop;
     constructor(libp2p: Libp2p, sampler: RandomSampler, logger?: import("@aztec/foundation/log").Logger, opts?: {
         cleanupIntervalMs?: number;
         p2pOptimisticNegotiation?: boolean;

package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/connection_sampler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhE,qBAAa,aAAa;IACxB,MAAM,CAAC,GAAG,EAAE,MAAM;CAGnB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAW1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAbvB,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAyB;IAE7C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAkC;IACzE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAGlD,OAAO,CAAC,SAAS,CAAkC;gBAGhC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,yCAAiD,EACvD,IAAI,GAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;KAAO;IAUhG;;OAEG;IACG,IAAI;IAgBV;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS;IAO7D;;;;;;;;;;;OAWG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EAAE,EACf,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B;QACD,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB;IAuCD;;;;;;OAMG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE;IAyCpF;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4CvF;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC1C;;OAEG;YACW,uBAAuB;CAqBtC"}
+{"version":3,"file":"connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/connection_sampler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhE,qBAAa,aAAa;IACxB,MAAM,CAAC,GAAG,EAAE,MAAM;CAGnB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAY1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAdvB,OAAO,CAAC,eAAe,CAAiB;IAGxC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAG3E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAEpD,OAAO,CAAC,WAAW,CAA0C;gBAG1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,yCAAiD,EACvD,IAAI,GAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;KAAO;IAQhG;;OAEG;IACG,IAAI;IAWV;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS;IAO7D;;;;;;;;;;;OAWG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EAAE,EACf,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B;QACD,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB;IAuCD;;;;;;OAMG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE;IA0CpF;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBvF;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC1C;;OAEG;YACW,uBAAuB;CAqBtC"}

package/dest/services/reqresp/connection-sampler/connection_sampler.js

@@ -1,6 +1,5 @@
-import { AbortError, TimeoutError } from '@aztec/foundation/error';
+import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 const MAX_SAMPLE_ATTEMPTS = 4;
 export class RandomSampler {
     random(max) {
@@ -19,33 +18,27 @@ export class RandomSampler {
     logger;
     opts;
     cleanupInterval;
-    dialAttempts;
+    // Map from stringified peer id to number of active connections
     activeConnectionsCount;
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     streams;
-    // Serial queue to ensure that we only dial one peer at a time
-    dialQueue;
+    abortOnStop;
     constructor(libp2p, sampler, logger = createLogger('p2p:reqresp:connection-sampler'), opts = {}){
         this.libp2p = libp2p;
         this.sampler = sampler;
         this.logger = logger;
         this.opts = opts;
-        this.dialAttempts = [];
         this.activeConnectionsCount = new Map();
         this.streams = new Set();
-        this.dialQueue = new SerialQueue();
+        this.abortOnStop = new AbortController();
         this.cleanupInterval = setInterval(()=>void this.cleanupStaleConnections(), this.opts.cleanupIntervalMs ?? 60_000);
-        this.dialQueue.start();
     }
     /**
    * Stops the cleanup job and closes all active connections
    */ async stop() {
         this.logger.info('Stopping connection sampler');
+        this.abortOnStop.abort(new AbortError('Connection sampler stopped'));
         clearInterval(this.cleanupInterval);
-        for (const attempt of this.dialAttempts){
-            attempt.abort(new AbortError('Connection sampler stopped'));
-        }
-        this.dialAttempts = [];
-        await this.dialQueue.end();
         // Close all active streams
         const closePromises = Array.from(this.streams.values()).map((stream)=>this.close(stream));
         await Promise.all(closePromises);
@@ -85,7 +78,7 @@ export class RandomSampler {
         for(let attempts = 0; attempts < MAX_SAMPLE_ATTEMPTS && peers.length > 0; attempts++){
             const randomIndex = this.sampler.random(peers.length);
             const peer = peers[randomIndex];
-            const hasActiveConnections = (this.activeConnectionsCount.get(peer) ?? 0) > 0;
+            const hasActiveConnections = (this.activeConnectionsCount.get(peer.toString()) ?? 0) > 0;
             const isExcluded = excluding?.get(peer.toString()) ?? false;
             // Remove this peer from consideration
             peers.splice(randomIndex, 1);
@@ -129,6 +122,7 @@ export class RandomSampler {
         // Only sample as many peers as we have available
         numberToSample = Math.min(numberToSample, peers.length);
         const batch = [];
+        // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
         const withActiveConnections = new Set();
         for(let i = 0; i < numberToSample; i++){
             const { peer, sampledPeers } = this.getPeerFromList(peers, excluding);
@@ -164,40 +158,27 @@ export class RandomSampler {
    * @param timeout - Abort connection if it takes too long
    * @returns The stream
    */ async dialProtocol(peerId, protocol, timeout) {
-        // Dialling at the same time can cause race conditions where two different streams
-        // end up with the same id, hence a serial queue
-        this.logger.debug(`Dial queue length: ${this.dialQueue.length()}`);
-        const abortController = new AbortController();
-        this.dialAttempts.push(abortController);
-        let timeoutHandle;
-        if (timeout) {
-            timeoutHandle = setTimeout(()=>abortController.abort(new TimeoutError('Dial protocol timeout')), timeout);
-        }
-        try {
-            const stream = await this.dialQueue.put(()=>this.libp2p.dialProtocol(peerId, protocol, {
-                    signal: abortController.signal,
-                    negotiateFully: !this.opts.p2pOptimisticNegotiation
-                }));
-            stream.metadata.peerId = peerId;
-            this.streams.add(stream);
-            const updatedActiveConnectionsCount = (this.activeConnectionsCount.get(peerId) ?? 0) + 1;
-            this.activeConnectionsCount.set(peerId, updatedActiveConnectionsCount);
-            this.logger.trace('Dialed protocol', {
-                streamId: stream.id,
-                protocol,
-                peerId: peerId.toString(),
-                activeConnectionsCount: updatedActiveConnectionsCount
-            });
-            return stream;
-        } finally{
-            if (timeoutHandle) {
-                clearTimeout(timeoutHandle);
-            }
-            const idx = this.dialAttempts.indexOf(abortController);
-            if (idx > -1) {
-                this.dialAttempts.splice(idx, 1);
-            }
-        }
+        const stream = await this.libp2p.dialProtocol(peerId, protocol, {
+            signal: AbortSignal.any(timeout ? [
+                this.abortOnStop.signal,
+                AbortSignal.timeout(timeout)
+            ] : [
+                this.abortOnStop.signal
+            ]),
+            negotiateFully: !this.opts.p2pOptimisticNegotiation
+        });
+        stream.metadata.peerId = peerId;
+        this.streams.add(stream);
+        const peerIdString = peerId.toString();
+        const updatedActiveConnectionsCount = (this.activeConnectionsCount.get(peerIdString) ?? 0) + 1;
+        this.activeConnectionsCount.set(peerIdString, updatedActiveConnectionsCount);
+        this.logger.trace('Dialed protocol', {
+            streamId: stream.id,
+            protocol,
+            peerId: peerIdString,
+            activeConnectionsCount: updatedActiveConnectionsCount
+        });
+        return stream;
     }
     /**
    * Closes a stream and updates the active connections count
@@ -209,12 +190,12 @@ export class RandomSampler {
             if (!peerId) {
                 this.logger.warn(`Stream ${stream.id} does not have a peerId set`);
             } else {
-                updatedActiveConnectionsCount = (this.activeConnectionsCount.get(peerId) ?? 1) - 1;
-                this.activeConnectionsCount.set(peerId, updatedActiveConnectionsCount);
+                updatedActiveConnectionsCount = (this.activeConnectionsCount.get(peerId.toString()) ?? 1) - 1;
+                this.activeConnectionsCount.set(peerId.toString(), updatedActiveConnectionsCount);
             }
             this.logger.trace('Closing connection', {
                 streamId: stream.id,
-                peerId: peerId.toString(),
+                peerId: peerId?.toString(),
                 protocol: stream.protocol,
                 activeConnectionsCount: updatedActiveConnectionsCount
             });
@@ -224,6 +205,8 @@ export class RandomSampler {
             await stream.close();
         } catch (error) {
             this.logger.error(`Failed to close connection to peer ${peerId ?? 'unknown'} with stream id ${stream.id}`, error);
+            // graceful close failed, abort the stream
+            stream.abort(new AbortError('Failed to close stream gracefully'));
         } finally{
             this.streams.delete(stream);
         }
@@ -239,7 +222,7 @@ export class RandomSampler {
                 const peerId = stream.metadata.peerId;
                 if (!peerId) {
                     this.logger.warn(`Stream ${stream.id} does not have a peerId set`);
-                } else if (this.activeConnectionsCount.get(peerId) === 0) {
+                } else if (this.activeConnectionsCount.get(peerId.toString()) === 0) {
                     await this.close(stream);
                     this.logger.debug('Cleaned up stale connection', {
                         streamId: stream.id,

package/dest/services/reqresp/index.d.ts

@@ -1,6 +1,7 @@
-export {};
 /**
  * Request Response protocol allows nodes to ask their peers for data
  * that they missed via the traditional gossip protocol.
  */
+export * from './protocols/index.js';
+export * from './interface.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/services/reqresp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/index.ts"],"names":[],"mappings":";AAAA;;;GAGG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}

package/dest/services/reqresp/index.js

@@ -1,4 +1,5 @@
 /**
  * Request Response protocol allows nodes to ask their peers for data
  * that they missed via the traditional gossip protocol.
- */ 
+ */ export * from './protocols/index.js';
+export * from './interface.js';

package/dest/services/reqresp/interface.d.ts

@@ -1,17 +1,27 @@
+import { Fr } from '@aztec/foundation/fields';
+import { L2Block } from '@aztec/stdlib/block';
+import { TxArray, TxHashArray } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
 import type { P2PReqRespConfig } from './config.js';
+import { AuthRequest, AuthResponse } from './protocols/auth.js';
+import { BlockTxsRequest, BlockTxsResponse } from './protocols/block_txs/block_txs_reqresp.js';
+import { StatusMessage } from './protocols/status.js';
 import type { ReqRespStatus } from './status.js';
 export declare const PING_PROTOCOL = "/aztec/req/ping/0.1.0";
 export declare const STATUS_PROTOCOL = "/aztec/req/status/0.1.0";
 export declare const GOODBYE_PROTOCOL = "/aztec/req/goodbye/0.1.0";
 export declare const TX_REQ_PROTOCOL = "/aztec/req/tx/0.1.0";
 export declare const BLOCK_REQ_PROTOCOL = "/aztec/req/block/0.1.0";
+export declare const AUTH_PROTOCOL = "/aztec/req/auth/0.1.0";
+export declare const BLOCK_TXS_REQ_PROTOCOL = "/aztec/req/block_txs/0.1.0";
 export declare enum ReqRespSubProtocol {
     PING = "/aztec/req/ping/0.1.0",
     STATUS = "/aztec/req/status/0.1.0",
     GOODBYE = "/aztec/req/goodbye/0.1.0",
     TX = "/aztec/req/tx/0.1.0",
-    BLOCK = "/aztec/req/block/0.1.0"
+    BLOCK = "/aztec/req/block/0.1.0",
+    AUTH = "/aztec/req/auth/0.1.0",
+    BLOCK_TXS = "/aztec/req/block_txs/0.1.0"
 }
 /**
  * A handler for a sub protocol
@@ -24,12 +34,15 @@ export type ReqRespSubProtocolHandler = (peerId: PeerId, msg: Buffer) => Promise
 export type ReqRespSubProtocolRateLimits = Record<ReqRespSubProtocol, ProtocolRateLimitQuota>;
 /**
  * The response from the ReqResp protocol
- * Consists of a status (Error code) and data
+ * Consists of a status
+ * And, optionally, a data buffer (in case status is SUCCESS)
  */
-export interface ReqRespResponse {
-    status: ReqRespStatus;
+export type ReqRespResponse = {
+    status: ReqRespStatus.SUCCESS;
     data: Buffer;
-}
+} | {
+    status: Exclude<ReqRespStatus, ReqRespStatus.SUCCESS>;
+};
 /**
  * A rate limit quota
  */
@@ -63,13 +76,21 @@ export type ReqRespSubProtocolValidators = {
     [S in ReqRespSubProtocol]: ResponseValidator<any, any>;
 };
 export declare const DEFAULT_SUB_PROTOCOL_VALIDATORS: ReqRespSubProtocolValidators;
+export declare class ValidationError extends Error {
+    constructor(message: string);
+}
 /**
  * Sub protocol map determines the request and response types for each
  * Req Resp protocol
  */
 export type SubProtocolMap = {
-    [S in ReqRespSubProtocol]: RequestResponsePair<any, any>;
+    [S in ReqRespSubProtocol]: RequestResponsePair<InstanceType<(typeof subProtocolMap)[S]['request']>, InstanceType<(typeof subProtocolMap)[S]['response']>>;
 };
+/**
+ * Default handler for unimplemented sub protocols, this SHOULD be overwritten
+ * by the service, but is provided as a fallback
+ */
+export declare const defaultHandler: (_msg: any) => Promise<Buffer>;
 /**
  * Default sub protocol handlers - this SHOULD be overwritten by the service,
  */
@@ -93,6 +114,7 @@ interface RequestResponsePair<Req extends {
         fromBuffer(buffer: Buffer): Res;
     };
 }
+export declare function responseFromBuffer<P extends ReqRespSubProtocol>(proto: P, buffer: Buffer): InstanceType<(typeof subProtocolMap)[P]['response']>;
 /**
  * RequestableBuffer is a wrapper around a buffer that allows it to be
  * used in generic request response protocols
@@ -110,12 +132,41 @@ export declare class RequestableBuffer {
  * This defines the request and response types for each sub protocol, used primarily
  * as a type rather than an object
  */
-export declare const subProtocolMap: SubProtocolMap;
+export declare const subProtocolMap: {
+    "/aztec/req/ping/0.1.0": {
+        request: typeof RequestableBuffer;
+        response: typeof RequestableBuffer;
+    };
+    "/aztec/req/status/0.1.0": {
+        request: typeof StatusMessage;
+        response: typeof StatusMessage;
+    };
+    "/aztec/req/tx/0.1.0": {
+        request: typeof TxHashArray;
+        response: typeof TxArray;
+    };
+    "/aztec/req/goodbye/0.1.0": {
+        request: typeof RequestableBuffer;
+        response: typeof RequestableBuffer;
+    };
+    "/aztec/req/block/0.1.0": {
+        request: typeof Fr;
+        response: typeof L2Block;
+    };
+    "/aztec/req/auth/0.1.0": {
+        request: typeof AuthRequest;
+        response: typeof AuthResponse;
+    };
+    "/aztec/req/block_txs/0.1.0": {
+        request: typeof BlockTxsRequest;
+        response: typeof BlockTxsResponse;
+    };
+};
 export interface ReqRespInterface {
-    start(subProtocolHandlers: ReqRespSubProtocolHandlers, subProtocolValidators: ReqRespSubProtocolValidators): Promise<void>;
+    start(subProtocolHandlers: Partial<ReqRespSubProtocolHandlers>, subProtocolValidators: ReqRespSubProtocolValidators): Promise<void>;
+    addSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler, validator?: ReqRespSubProtocolValidators[ReqRespSubProtocol]): Promise<void>;
     stop(): Promise<void>;
-    sendRequest<SubProtocol extends ReqRespSubProtocol>(subProtocol: SubProtocol, request: InstanceType<SubProtocolMap[SubProtocol]['request']>): Promise<InstanceType<SubProtocolMap[SubProtocol]['response']> | undefined>;
-    sendBatchRequest<SubProtocol extends ReqRespSubProtocol>(subProtocol: SubProtocol, requests: InstanceType<SubProtocolMap[SubProtocol]['request']>[], pinnedPeer: PeerId | undefined, timeoutMs?: number, maxPeers?: number, maxRetryAttempts?: number): Promise<(InstanceType<SubProtocolMap[SubProtocol]['response']> | undefined)[]>;
+    sendBatchRequest<SubProtocol extends ReqRespSubProtocol>(subProtocol: SubProtocol, requests: InstanceType<SubProtocolMap[SubProtocol]['request']>[], pinnedPeer: PeerId | undefined, timeoutMs?: number, maxPeers?: number, maxRetryAttempts?: number): Promise<InstanceType<SubProtocolMap[SubProtocol]['response']>[]>;
     sendRequestToPeer(peerId: PeerId, subProtocol: ReqRespSubProtocol, payload: Buffer, dialTimeout?: number): Promise<ReqRespResponse>;
     updateConfig(config: Partial<P2PReqRespConfig>): void;
 }

package/dest/services/reqresp/interface.d.ts.map

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

package/dest/services/reqresp/interface.js

@@ -1,6 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
-import { Tx, TxHash } from '@aztec/stdlib/tx';
+import { TxArray, TxHashArray } from '@aztec/stdlib/tx';
+import { AuthRequest, AuthResponse } from './protocols/auth.js';
+import { BlockTxsRequest, BlockTxsResponse } from './protocols/block_txs/block_txs_reqresp.js';
 import { StatusMessage } from './protocols/status.js';
 /*
  * Request Response Sub Protocols
@@ -9,12 +11,16 @@ export const STATUS_PROTOCOL = '/aztec/req/status/0.1.0';
 export const GOODBYE_PROTOCOL = '/aztec/req/goodbye/0.1.0';
 export const TX_REQ_PROTOCOL = '/aztec/req/tx/0.1.0';
 export const BLOCK_REQ_PROTOCOL = '/aztec/req/block/0.1.0';
+export const AUTH_PROTOCOL = '/aztec/req/auth/0.1.0';
+export const BLOCK_TXS_REQ_PROTOCOL = '/aztec/req/block_txs/0.1.0';
 export var ReqRespSubProtocol = /*#__PURE__*/ function(ReqRespSubProtocol) {
     ReqRespSubProtocol[ReqRespSubProtocol["PING"] = PING_PROTOCOL] = "PING";
     ReqRespSubProtocol[ReqRespSubProtocol["STATUS"] = STATUS_PROTOCOL] = "STATUS";
     ReqRespSubProtocol[ReqRespSubProtocol["GOODBYE"] = GOODBYE_PROTOCOL] = "GOODBYE";
     ReqRespSubProtocol[ReqRespSubProtocol["TX"] = TX_REQ_PROTOCOL] = "TX";
     ReqRespSubProtocol[ReqRespSubProtocol["BLOCK"] = BLOCK_REQ_PROTOCOL] = "BLOCK";
+    ReqRespSubProtocol[ReqRespSubProtocol["AUTH"] = AUTH_PROTOCOL] = "AUTH";
+    ReqRespSubProtocol[ReqRespSubProtocol["BLOCK_TXS"] = BLOCK_TXS_REQ_PROTOCOL] = "BLOCK_TXS";
     return ReqRespSubProtocol;
 }({});
 export const noopValidator = ()=>Promise.resolve(true);
@@ -23,12 +29,20 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
     [ReqRespSubProtocol.STATUS]: noopValidator,
     [ReqRespSubProtocol.TX]: noopValidator,
     [ReqRespSubProtocol.GOODBYE]: noopValidator,
-    [ReqRespSubProtocol.BLOCK]: noopValidator
+    [ReqRespSubProtocol.BLOCK]: noopValidator,
+    [ReqRespSubProtocol.AUTH]: noopValidator,
+    [ReqRespSubProtocol.BLOCK_TXS]: noopValidator
 };
+/*
+ * Helper class to sub-protocol validation error*/ export class ValidationError extends Error {
+    constructor(message){
+        super(message);
+    }
+}
 /**
  * Default handler for unimplemented sub protocols, this SHOULD be overwritten
  * by the service, but is provided as a fallback
- */ const defaultHandler = (_msg)=>{
+ */ export const defaultHandler = (_msg)=>{
     return Promise.resolve(Buffer.from('unimplemented'));
 };
 /**
@@ -38,8 +52,21 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
     [ReqRespSubProtocol.STATUS]: defaultHandler,
     [ReqRespSubProtocol.TX]: defaultHandler,
     [ReqRespSubProtocol.GOODBYE]: defaultHandler,
-    [ReqRespSubProtocol.BLOCK]: defaultHandler
+    [ReqRespSubProtocol.BLOCK]: defaultHandler,
+    [ReqRespSubProtocol.AUTH]: defaultHandler,
+    [ReqRespSubProtocol.BLOCK_TXS]: defaultHandler
 };
+/*
+ * Small helper function which parses buffer into specific response type
+ * It is needed to make TypeScript happy, as it cannot infer the type from the buffer
+ *
+ * @param proto - The sub protocol to parse the response for
+ * @param buffer - The buffer to parse
+ *
+ * @returns - The parsed response object
+ * */ export function responseFromBuffer(proto, buffer) {
+    return subProtocolMap[proto].response.fromBuffer(buffer);
+}
 /**
  * RequestableBuffer is a wrapper around a buffer that allows it to be
  * used in generic request response protocols
@@ -71,8 +98,8 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
         response: StatusMessage
     },
     [ReqRespSubProtocol.TX]: {
-        request: TxHash,
-        response: Tx
+        request: TxHashArray,
+        response: TxArray
     },
     [ReqRespSubProtocol.GOODBYE]: {
         request: RequestableBuffer,
@@ -81,5 +108,13 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
     [ReqRespSubProtocol.BLOCK]: {
         request: Fr,
         response: L2Block
+    },
+    [ReqRespSubProtocol.AUTH]: {
+        request: AuthRequest,
+        response: AuthResponse
+    },
+    [ReqRespSubProtocol.BLOCK_TXS]: {
+        request: BlockTxsRequest,
+        response: BlockTxsResponse
     }
 };

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

@@ -0,0 +1,43 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { StatusMessage } from './status.js';
+export declare const VALIDATOR_AUTH_DOMAIN_SEPARATOR = "Aztec Validator Challenge:";
+export declare const VALIDATOR_AUTH_FULL_CHALLENGE_ENCODED_LENGTH: number;
+export declare class AuthRequest {
+    readonly status: StatusMessage;
+    readonly challenge: Fr;
+    constructor(status: StatusMessage, challenge: Fr);
+    /**
+     * Deserializes the AuthRequest object from a Buffer.
+     * @param buffer - Buffer or BufferReader object to deserialize.
+     * @returns An instance of StatusMessage.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): AuthRequest;
+    /**
+     * Serializes the AuthRequest object into a Buffer.
+     * @returns Buffer representation of the StatusMessage object.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    getPayloadToSign(): Buffer32;
+    static random(): AuthRequest;
+}
+export declare class AuthResponse {
+    readonly status: StatusMessage;
+    readonly signature: Signature;
+    constructor(status: StatusMessage, signature: Signature);
+    /**
+     * Deserializes the AuthResponse object from a Buffer.
+     * @param buffer - Buffer or BufferReader object to deserialize.
+     * @returns An instance of StatusMessage.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): AuthResponse;
+    /**
+     * Serializes the AuthRequest object into a Buffer.
+     * @returns Buffer representation of the StatusMessage object.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static random(): AuthResponse;
+}
+//# sourceMappingURL=auth.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAC5E,eAAO,MAAM,4CAA4C,QACe,CAAC;AAMzE,qBAAa,WAAW;IAEpB,QAAQ,CAAC,MAAM,EAAE,aAAa;IAC9B,QAAQ,CAAC,SAAS,EAAE,EAAE;gBADb,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,EAAE;IAGxB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAQ7D;;;OAGG;IACH,QAAQ;IAIR,gBAAgB,IAAI,QAAQ;IAK5B,MAAM,CAAC,MAAM,IAAI,WAAW;CAG7B;AAED,qBAAa,YAAY;IAErB,QAAQ,CAAC,MAAM,EAAE,aAAa;IAC9B,QAAQ,CAAC,SAAS,EAAE,SAAS;gBADpB,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,SAAS;IAE/B;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;IAQ9D;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,MAAM,IAAI,YAAY;CAG9B"}

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

@@ -0,0 +1,71 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { keccak256 } from '@aztec/foundation/crypto';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { StatusMessage } from './status.js';
+export const VALIDATOR_AUTH_DOMAIN_SEPARATOR = 'Aztec Validator Challenge:';
+export const VALIDATOR_AUTH_FULL_CHALLENGE_ENCODED_LENGTH = VALIDATOR_AUTH_DOMAIN_SEPARATOR.length + Fr.random().toString().length;
+/*
+ * P2P Auth Message
+ * Superset of the StatusMessage, used to establish a handshake between peers and authenticate them.
+ */ export class AuthRequest {
+    status;
+    challenge;
+    constructor(status, challenge){
+        this.status = status;
+        this.challenge = challenge;
+    }
+    /**
+   * Deserializes the AuthRequest 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 AuthRequest(StatusMessage.fromBuffer(reader), Fr.fromBuffer(reader));
+    }
+    /**
+   * Serializes the AuthRequest object into a Buffer.
+   * @returns Buffer representation of the StatusMessage object.
+   */ toBuffer() {
+        return serializeToBuffer([
+            this.status,
+            this.challenge
+        ]);
+    }
+    getPayloadToSign() {
+        const fullChallenge = VALIDATOR_AUTH_DOMAIN_SEPARATOR + this.challenge.toString();
+        return Buffer32.fromBuffer(keccak256(Buffer.from(fullChallenge, 'utf-8')));
+    }
+    static random() {
+        return new AuthRequest(StatusMessage.random(), Fr.random());
+    }
+}
+export class AuthResponse {
+    status;
+    signature;
+    constructor(status, signature){
+        this.status = status;
+        this.signature = signature;
+    }
+    /**
+   * Deserializes the AuthResponse 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 AuthResponse(StatusMessage.fromBuffer(reader), Signature.fromBuffer(reader));
+    }
+    /**
+   * Serializes the AuthRequest object into a Buffer.
+   * @returns Buffer representation of the StatusMessage object.
+   */ toBuffer() {
+        return serializeToBuffer([
+            this.status,
+            this.signature
+        ]);
+    }
+    static random() {
+        return new AuthResponse(StatusMessage.random(), Signature.random());
+    }
+}

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

@@ -1,4 +1,9 @@
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ReqRespSubProtocolHandler } from '../interface.js';
+/**
+ * Handler for L2 Block requests
+ * @param l2BlockSource - source for L2 blocks
+ * @returns the Block request handler
+ * */
 export declare function reqRespBlockHandler(l2BlockSource: L2BlockSource): ReqRespSubProtocolHandler;
 //# sourceMappingURL=block.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/block.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,yBAAyB,CAO3F"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/block.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAGjE;;;;KAIK;AACL,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,yBAAyB,CAsB3F"}

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

@@ -1,8 +1,31 @@
 import { Fr } from '@aztec/foundation/fields';
-export function reqRespBlockHandler(l2BlockSource) {
-    return async (_peerId, msg)=>{
-        const blockNumber = Fr.fromBuffer(msg);
-        const foundBlock = await l2BlockSource.getBlock(Number(blockNumber));
-        return foundBlock ? foundBlock.toBuffer() : Buffer.alloc(0);
+import { ReqRespStatus, ReqRespStatusError } from '../status.js';
+/**
+ * Handler for L2 Block requests
+ * @param l2BlockSource - source for L2 blocks
+ * @returns the Block request handler
+ * */ export function reqRespBlockHandler(l2BlockSource) {
+    /**
+   * @param peerId - the peer ID of the requester
+   * @param msg - the block request message, which is expected to contain valid block number as a Buffer
+   * @returns a Buffer containing the requested block data, or an empty Buffer if the block is not found
+   * @throws  ReqRespStatusError if the input msg is not a valid block number
+   * */ return async (_peerId, msg)=>{
+        let blockNumber;
+        try {
+            blockNumber = Fr.fromBuffer(msg);
+        } catch (err) {
+            throw new ReqRespStatusError(ReqRespStatus.BADLY_FORMED_REQUEST, {
+                cause: err
+            });
+        }
+        try {
+            const foundBlock = await l2BlockSource.getBlock(Number(blockNumber));
+            return foundBlock ? foundBlock.toBuffer() : Buffer.alloc(0);
+        } catch (err) {
+            throw new ReqRespStatusError(ReqRespStatus.INTERNAL_ERROR, {
+                cause: err
+            });
+        }
     };
 }