@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.24de95ac

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

@@ -1,18 +1,27 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+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 PING_PROTOCOL = "/aztec/req/ping/1.0.0";
+export declare const STATUS_PROTOCOL = "/aztec/req/status/1.0.0";
+export declare const GOODBYE_PROTOCOL = "/aztec/req/goodbye/1.0.0";
+export declare const TX_REQ_PROTOCOL = "/aztec/req/tx/1.0.0";
+export declare const BLOCK_REQ_PROTOCOL = "/aztec/req/block/1.0.0";
+export declare const AUTH_PROTOCOL = "/aztec/req/auth/1.0.0";
+export declare const BLOCK_TXS_REQ_PROTOCOL = "/aztec/req/block_txs/1.0.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"
+    PING = "/aztec/req/ping/1.0.0",
+    STATUS = "/aztec/req/status/1.0.0",
+    GOODBYE = "/aztec/req/goodbye/1.0.0",
+    TX = "/aztec/req/tx/1.0.0",
+    BLOCK = "/aztec/req/block/1.0.0",
+    AUTH = "/aztec/req/auth/1.0.0",
+    BLOCK_TXS = "/aztec/req/block_txs/1.0.0"
 }
 /**
  * A handler for a sub protocol
@@ -25,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
  */
@@ -64,17 +76,16 @@ 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 sub protocol handlers - this SHOULD be overwritten by the service,
- */
-export declare const DEFAULT_SUB_PROTOCOL_HANDLERS: ReqRespSubProtocolHandlers;
 /**
  * The Request Response Pair interface defines the methods that each
  * request response pair must implement
@@ -94,6 +105,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
@@ -103,7 +115,7 @@ interface RequestResponsePair<Req extends {
 export declare class RequestableBuffer {
     buffer: Buffer;
     constructor(buffer: Buffer);
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer): RequestableBuffer;
 }
 /**
@@ -111,6 +123,43 @@ 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/1.0.0": {
+        request: typeof RequestableBuffer;
+        response: typeof RequestableBuffer;
+    };
+    "/aztec/req/status/1.0.0": {
+        request: typeof StatusMessage;
+        response: typeof StatusMessage;
+    };
+    "/aztec/req/tx/1.0.0": {
+        request: typeof TxHashArray;
+        response: typeof TxArray;
+    };
+    "/aztec/req/goodbye/1.0.0": {
+        request: typeof RequestableBuffer;
+        response: typeof RequestableBuffer;
+    };
+    "/aztec/req/block/1.0.0": {
+        request: typeof Fr;
+        response: typeof L2Block;
+    };
+    "/aztec/req/auth/1.0.0": {
+        request: typeof AuthRequest;
+        response: typeof AuthResponse;
+    };
+    "/aztec/req/block_txs/1.0.0": {
+        request: typeof BlockTxsRequest;
+        response: typeof BlockTxsResponse;
+    };
+};
+export interface ReqRespInterface {
+    start(subProtocolHandlers: Partial<ReqRespSubProtocolHandlers>, subProtocolValidators: ReqRespSubProtocolValidators): Promise<void>;
+    addSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler, validator?: ReqRespSubProtocolValidators[ReqRespSubProtocol]): Promise<void>;
+    stop(): Promise<void>;
+    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;
+}
 export {};
 //# sourceMappingURL=interface.d.ts.map

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":";;AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AACrD,eAAO,MAAM,eAAe,4BAA4B,CAAC;AACzD,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAC3D,eAAO,MAAM,eAAe,wBAAwB,CAAC;AACrD,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,oBAAY,kBAAkB;IAC5B,IAAI,0BAAgB;IACpB,MAAM,4BAAkB;IACxB,OAAO,6BAAmB;IAC1B,EAAE,wBAAkB;IACpB,KAAK,2BAAqB;CAC3B;AAED;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzF;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;AAE9F;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,SAAS,EAAE,cAAc,CAAC;IAC1B;;OAEG;IACH,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,eAAO,MAAM,aAAa,wBAA8B,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,MAAM,CAAC,kBAAkB,EAAE,yBAAyB,CAAC,CAAC;AAE/F,KAAK,iBAAiB,CAAC,iBAAiB,EAAE,QAAQ,IAAI,CACpD,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,4BAA4B,GAAG;KACxC,CAAC,IAAI,kBAAkB,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC;CACvD,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,4BAM7C,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;KAC1B,CAAC,IAAI,kBAAkB,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC;CACzD,CAAC;AAUF;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,0BAM3C,CAAC;AAEF;;;GAGG;AACH,UAAU,mBAAmB,CAAC,GAAG,SAAS;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,EAAE,GAAG;IACnE;;OAEG;IACH,OAAO,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IACrC;;OAEG;IACH,QAAQ,EAAE;QACR,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAC1B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC;KACjC,CAAC;CACH;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IACT,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAEjC,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;CAGjC;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,cAqB5B,CAAC"}
+{"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,19 +1,26 @@
 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
- */ export const PING_PROTOCOL = '/aztec/req/ping/0.1.0';
-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 PING_PROTOCOL = '/aztec/req/ping/1.0.0';
+export const STATUS_PROTOCOL = '/aztec/req/status/1.0.0';
+export const GOODBYE_PROTOCOL = '/aztec/req/goodbye/1.0.0';
+export const TX_REQ_PROTOCOL = '/aztec/req/tx/1.0.0';
+export const BLOCK_REQ_PROTOCOL = '/aztec/req/block/1.0.0';
+export const AUTH_PROTOCOL = '/aztec/req/auth/1.0.0';
+export const BLOCK_TXS_REQ_PROTOCOL = '/aztec/req/block_txs/1.0.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);
@@ -22,23 +29,27 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
     [ReqRespSubProtocol.STATUS]: noopValidator,
     [ReqRespSubProtocol.TX]: noopValidator,
     [ReqRespSubProtocol.GOODBYE]: noopValidator,
-    [ReqRespSubProtocol.BLOCK]: noopValidator
-};
-/**
- * Default handler for unimplemented sub protocols, this SHOULD be overwritten
- * by the service, but is provided as a fallback
- */ const defaultHandler = (_msg)=>{
-    return Promise.resolve(Buffer.from('unimplemented'));
-};
-/**
- * Default sub protocol handlers - this SHOULD be overwritten by the service,
- */ export const DEFAULT_SUB_PROTOCOL_HANDLERS = {
-    [ReqRespSubProtocol.PING]: defaultHandler,
-    [ReqRespSubProtocol.STATUS]: defaultHandler,
-    [ReqRespSubProtocol.TX]: defaultHandler,
-    [ReqRespSubProtocol.GOODBYE]: defaultHandler,
-    [ReqRespSubProtocol.BLOCK]: defaultHandler
+    [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);
+    }
+}
+/*
+ * 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
@@ -66,12 +77,12 @@ export const DEFAULT_SUB_PROTOCOL_VALIDATORS = {
         response: RequestableBuffer
     },
     [ReqRespSubProtocol.STATUS]: {
-        request: RequestableBuffer,
-        response: RequestableBuffer
+        request: StatusMessage,
+        response: StatusMessage
     },
     [ReqRespSubProtocol.TX]: {
-        request: TxHash,
-        response: Tx
+        request: TxHashArray,
+        response: TxArray
     },
     [ReqRespSubProtocol.GOODBYE]: {
         request: RequestableBuffer,
@@ -80,5 +91,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/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/metrics.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAiB,MAAM,yBAAyB,CAAC;AAEtF,qBAAa,cAAc;IASb,QAAQ,CAAC,eAAe,EAAE,eAAe;IARrD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgB;IAEjD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAgB;IACvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAgB;gBAEjC,eAAe,EAAE,eAAe,EAAE,IAAI,SAAY;IA4BhE,iBAAiB,CAAC,QAAQ,EAAE,MAAM;IAIlC,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAItC,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAInC,mBAAmB,CAAC,QAAQ,EAAE,MAAM;CAG5C"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/metrics.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAiB,MAAM,yBAAyB,CAAC;AAEtF,qBAAa,cAAc;IAUvB,QAAQ,CAAC,eAAe,EAAE,eAAe;IAT3C,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgB;IAEjD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAgB;IACvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAgB;gBAG3C,eAAe,EAAE,eAAe,EACzC,IAAI,SAAY;IA6BX,iBAAiB,CAAC,QAAQ,EAAE,MAAM;IAIlC,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAItC,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAInC,mBAAmB,CAAC,QAAQ,EAAE,MAAM;CAG5C"}

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

package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts

@@ -0,0 +1,30 @@
+import { BufferReader } from '@aztec/foundation/serialize';
+/**
+ * BitVector helper class for representing and serializing bit vectors
+ */
+export declare class BitVector {
+    private buffer;
+    private length;
+    constructor(buffer: Buffer, length: number);
+    static init(length: number, indices: number[]): BitVector;
+    getLength(): number;
+    isSet(index: number): boolean;
+    /**
+     * Returns all indices which are set to true
+     * */
+    getTrueIndices(): number[];
+    /**
+     * Serializes the BitVector object into a Buffer
+     *
+     * @returns Buffer representation of the BitVector object
+     * */
+    toBuffer(): Buffer;
+    /**
+     * Deserializes buffer into new BitVector
+     *
+     * @returns A new BitVector instance
+     * */
+    static fromBuffer(buffer: Buffer | BufferReader): BitVector;
+    static byteLength(length: number): number;
+}
+//# sourceMappingURL=bitvector.d.ts.map

package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitvector.d.ts","sourceRoot":"","sources":["../../../../../src/services/reqresp/protocols/block_txs/bitvector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAY1C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;IAqBzD,SAAS,IAAI,MAAM;IAWnB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI7B;;SAEK;IACL,cAAc,IAAI,MAAM,EAAE;IAI1B;;;;SAIK;IACL,QAAQ,IAAI,MAAM;IAIlB;;;;SAIK;IACL,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAQ3D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;CAGjC"}

package/dest/services/reqresp/protocols/block_txs/bitvector.js

@@ -0,0 +1,75 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+/**
+ * BitVector helper class for representing and serializing bit vectors
+ */ export class BitVector {
+    buffer;
+    length;
+    constructor(buffer, length){
+        this.buffer = buffer;
+        this.length = length;
+    }
+    /*
+   * Creates new BitVector instance
+   * @param length - Length of the bit vector
+   * @param indices - Array of indices to set to 1 in the bit vector
+   *
+   * @returns A new BitVector instance with specified length and set indices
+   * */ static init(length, indices) {
+        if (indices.length > length) {
+            throw new Error('Indices length exceeds specified length');
+        }
+        const buffer = Buffer.alloc(BitVector.byteLength(length));
+        indices.forEach((idx)=>{
+            const invalidIndex = idx < 0 || idx >= length;
+            if (invalidIndex) {
+                throw new Error(`Index ${idx} is out of bounds for BitVector of length ${length}`);
+            }
+            const byteIndex = Math.floor(idx / 8);
+            const bitIndex = idx % 8;
+            buffer[byteIndex] |= 1 << bitIndex;
+        });
+        return new BitVector(buffer, length);
+    }
+    getLength() {
+        return this.length;
+    }
+    /*
+   * Checks if element at index is set to true
+   *
+   * @param index - Index of the bit to check
+   *
+   * @returns True if the bit at index is set, false otherwise
+   * */ isSet(index) {
+        return index >= 0 && index < this.length && !!(this.buffer[Math.floor(index / 8)] & 1 << index % 8);
+    }
+    /**
+   * Returns all indices which are set to true
+   * */ getTrueIndices() {
+        return Array.from({
+            length: this.length
+        }, (_, i)=>i).filter((i)=>this.isSet(i));
+    }
+    /**
+   * Serializes the BitVector object into a Buffer
+   *
+   * @returns Buffer representation of the BitVector object
+   * */ toBuffer() {
+        return serializeToBuffer([
+            this.length,
+            this.buffer
+        ]);
+    }
+    /**
+   * Deserializes buffer into new BitVector
+   *
+   * @returns A new BitVector instance
+   * */ static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const length = reader.readNumber();
+        const bitBuffer = reader.readBytes(BitVector.byteLength(length));
+        return new BitVector(bitBuffer, length);
+    }
+    static byteLength(length) {
+        return Math.ceil(length / 8);
+    }
+}

package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts

@@ -0,0 +1,11 @@
+import type { AttestationPool } from '../../../../mem_pools/attestation_pool/attestation_pool.js';
+import type { TxPool } from '../../../../mem_pools/index.js';
+import type { ReqRespSubProtocolHandler } from '../../interface.js';
+/**
+ * Handler for block txs requests
+ * @param attestationPool - the attestation pool to check for block proposals
+ * @param mempools - the mempools containing the tx pool
+ * @returns the BlockTxs request handler
+ */
+export declare function reqRespBlockTxsHandler(attestationPool: AttestationPool, txPool: TxPool): ReqRespSubProtocolHandler;
+//# sourceMappingURL=block_txs_handler.d.ts.map

package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block_txs_handler.d.ts","sourceRoot":"","sources":["../../../../../src/services/reqresp/protocols/block_txs/block_txs_handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4DAA4D,CAAC;AAClG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAKpE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAmClH"}

package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js

@@ -0,0 +1,39 @@
+import { TxArray } from '@aztec/stdlib/tx';
+import { ReqRespStatus, ReqRespStatusError } from '../../status.js';
+import { BitVector } from './bitvector.js';
+import { BlockTxsRequest, BlockTxsResponse } from './block_txs_reqresp.js';
+/**
+ * Handler for block txs requests
+ * @param attestationPool - the attestation pool to check for block proposals
+ * @param mempools - the mempools containing the tx pool
+ * @returns the BlockTxs request handler
+ */ export function reqRespBlockTxsHandler(attestationPool, txPool) {
+    /**
+   * Handler for block txs requests
+   * @param msg - the block txs request message
+   * @returns the block txs response message
+   * @throws if msg is not a valid block txs request
+   */ return async (_peerId, msg)=>{
+        let request;
+        try {
+            request = BlockTxsRequest.fromBuffer(msg);
+        } catch (err) {
+            throw new ReqRespStatusError(ReqRespStatus.BADLY_FORMED_REQUEST, {
+                cause: err
+            });
+        }
+        const blockProposal = await attestationPool.getBlockProposal(request.blockHash.toString());
+        if (!blockProposal) {
+            throw new ReqRespStatusError(ReqRespStatus.NOT_FOUND);
+        }
+        const txsAvailableInPool = await txPool.hasTxs(blockProposal.txHashes);
+        //Map txs in the pool to their indices in the block proposal
+        const availableIndices = txsAvailableInPool.map((hasTx, idx)=>hasTx ? idx : -1).filter((idx)=>idx !== -1);
+        const responseBitVector = BitVector.init(blockProposal.txHashes.length, availableIndices);
+        const requestedIndices = new Set(request.txIndices.getTrueIndices());
+        const requestedTxsHashes = blockProposal.txHashes.filter((_, idx)=>requestedIndices.has(idx));
+        const responseTxs = (await txPool.getTxsByHash(requestedTxsHashes)).filter((tx)=>!!tx);
+        const response = new BlockTxsResponse(request.blockHash, new TxArray(...responseTxs), responseBitVector);
+        return response.toBuffer();
+    };
+}