@aztec/stdlib 0.84.0-nightly.20250409 → 0.84.0-nightly.20250412

package/src/proofs/proof.ts

@@ -59,20 +59,26 @@ export class Proof {
     return bufferToHex(this.toBuffer());
   }
 
+  /**
+   * Returns the proof without the public inputs, but includes the pairing point object as part of the proof.
+   * @returns Proof in bytes form, including the pairing point object at the start.
+   */
   public withoutPublicInputs(): Buffer {
     if (this.isEmpty()) {
       return this.buffer;
     }
     // We are indexing to this particular size because we are assuming the proof buffer looks like:
     // [binary public inputs, binary proof]
-    const proofStart = Fr.SIZE_IN_BYTES * this.numPublicInputs;
+    // Here, we are assuming the pairing point object is the last 16 fields of the public inputs.
+    assert(this.numPublicInputs >= AGGREGATION_OBJECT_LENGTH, 'Proof does not contain an aggregation object');
+    const proofStart = Fr.SIZE_IN_BYTES * (this.numPublicInputs - AGGREGATION_OBJECT_LENGTH);
     assert(this.buffer.length >= proofStart, 'Proof buffer is not appropriately sized to call withoutPublicInputs()');
     return this.buffer.subarray(proofStart);
   }
 
   // This function assumes that the proof will contain an aggregation object and look something like:
   // [binary public inputs, aggregation object, rest of proof]
-  // We are extracting the binary public inputs and reading them as Frs, and also extracting the aggregation object.
+  // We are extracting the binary public inputs and reading them as Frs.
   public extractPublicInputs(): Fr[] {
     if (this.isEmpty()) {
       // return array of this.numPublicInputs 0s
@@ -81,26 +87,10 @@ export class Proof {
     assert(this.numPublicInputs >= AGGREGATION_OBJECT_LENGTH, 'Proof does not contain an aggregation object');
     const numInnerPublicInputs = this.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
     const reader = BufferReader.asReader(this.buffer.subarray(0, Fr.SIZE_IN_BYTES * numInnerPublicInputs));
-    let publicInputs = reader.readArray(numInnerPublicInputs, Fr);
-    // concatenate Fr[] with aggregation object
-    publicInputs = publicInputs.concat(this.extractAggregationObject());
+    const publicInputs = reader.readArray(numInnerPublicInputs, Fr);
     return publicInputs;
   }
 
-  public extractAggregationObject(): Fr[] {
-    if (this.isEmpty()) {
-      // return array of 16 0s
-      return new Array(16).fill(Fr.zero());
-    }
-    assert(this.numPublicInputs >= AGGREGATION_OBJECT_LENGTH, 'Proof does not contain an aggregation object');
-    const numInnerPublicInputs = this.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
-    // The aggregation object is currently stored after the initial inner public inputs.
-    const reader = BufferReader.asReader(
-      this.buffer.subarray(Fr.SIZE_IN_BYTES * numInnerPublicInputs, Fr.SIZE_IN_BYTES * this.numPublicInputs),
-    );
-    return reader.readArray(AGGREGATION_OBJECT_LENGTH, Fr);
-  }
-
   /**
    * Deserialize a Proof instance from a hex string.
    * @param str - A hex string to deserialize from.

package/src/tests/factories.ts

@@ -1471,6 +1471,7 @@ export function makeAvmEnqueuedCallHint(seed = 0): AvmEnqueuedCallHint {
 export function makeAvmTxHint(seed = 0): AvmTxHint {
   return new AvmTxHint(
     `txhash-${seed}`,
+    makeGlobalVariables(seed),
     {
       noteHashes: makeArray((seed % 20) + 4, i => new Fr(i), seed + 0x1000),
       nullifiers: makeArray((seed % 20) + 4, i => new Fr(i), seed + 0x2000),
@@ -1503,6 +1504,7 @@ export async function makeAvmExecutionHints(
     contractInstances: makeArray(baseLength + 2, makeAvmContractInstanceHint, seed + 0x4700),
     contractClasses: makeArray(baseLength + 5, makeAvmContractClassHint, seed + 0x4900),
     bytecodeCommitments: await makeArrayAsync(baseLength + 5, makeAvmBytecodeCommitmentHint, seed + 0x4900),
+    startingTreeRoots: makeTreeSnapshots(seed + 0x4900),
     getSiblingPathHints: makeArray(baseLength + 5, makeAvmGetSiblingPathHint, seed + 0x4b00),
     getPreviousValueIndexHints: makeArray(baseLength + 5, makeAvmGetPreviousValueIndexHint, seed + 0x4d00),
     getLeafPreimageHintPublicDataTree: makeArray(
@@ -1534,6 +1536,7 @@ export async function makeAvmExecutionHints(
     fields.contractInstances,
     fields.contractClasses,
     fields.bytecodeCommitments,
+    fields.startingTreeRoots,
     fields.getSiblingPathHints,
     fields.getPreviousValueIndexHints,
     fields.getLeafPreimageHintPublicDataTree,

package/dest/block/l2_block_downloader/index.d.ts

@@ -1,3 +0,0 @@
-export * from './l2_block_downloader.js';
-export * from './l2_block_stream.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/block/l2_block_downloader/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC"}

package/dest/block/l2_block_downloader/index.js

@@ -1,2 +0,0 @@
-export * from './l2_block_downloader.js';
-export * from './l2_block_stream.js';

package/dest/block/l2_block_downloader/l2_block_downloader.d.ts

@@ -1,58 +0,0 @@
-import type { L2Block } from '../l2_block.js';
-import type { L2BlockSource } from '../l2_block_source.js';
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */
-export declare class L2BlockDownloader {
-    private l2BlockSource;
-    private runningPromise?;
-    private running;
-    private from;
-    private interruptibleSleep;
-    private readonly semaphore;
-    private readonly jobQueue;
-    private readonly blockQueue;
-    private readonly proven;
-    private readonly pollIntervalMS;
-    constructor(l2BlockSource: L2BlockSource, opts: {
-        maxQueueSize: number;
-        proven?: boolean;
-        pollIntervalMS?: number;
-    });
-    /**
-     * Starts the downloader.
-     * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-     */
-    start(from?: number): void;
-    /**
-     * Repeatedly queries the block source and adds the received blocks to the block queue.
-     * Stops when no further blocks are received.
-     * @param targetBlockNumber - Optional block number to stop at.
-     * @param proven - Optional override of the default "proven" setting.
-     * @returns The total number of blocks added to the block queue.
-     */
-    private collectBlocks;
-    /**
-     * Stops the downloader.
-     */
-    stop(): Promise<void>;
-    /**
-     * Gets the next batch of blocks from the queue.
-     * @param timeout - optional timeout value to prevent permanent blocking
-     * @returns The next batch of blocks from the queue.
-     */
-    getBlocks(timeout?: number): Promise<L2Block[]>;
-    /**
-     * Forces an immediate request for blocks.
-     * Repeatedly queries the block source and adds the received blocks to the block queue.
-     * Stops when no further blocks are received.
-     * @param targetBlockNumber - Optional block number to stop at.
-     * @param proven - Optional override of the default "proven" setting.
-     * @returns A promise that fulfills once the poll is complete
-     */
-    pollImmediate(targetBlockNumber?: number, onlyProven?: boolean): Promise<number>;
-}
-//# sourceMappingURL=l2_block_downloader.d.ts.map

package/dest/block/l2_block_downloader/l2_block_downloader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_downloader.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/l2_block_downloader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D;;;;;GAKG;AACH,qBAAa,iBAAiB;IAY1B,OAAO,CAAC,aAAa;IAXvB,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;gBAG9B,aAAa,EAAE,aAAa,EACpC,IAAI,EAAE;QACJ,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;IAOH;;;OAGG;IACI,KAAK,CAAC,IAAI,SAAuB;IAuBxC;;;;;;OAMG;YACW,aAAa;IAiC3B;;OAEG;IACU,IAAI;IAQjB;;;;OAIG;IACU,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAc5D;;;;;;;OAOG;IACI,aAAa,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAGxF"}

package/dest/block/l2_block_downloader/l2_block_downloader.js

@@ -1,124 +0,0 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { FifoMemoryQueue, Semaphore, SerialQueue } from '@aztec/foundation/queue';
-import { InterruptibleSleep } from '@aztec/foundation/sleep';
-const log = createLogger('types:l2_block_downloader');
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */ export class L2BlockDownloader {
-    l2BlockSource;
-    runningPromise;
-    running;
-    from;
-    interruptibleSleep;
-    semaphore;
-    jobQueue;
-    blockQueue;
-    proven;
-    pollIntervalMS;
-    constructor(l2BlockSource, opts){
-        this.l2BlockSource = l2BlockSource;
-        this.running = false;
-        this.from = 0;
-        this.interruptibleSleep = new InterruptibleSleep();
-        this.jobQueue = new SerialQueue();
-        this.blockQueue = new FifoMemoryQueue();
-        this.pollIntervalMS = opts.pollIntervalMS ?? 1000;
-        this.proven = opts.proven ?? false;
-        this.semaphore = new Semaphore(opts.maxQueueSize);
-    }
-    /**
-   * Starts the downloader.
-   * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-   */ start(from = INITIAL_L2_BLOCK_NUM) {
-        if (this.running) {
-            this.interruptibleSleep.interrupt();
-            return;
-        }
-        this.from = from;
-        this.running = true;
-        const fn = async ()=>{
-            while(this.running){
-                try {
-                    await this.jobQueue.put(()=>this.collectBlocks());
-                    await this.interruptibleSleep.sleep(this.pollIntervalMS);
-                } catch (err) {
-                    log.error(`Error downloading L2 block`, err);
-                    await this.interruptibleSleep.sleep(this.pollIntervalMS);
-                }
-            }
-        };
-        this.jobQueue.start();
-        this.runningPromise = fn();
-    }
-    /**
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns The total number of blocks added to the block queue.
-   */ async collectBlocks(targetBlockNumber, onlyProven) {
-        let totalBlocks = 0;
-        while(true){
-            // If we have a target and have reached it, return
-            if (targetBlockNumber !== undefined && this.from > targetBlockNumber) {
-                log.verbose(`Reached target block number ${targetBlockNumber}`);
-                return totalBlocks;
-            }
-            // If we have a target, then request at most the number of blocks to get to it
-            const limit = targetBlockNumber !== undefined ? Math.min(targetBlockNumber - this.from + 1, 10) : 10;
-            const proven = onlyProven === undefined ? this.proven : onlyProven;
-            // Hit the archiver for blocks
-            const blocks = await this.l2BlockSource.getBlocks(this.from, limit, proven);
-            // If there are no more blocks, return
-            if (!blocks.length) {
-                return totalBlocks;
-            }
-            log.verbose(`Received ${blocks.length} blocks from archiver after querying from ${this.from} limit ${limit} (proven ${proven})`);
-            // Push new blocks into the queue and loop
-            await this.semaphore.acquire();
-            this.blockQueue.put(blocks);
-            this.from += blocks.length;
-            totalBlocks += blocks.length;
-        }
-    }
-    /**
-   * Stops the downloader.
-   */ async stop() {
-        this.running = false;
-        this.interruptibleSleep.interrupt();
-        await this.jobQueue.cancel();
-        this.blockQueue.cancel();
-        await this.runningPromise;
-    }
-    /**
-   * Gets the next batch of blocks from the queue.
-   * @param timeout - optional timeout value to prevent permanent blocking
-   * @returns The next batch of blocks from the queue.
-   */ async getBlocks(timeout) {
-        try {
-            const blocks = await this.blockQueue.get(timeout);
-            if (!blocks) {
-                return [];
-            }
-            this.semaphore.release();
-            return blocks;
-        } catch (err) {
-            // nothing to do
-            return [];
-        }
-    }
-    /**
-   * Forces an immediate request for blocks.
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns A promise that fulfills once the poll is complete
-   */ pollImmediate(targetBlockNumber, onlyProven) {
-        return this.jobQueue.put(()=>this.collectBlocks(targetBlockNumber, onlyProven));
-    }
-}

package/dest/block/l2_block_downloader/l2_block_stream.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../../src/block/l2_block_downloader/l2_block_stream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,uHAAuH;AACvH,qBAAa,aAAa;IAMtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,IAAI;IATd,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;gBAGjB,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,oBAAoB,GAAG,gBAAgB,GAAG,WAAW,CAAC,EACzF,SAAS,EAAE,8BAA8B,EACzC,OAAO,EAAE,yBAAyB,EACzB,GAAG,yCAAqC,EACjD,IAAI,GAAE;QACZ,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;KACnB;IAKD,KAAK;IAKC,IAAI;IAIV,SAAS;IAIH,IAAI;cAMD,IAAI;IA+EpB;;;;OAIG;YACW,qBAAqB;IAenC,OAAO,CAAC,sBAAsB;YAOhB,SAAS;CASxB;AAsBD,8FAA8F;AAC9F,MAAM,WAAW,8BAA8B;IAC7C,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC5D,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,gDAAgD;AAChD,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,kBAAkB,GAC1B,uCAAuC,CAAC;IACtC,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,GACD,kEAAkE,CAAC;IACjE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB,GACD,gCAAgC,CAAC;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB,GACD,gEAAgE,CAAC;IAC/D,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC"}

package/src/block/l2_block_downloader/index.ts

@@ -1,2 +0,0 @@
-export * from './l2_block_downloader.js';
-export * from './l2_block_stream.js';

package/src/block/l2_block_downloader/l2_block_downloader.ts

@@ -1,149 +0,0 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { FifoMemoryQueue, Semaphore, SerialQueue } from '@aztec/foundation/queue';
-import { InterruptibleSleep } from '@aztec/foundation/sleep';
-
-import type { L2Block } from '../l2_block.js';
-import type { L2BlockSource } from '../l2_block_source.js';
-
-const log = createLogger('types:l2_block_downloader');
-
-/**
- * Downloads L2 blocks from a L2BlockSource.
- * The blocks are stored in a queue and can be retrieved using the getBlocks method.
- * The queue size is limited by the maxQueueSize parameter.
- * The downloader will pause when the queue is full or when the L2BlockSource is out of blocks.
- */
-export class L2BlockDownloader {
-  private runningPromise?: Promise<void>;
-  private running = false;
-  private from = 0;
-  private interruptibleSleep = new InterruptibleSleep();
-  private readonly semaphore: Semaphore;
-  private readonly jobQueue = new SerialQueue();
-  private readonly blockQueue = new FifoMemoryQueue<L2Block[]>();
-  private readonly proven: boolean;
-  private readonly pollIntervalMS: number;
-
-  constructor(
-    private l2BlockSource: L2BlockSource,
-    opts: {
-      maxQueueSize: number;
-      proven?: boolean;
-      pollIntervalMS?: number;
-    },
-  ) {
-    this.pollIntervalMS = opts.pollIntervalMS ?? 1000;
-    this.proven = opts.proven ?? false;
-    this.semaphore = new Semaphore(opts.maxQueueSize);
-  }
-
-  /**
-   * Starts the downloader.
-   * @param from - The block number to start downloading from. Defaults to INITIAL_L2_BLOCK_NUM.
-   */
-  public start(from = INITIAL_L2_BLOCK_NUM) {
-    if (this.running) {
-      this.interruptibleSleep.interrupt();
-      return;
-    }
-    this.from = from;
-    this.running = true;
-
-    const fn = async () => {
-      while (this.running) {
-        try {
-          await this.jobQueue.put(() => this.collectBlocks());
-          await this.interruptibleSleep.sleep(this.pollIntervalMS);
-        } catch (err) {
-          log.error(`Error downloading L2 block`, err);
-          await this.interruptibleSleep.sleep(this.pollIntervalMS);
-        }
-      }
-    };
-    this.jobQueue.start();
-    this.runningPromise = fn();
-  }
-
-  /**
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns The total number of blocks added to the block queue.
-   */
-  private async collectBlocks(targetBlockNumber?: number, onlyProven?: boolean) {
-    let totalBlocks = 0;
-    while (true) {
-      // If we have a target and have reached it, return
-      if (targetBlockNumber !== undefined && this.from > targetBlockNumber) {
-        log.verbose(`Reached target block number ${targetBlockNumber}`);
-        return totalBlocks;
-      }
-
-      // If we have a target, then request at most the number of blocks to get to it
-      const limit = targetBlockNumber !== undefined ? Math.min(targetBlockNumber - this.from + 1, 10) : 10;
-      const proven = onlyProven === undefined ? this.proven : onlyProven;
-
-      // Hit the archiver for blocks
-      const blocks = await this.l2BlockSource.getBlocks(this.from, limit, proven);
-
-      // If there are no more blocks, return
-      if (!blocks.length) {
-        return totalBlocks;
-      }
-
-      log.verbose(
-        `Received ${blocks.length} blocks from archiver after querying from ${this.from} limit ${limit} (proven ${proven})`,
-      );
-
-      // Push new blocks into the queue and loop
-      await this.semaphore.acquire();
-      this.blockQueue.put(blocks);
-      this.from += blocks.length;
-      totalBlocks += blocks.length;
-    }
-  }
-
-  /**
-   * Stops the downloader.
-   */
-  public async stop() {
-    this.running = false;
-    this.interruptibleSleep.interrupt();
-    await this.jobQueue.cancel();
-    this.blockQueue.cancel();
-    await this.runningPromise;
-  }
-
-  /**
-   * Gets the next batch of blocks from the queue.
-   * @param timeout - optional timeout value to prevent permanent blocking
-   * @returns The next batch of blocks from the queue.
-   */
-  public async getBlocks(timeout?: number): Promise<L2Block[]> {
-    try {
-      const blocks = await this.blockQueue.get(timeout);
-      if (!blocks) {
-        return [];
-      }
-      this.semaphore.release();
-      return blocks;
-    } catch (err) {
-      // nothing to do
-      return [];
-    }
-  }
-
-  /**
-   * Forces an immediate request for blocks.
-   * Repeatedly queries the block source and adds the received blocks to the block queue.
-   * Stops when no further blocks are received.
-   * @param targetBlockNumber - Optional block number to stop at.
-   * @param proven - Optional override of the default "proven" setting.
-   * @returns A promise that fulfills once the poll is complete
-   */
-  public pollImmediate(targetBlockNumber?: number, onlyProven?: boolean): Promise<number> {
-    return this.jobQueue.put(() => this.collectBlocks(targetBlockNumber, onlyProven));
-  }
-}