@aztec/foundation 0.75.0 → 0.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/foundation",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "type": "module",
   "main": "./dest/index.js",
   "types": "./dest/index.d.ts",
@@ -41,7 +41,6 @@
     "./wasm": "./dest/wasm/index.js",
     "./worker": "./dest/worker/index.js",
     "./bigint-buffer": "./dest/bigint-buffer/index.js",
-    "./blob": "./dest/blob/index.js",
     "./types": "./dest/types/index.js",
     "./schemas": "./dest/schemas/index.js",
     "./url": "./dest/url/index.js",
@@ -104,7 +103,7 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.75.0",
+    "@aztec/bb.js": "0.76.0",
     "@koa/cors": "^5.0.0",
     "@noble/curves": "^1.2.0",
     "bn.js": "^5.2.1",

package/src/config/env_var.ts

@@ -42,6 +42,8 @@ export type EnvVar =
   | 'DATA_DIRECTORY'
   | 'DATA_STORE_MAP_SIZE_KB'
   | 'DEBUG'
+  | 'DEBUG_P2P_DISABLE_MESSAGE_VALIDATION'
+  | 'DEBUG_P2P_DISABLE_COLOCATION_PENALTY'
   | 'DEPLOY_AZTEC_CONTRACTS_SALT'
   | 'DEPLOY_AZTEC_CONTRACTS'
   | 'ENFORCE_FEES'
@@ -78,10 +80,13 @@ export type EnvVar =
   | 'OUTBOX_CONTRACT_ADDRESS'
   | 'P2P_BLOCK_CHECK_INTERVAL_MS'
   | 'P2P_BLOCK_REQUEST_BATCH_SIZE'
+  | 'P2P_BOOTSTRAP_NODE_ENR_VERSION_CHECK'
   | 'P2P_ENABLED'
   | 'P2P_GOSSIPSUB_D'
   | 'P2P_GOSSIPSUB_DHI'
   | 'P2P_GOSSIPSUB_DLO'
+  | 'P2P_GOSSIPSUB_DLAZY'
+  | 'P2P_GOSSIPSUB_FLOOD_PUBLISH'
   | 'P2P_GOSSIPSUB_INTERVAL_MS'
   | 'P2P_GOSSIPSUB_MCACHE_GOSSIP'
   | 'P2P_GOSSIPSUB_MCACHE_LENGTH'
@@ -90,7 +95,6 @@ export type EnvVar =
   | 'P2P_GOSSIPSUB_TX_TOPIC_WEIGHT'
   | 'P2P_L2_QUEUE_SIZE'
   | 'P2P_MAX_PEERS'
-  | 'P2P_MIN_PEERS'
   | 'P2P_PEER_CHECK_INTERVAL_MS'
   | 'P2P_PEER_PENALTY_VALUES'
   | 'P2P_QUERY_FOR_IP'

package/src/config/index.ts

@@ -72,7 +72,12 @@ export function numberConfigHelper(defaultVal: number): Pick<ConfigMapping, 'par
  */
 export function bigintConfigHelper(defaultVal?: bigint): Pick<ConfigMapping, 'parseEnv' | 'defaultValue'> {
   return {
-    parseEnv: (val: string) => BigInt(val),
+    parseEnv: (val: string) => {
+      if (val === '') {
+        return defaultVal;
+      }
+      return BigInt(val);
+    },
     defaultValue: defaultVal,
   };
 }

package/src/index.ts

@@ -3,7 +3,6 @@ export * as abi from './abi/index.js';
 export * as asyncMap from './async-map/index.js';
 export * as aztecAddress from './aztec-address/index.js';
 export * as bigintBuffer from './bigint-buffer/index.js';
-export * as blob from './blob/index.js';
 export * as collection from './collection/index.js';
 export * as committable from './committable/index.js';
 export * as crypto from './crypto/index.js';

package/src/json-rpc/client/fetch.ts

@@ -23,7 +23,7 @@ export async function defaultFetch(
   useApiEndpoints: boolean,
   extraHeaders: Record<string, string> = {},
   noRetry = false,
-) {
+): Promise<{ response: any; headers: { get: (header: string) => string | null | undefined } }> {
   log.debug(format(`JsonRpcClient.fetch`, host, rpcMethod, '->', body));
   let resp: Response;
   try {
@@ -64,7 +64,7 @@ export async function defaultFetch(
     }
   }
 
-  return responseJson;
+  return { response: responseJson, headers: resp.headers };
 }
 
 /**

package/src/json-rpc/client/safe_json_rpc_client.ts

@@ -1,9 +1,20 @@
 import { format } from 'util';
 
-import { createLogger } from '../../log/pino-logger.js';
+import { type Logger, createLogger } from '../../log/pino-logger.js';
 import { type ApiSchema, type ApiSchemaFor, schemaHasMethod } from '../../schemas/api.js';
 import { defaultFetch } from './fetch.js';
 
+export type SafeJsonRpcClientOptions = {
+  useApiEndpoints?: boolean;
+  namespaceMethods?: string | false;
+  fetch?: typeof defaultFetch;
+  log?: Logger;
+  onResponse?: (res: {
+    response: any;
+    headers: { get: (header: string) => string | null | undefined };
+  }) => Promise<void>;
+};
+
 /**
  * Creates a Proxy object that delegates over RPC and validates outputs against a given schema.
  * The server is expected to be a JsonRpcServer.
@@ -16,11 +27,12 @@ import { defaultFetch } from './fetch.js';
 export function createSafeJsonRpcClient<T extends object>(
   host: string,
   schema: ApiSchemaFor<T>,
-  useApiEndpoints: boolean = false,
-  namespaceMethods?: string | false,
-  fetch = defaultFetch,
-  log = createLogger('json-rpc:client'),
+  config: SafeJsonRpcClientOptions = {},
 ): T {
+  const fetch = config.fetch ?? defaultFetch;
+  const log = config.log ?? createLogger('json-rpc:client');
+  const { useApiEndpoints = false, namespaceMethods = false } = config;
+
   let id = 0;
   const request = async (methodName: string, params: any[]): Promise<any> => {
     if (!schemaHasMethod(schema, methodName)) {
@@ -30,17 +42,20 @@ export function createSafeJsonRpcClient<T extends object>(
     const body = { jsonrpc: '2.0', id: id++, method, params };
 
     log.debug(format(`request`, method, params));
-    const res = await fetch(host, method, body, useApiEndpoints);
-    log.debug(format(`result`, method, res));
+    const { response, headers } = await fetch(host, method, body, useApiEndpoints);
+    log.debug(format(`result`, method, response));
 
-    if (res.error) {
-      throw res.error;
+    if (config.onResponse) {
+      await config.onResponse({ response, headers });
+    }
+    if (response.error) {
+      throw response.error;
     }
     // TODO(palla/schemas): Find a better way to handle null responses (JSON.stringify(null) is string "null").
-    if ([null, undefined, 'null', 'undefined'].includes(res.result)) {
+    if ([null, undefined, 'null', 'undefined'].includes(response.result)) {
       return;
     }
-    return (schema as ApiSchema)[methodName].returnType().parseAsync(res.result);
+    return (schema as ApiSchema)[methodName].returnType().parseAsync(response.result);
   };
 
   const proxy: any = {};

package/src/json-rpc/test/integration.ts

@@ -2,23 +2,34 @@ import type http from 'http';
 
 import { type ApiSchemaFor } from '../../schemas/api.js';
 import { makeFetch } from '../client/fetch.js';
-import { createSafeJsonRpcClient } from '../client/safe_json_rpc_client.js';
-import { startHttpRpcServer } from '../server/safe_json_rpc_server.js';
-import { type SafeJsonRpcServer, createSafeJsonRpcServer } from '../server/safe_json_rpc_server.js';
+import { type SafeJsonRpcClientOptions, createSafeJsonRpcClient } from '../client/safe_json_rpc_client.js';
+import {
+  type SafeJsonRpcServer,
+  type SafeJsonRpcServerOptions,
+  createSafeJsonRpcServer,
+  startHttpRpcServer,
+} from '../server/safe_json_rpc_server.js';
 
 export type JsonRpcTestContext<T extends object> = {
   server: SafeJsonRpcServer;
   client: T;
   httpServer: http.Server & { port: number };
+  url: string;
 };
 
 export async function createJsonRpcTestSetup<T extends object>(
   handler: T,
   schema: ApiSchemaFor<T>,
+  serverOptions: Partial<SafeJsonRpcServerOptions> = {},
+  clientOptions: SafeJsonRpcClientOptions = {},
 ): Promise<JsonRpcTestContext<T>> {
-  const server = createSafeJsonRpcServer<T>(handler, schema);
+  const server = createSafeJsonRpcServer<T>(handler, schema, serverOptions);
   const httpServer = await startHttpRpcServer(server, { host: '127.0.0.1' });
   const noRetryFetch = makeFetch([], true);
-  const client = createSafeJsonRpcClient<T>(`http://127.0.0.1:${httpServer.port}`, schema, false, false, noRetryFetch);
-  return { server, client, httpServer };
+  const url = `http://127.0.0.1:${httpServer.port}`;
+  const client = createSafeJsonRpcClient<T>(url, schema, {
+    fetch: noRetryFetch,
+    ...clientOptions,
+  });
+  return { server, client, httpServer, url };
 }

package/src/log/log-filters.ts

@@ -4,8 +4,16 @@ export type LogFilters = [string, LogLevel][];
 
 export function getLogLevelFromFilters(filters: LogFilters, module: string): LogLevel | undefined {
   for (const [filterModule, level] of filters) {
-    if (module.startsWith(filterModule)) {
-      return level as LogLevel;
+    try {
+      const regex = new RegExp(filterModule);
+      if (regex.test(module)) {
+        return level as LogLevel;
+      }
+    } catch {
+      // If regex is invalid, fall back to startsWith check
+      if (module.startsWith(filterModule)) {
+        return level as LogLevel;
+      }
     }
   }
   return undefined;

package/src/log/pino-logger.ts

@@ -11,14 +11,23 @@ import { getLogLevelFromFilters, parseEnv } from './log-filters.js';
 import { type LogLevel } from './log-levels.js';
 import { type LogData, type LogFn } from './log_fn.js';
 
-export function createLogger(module: string): Logger {
+export function createLogger(module: string, fixedTerms = {}): Logger {
   module = logNameHandlers.reduce((moduleName, handler) => handler(moduleName), module.replace(/^aztec:/, ''));
   const pinoLogger = logger.child({ module }, { level: getLogLevelFromFilters(logFilters, module) });
 
+  // Only perform copy of data if fixed terms are provided
+  const hasFixedTerms = Object.keys(fixedTerms).length > 0;
+
   // We check manually for isLevelEnabled to avoid calling processLogData unnecessarily.
   // Note that isLevelEnabled is missing from the browser version of pino.
   const logFn = (level: LogLevel, msg: string, data?: unknown) =>
-    isLevelEnabled(pinoLogger, level) && pinoLogger[level](processLogData((data as LogData) ?? {}), msg);
+    isLevelEnabled(pinoLogger, level) &&
+    pinoLogger[level](
+      hasFixedTerms
+        ? processLogData({ ...fixedTerms, ...(data ?? {}) } as LogData)
+        : processLogData((data as LogData) ?? {}),
+      msg,
+    );
 
   return {
     silent: () => {},
@@ -149,7 +158,10 @@ function makeLogger() {
   if (!isNode) {
     // We are on the browser.
     return pino({ ...pinoOpts, browser: { asObject: false } });
-  } else if (process.env.JEST_WORKER_ID) {
+  }
+  // If running in a child process then cancel this if statement section by uncommenting below
+  // else if (false) {
+  else if (process.env.JEST_WORKER_ID) {
     // We are on jest, so we need sync logging and stream to stderr.
     // We expect jest/setup.mjs to kick in later and replace set up a pretty logger,
     // but if for some reason it doesn't, at least we're covered with a default logger.

package/src/queue/serial_queue.ts

@@ -61,7 +61,7 @@ export class SerialQueue {
    * @param fn - The function to enqueue.
    * @returns A resolution promise. Rejects if the function does, or if the function could not be enqueued.
    */
-  public put<T>(fn: () => Promise<T>): Promise<T> {
+  public put<T>(fn: () => T | Promise<T>): Promise<Awaited<T>> {
     return new Promise((resolve, reject) => {
       const accepted = this.queue.put(async () => {
         try {

package/src/serialize/field_reader.ts

@@ -34,6 +34,15 @@ export class FieldReader {
     return new FieldReader(fields);
   }
 
+  /**
+   * Returns the current cursor position.
+   *
+   * @returns The current cursor position.
+   */
+  public get cursor() {
+    return this.index;
+  }
+
   /**
    * Skips the next n fields.
    *
@@ -46,15 +55,6 @@ export class FieldReader {
     this.index += n;
   }
 
-  /**
-   * Returns the current cursor position.
-   *
-   * @returns The current cursor position.
-   */
-  public get cursor() {
-    return this.index;
-  }
-
   /**
    * Reads a single field from the array.
    *

package/dest/blob/blob.d.ts

@@ -1,154 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import cKzg from 'c-kzg';
-import type { Blob as BlobBuffer } from 'c-kzg';
-import { Fr } from '../fields/index.js';
-import { BufferReader } from '../serialize/index.js';
-import { type BlobJson } from './interface.js';
-export declare const VERSIONED_HASH_VERSION_KZG = 1;
-/**
- * A class to create, manage, and prove EVM blobs.
- */
-export declare class Blob {
-    /** The blob to be broadcast on L1 in bytes form. */
-    readonly data: BlobBuffer;
-    /** The hash of all tx effects inside the blob. Used in generating the challenge z and proving that we have included all required effects. */
-    readonly fieldsHash: Fr;
-    /** Challenge point z (= H(H(tx_effects), kzgCommmitment). Used such that p(z) = y. */
-    readonly challengeZ: Fr;
-    /** Evaluation y = p(z), where p() is the blob polynomial. BLS12 field element, rep. as BigNum in nr, bigint in ts. */
-    readonly evaluationY: Buffer;
-    /** Commitment to the blob C. Used in compressed BLS12 point format (48 bytes). */
-    readonly commitment: Buffer;
-    /** KZG opening proof for y = p(z). The commitment to quotient polynomial Q, used in compressed BLS12 point format (48 bytes). */
-    readonly proof: Buffer;
-    constructor(
-    /** The blob to be broadcast on L1 in bytes form. */
-    data: BlobBuffer, 
-    /** The hash of all tx effects inside the blob. Used in generating the challenge z and proving that we have included all required effects. */
-    fieldsHash: Fr, 
-    /** Challenge point z (= H(H(tx_effects), kzgCommmitment). Used such that p(z) = y. */
-    challengeZ: Fr, 
-    /** Evaluation y = p(z), where p() is the blob polynomial. BLS12 field element, rep. as BigNum in nr, bigint in ts. */
-    evaluationY: Buffer, 
-    /** Commitment to the blob C. Used in compressed BLS12 point format (48 bytes). */
-    commitment: Buffer, 
-    /** KZG opening proof for y = p(z). The commitment to quotient polynomial Q, used in compressed BLS12 point format (48 bytes). */
-    proof: Buffer);
-    /**
-     * The encoded version of the blob will determine the end of the blob based on the transaction encoding.
-     * This is required when the fieldsHash of a blob will contain trailing zeros.
-     *
-     * See `./encoding.ts` for more details.
-     *
-     * This method is used to create a Blob from a buffer.
-     * @param blob - The buffer to create the Blob from.
-     * @param multiBlobFieldsHash - The fields hash to use for the Blob.
-     * @returns A Blob created from the buffer.
-     *
-     * @throws If unable to deserialize the blob.
-     */
-    static fromEncodedBlobBuffer(blob: BlobBuffer, multiBlobFieldsHash?: Fr): Promise<Blob>;
-    /**
-     * Create a Blob from an array of fields.
-     *
-     * @param fields - The array of fields to create the Blob from.
-     * @param multiBlobFieldsHash - The fields hash to use for the Blob.
-     * @returns A Blob created from the array of fields.
-     */
-    static fromFields(fields: Fr[], multiBlobFieldsHash?: Fr): Promise<Blob>;
-    /**
-     * Create a Blob from a JSON object.
-     *
-     * Blobs will be in this form when requested from the blob sink, or from
-     * the beacon chain via `getBlobSidecars`
-     * https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Beacon/getBlobSidecars
-     *
-     * @dev WARNING: by default json deals with encoded buffers
-     *
-     * @param json - The JSON object to create the Blob from.
-     * @returns A Blob created from the JSON object.
-     */
-    static fromJson(json: BlobJson): Promise<Blob>;
-    /**
-     * Get the JSON representation of the blob.
-     *
-     * @dev WARNING: by default json deals with encoded buffers
-     * @param index - optional - The index of the blob in the block.
-     * @returns The JSON representation of the blob.
-     */
-    toJson(index?: number): BlobJson;
-    /**
-     * Get the fields from the blob.
-     *
-     * @dev WARNING: this method does not take into account trailing zeros
-     *
-     * @returns The fields from the blob.
-     */
-    toFields(): Fr[];
-    /**
-     * Get the encoded fields from the blob.
-     *
-     * @dev This method takes into account trailing zeros
-     *
-     * @returns The encoded fields from the blob.
-     *
-     * @throws If unable to deserialize the blob.
-     */
-    toEncodedFields(): Fr[];
-    /**
-     * Get the commitment fields from the blob.
-     *
-     * The 48-byte commitment is encoded into two field elements:
-     * +------------------+------------------+
-     * | Field Element 1  | Field Element 2  |
-     * | [bytes 0-31]     | [bytes 32-47]   |
-     * +------------------+------------------+
-     * |     32 bytes     |     16 bytes    |
-     * +------------------+------------------+
-     * @returns The commitment fields from the blob.
-     */
-    commitmentToFields(): [Fr, Fr];
-    getEthVersionedBlobHash(): Buffer;
-    static getEthVersionedBlobHash(commitment: Buffer): Buffer;
-    /**
-     * Get the buffer representation of the ENTIRE blob.
-     *
-     * @dev WARNING: this buffer contains all metadata aswell as the data itself
-     *
-     * @returns The buffer representation of the blob.
-     */
-    toBuffer(): Buffer;
-    /**
-     * Create a Blob from a buffer.
-     *
-     * @dev WARNING: this method contains all metadata aswell as the data itself
-     *
-     * @param buf - The buffer to create the Blob from.
-     * @returns A Blob created from the buffer.
-     */
-    static fromBuffer(buf: Buffer | BufferReader): Blob;
-    /**
-     * Get the size of the blob in bytes
-     */
-    getSize(): number;
-    /**
-     * Returns a proof of opening of the blob to verify on L1 using the point evaluation precompile:
-     *
-     * input[:32]     - versioned_hash
-     * input[32:64]   - z
-     * input[64:96]   - y
-     * input[96:144]  - commitment C
-     * input[144:192] - proof (a commitment to the quotient polynomial q(X))
-     *
-     * See https://eips.ethereum.org/EIPS/eip-4844#point-evaluation-precompile
-     */
-    getEthBlobEvaluationInputs(): `0x${string}`;
-    static getEthBlobEvaluationInputs(blobs: Blob[]): `0x${string}`;
-    static getViemKzgInstance(): {
-        blobToKzgCommitment: typeof cKzg.blobToKzgCommitment;
-        computeBlobKzgProof: typeof cKzg.computeBlobKzgProof;
-    };
-    static getBlobs(fields: Fr[]): Promise<Blob[]>;
-}
-//# sourceMappingURL=blob.d.ts.map

package/dest/blob/blob.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"blob.d.ts","sourceRoot":"","sources":["../../src/blob/blob.ts"],"names":[],"mappings":";;AACA,OAAO,IAAI,MAAM,OAAO,CAAC;AACzB,OAAO,KAAK,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAqB,MAAM,uBAAuB,CAAC;AAGxE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM/C,eAAO,MAAM,0BAA0B,IAAO,CAAC;AAE/C;;GAEG;AACH,qBAAa,IAAI;IAEb,oDAAoD;aACpC,IAAI,EAAE,UAAU;IAChC,6IAA6I;aAC7H,UAAU,EAAE,EAAE;IAC9B,sFAAsF;aACtE,UAAU,EAAE,EAAE;IAC9B,sHAAsH;aACtG,WAAW,EAAE,MAAM;IACnC,kFAAkF;aAClE,UAAU,EAAE,MAAM;IAClC,iIAAiI;aACjH,KAAK,EAAE,MAAM;;IAX7B,oDAAoD;IACpC,IAAI,EAAE,UAAU;IAChC,6IAA6I;IAC7H,UAAU,EAAE,EAAE;IAC9B,sFAAsF;IACtE,UAAU,EAAE,EAAE;IAC9B,sHAAsH;IACtG,WAAW,EAAE,MAAM;IACnC,kFAAkF;IAClE,UAAU,EAAE,MAAM;IAClC,iIAAiI;IACjH,KAAK,EAAE,MAAM;IAG/B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,mBAAmB,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvF;;;;;;OAMG;WACU,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,mBAAmB,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9E;;;;;;;;;;;OAWG;WACU,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAepD;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ;IAWhC;;;;;;OAMG;IACH,QAAQ,IAAI,EAAE,EAAE;IAIhB;;;;;;;;OAQG;IACH,eAAe,IAAI,EAAE,EAAE;IAUvB;;;;;;;;;;;OAWG;IACH,kBAAkB,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAK9B,uBAAuB,IAAI,MAAM;IAMjC,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAM1D;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM;IAiBlB;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAYnD;;OAEG;IACH,OAAO;IAIP;;;;;;;;;;OAUG;IACH,0BAA0B,IAAI,KAAK,MAAM,EAAE;IAW3C,MAAM,CAAC,0BAA0B,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE;IAmB/D,MAAM,CAAC,kBAAkB;;;;WASZ,QAAQ,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAUrD"}