@aztec/stdlib 0.84.0 → 0.85.0

package/src/logs/pending_tagged_log.ts

@@ -2,6 +2,7 @@ import { MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/const
 import { Fr } from '@aztec/foundation/fields';
 
 import type { AztecAddress } from '../aztec-address/index.js';
+import type { TxHash } from '../tx/tx_hash.js';
 
 /**
  * Represents a pending tagged log as it is stored in the pending tagged log array to which the syncNotes oracle
@@ -10,21 +11,23 @@ import type { AztecAddress } from '../aztec-address/index.js';
 export class PendingTaggedLog {
   constructor(
     public log: Fr[],
-    public txHash: Fr,
+    public txHash: TxHash,
     public uniqueNoteHashesInTx: Fr[],
     public firstNullifierInTx: Fr,
     public recipient: AztecAddress,
     public logIndexInTx: number,
+    public txIndexInBlock: number,
   ) {}
 
   toFields(): Fr[] {
     return [
       ...serializeBoundedVec(this.log, PRIVATE_LOG_SIZE_IN_FIELDS),
-      this.txHash,
+      this.txHash.hash,
       ...serializeBoundedVec(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
       this.firstNullifierInTx,
       this.recipient.toField(),
       new Fr(this.logIndexInTx),
+      new Fr(this.txIndexInBlock),
     ];
   }
 }

package/src/messaging/l1_to_l2_message_source.ts

@@ -1,5 +1,7 @@
 import type { Fr } from '@aztec/foundation/fields';
 
+import type { L2Tips } from '../block/l2_block_source.js';
+
 /**
  * Interface of classes allowing for the retrieval of L1 to L2 messages.
  */
@@ -23,4 +25,9 @@ export interface L1ToL2MessageSource {
    * @returns The number of the latest L2 block processed by the implementation.
    */
   getBlockNumber(): Promise<number>;
+
+  /**
+   * Returns the tips of the L2 chain.
+   */
+  getL2Tips(): Promise<L2Tips>;
 }

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

@@ -55,11 +55,14 @@ import { ContractStorageRead } from '../avm/contract_storage_read.js';
 import { ContractStorageUpdateRequest } from '../avm/contract_storage_update_request.js';
 import {
   AvmAccumulatedData,
+  AvmAppendLeavesHint,
   AvmBytecodeCommitmentHint,
   AvmCircuitInputs,
   AvmCircuitPublicInputs,
+  AvmCommitCheckpointHint,
   AvmContractClassHint,
   AvmContractInstanceHint,
+  AvmCreateCheckpointHint,
   AvmEnqueuedCallHint,
   AvmExecutionHints,
   AvmGetLeafPreimageHintNullifierTree,
@@ -67,6 +70,7 @@ import {
   AvmGetLeafValueHint,
   AvmGetPreviousValueIndexHint,
   AvmGetSiblingPathHint,
+  AvmRevertCheckpointHint,
   AvmSequentialInsertHintNullifierTree,
   AvmSequentialInsertHintPublicDataTree,
   AvmTxHint,
@@ -1382,6 +1386,42 @@ export function makeAvmSequentialInsertHintNullifierTree(seed = 0): AvmSequentia
   );
 }
 
+export function makeAvmAppendLeavesHint(seed = 0): AvmAppendLeavesHint {
+  return new AvmAppendLeavesHint(
+    makeAppendOnlyTreeSnapshot(seed),
+    makeAppendOnlyTreeSnapshot(seed + 1),
+    // Use NOTE_HASH_TREE or L1_TO_L2_MESSAGE_TREE as mentioned in the comment on AvmAppendLeavesHint
+    seed % 2 === 0 ? MerkleTreeId.NOTE_HASH_TREE : MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
+    makeArray((seed % 5) + 1, i => new Fr(seed + i + 2), 0),
+  );
+}
+
+export function makeAvmCheckpointActionCreateCheckpointHint(seed = 0): AvmCreateCheckpointHint {
+  return new AvmCreateCheckpointHint(
+    /*actionCounter=*/ seed,
+    /*oldCheckpointId=*/ seed + 1,
+    /*newCheckpointId=*/ seed + 2,
+  );
+}
+
+export function makeAvmCheckpointActionCommitCheckpointHint(seed = 0): AvmCommitCheckpointHint {
+  return new AvmCommitCheckpointHint(
+    /*actionCounter=*/ seed,
+    /*oldCheckpointId=*/ seed + 1,
+    /*newCheckpointId=*/ seed + 2,
+  );
+}
+
+export function makeAvmCheckpointActionRevertCheckpointHint(seed = 0): AvmRevertCheckpointHint {
+  return new AvmRevertCheckpointHint(
+    /*actionCounter=*/ seed,
+    /*oldCheckpointId=*/ seed + 1,
+    /*newCheckpointId=*/ seed + 2,
+    /*beforeState=*/ makeTreeSnapshots(seed + 3),
+    /*afterState=*/ makeTreeSnapshots(seed + 7),
+  );
+}
+
 /**
  * Makes arbitrary AvmContractInstanceHint.
  * @param seed - The seed to use for generating the state reference.
@@ -1430,6 +1470,8 @@ 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),
@@ -1462,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(
@@ -1481,6 +1524,10 @@ export async function makeAvmExecutionHints(
       makeAvmSequentialInsertHintNullifierTree,
       seed + 0x5700,
     ),
+    appendLeavesHints: makeArray(baseLength + 5, makeAvmAppendLeavesHint, seed + 0x5800),
+    createCheckpointHints: makeArray(baseLength + 5, makeAvmCheckpointActionCreateCheckpointHint, seed + 0x5900),
+    commitCheckpointHints: makeArray(baseLength + 5, makeAvmCheckpointActionCommitCheckpointHint, seed + 0x5b00),
+    revertCheckpointHints: makeArray(baseLength + 5, makeAvmCheckpointActionRevertCheckpointHint, seed + 0x5d00),
     ...overrides,
   };
 
@@ -1489,6 +1536,7 @@ export async function makeAvmExecutionHints(
     fields.contractInstances,
     fields.contractClasses,
     fields.bytecodeCommitments,
+    fields.startingTreeRoots,
     fields.getSiblingPathHints,
     fields.getPreviousValueIndexHints,
     fields.getLeafPreimageHintPublicDataTree,
@@ -1496,6 +1544,10 @@ export async function makeAvmExecutionHints(
     fields.getLeafValueHints,
     fields.sequentialInsertHintsPublicDataTree,
     fields.sequentialInsertHintsNullifierTree,
+    fields.appendLeavesHints,
+    fields.createCheckpointHints,
+    fields.commitCheckpointHints,
+    fields.revertCheckpointHints,
   );
 }
 
@@ -1509,14 +1561,12 @@ export async function makeAvmCircuitInputs(
   overrides: Partial<FieldsOf<AvmCircuitInputs>> = {},
 ): Promise<AvmCircuitInputs> {
   const fields = {
-    functionName: `function${seed}`,
-    calldata: makeArray((seed % 100) + 10, i => new Fr(i), seed + 0x1000),
-    avmHints: await makeAvmExecutionHints(seed + 0x3000),
+    hints: await makeAvmExecutionHints(seed + 0x3000),
     publicInputs: makeAvmCircuitPublicInputs(seed + 0x4000),
     ...overrides,
   };
 
-  return new AvmCircuitInputs(fields.functionName, fields.calldata, fields.avmHints, fields.publicInputs);
+  return new AvmCircuitInputs(fields.hints, fields.publicInputs);
 }
 
 /**

package/src/tests/mocks.ts

@@ -78,6 +78,7 @@ export const mockTx = async (
     publicCalldataSize = 2,
     feePayer,
     clientIvcProof = ClientIvcProof.empty(),
+    maxPriorityFeesPerGas,
   }: {
     numberOfNonRevertiblePublicCallRequests?: number;
     numberOfRevertiblePublicCallRequests?: number;
@@ -86,6 +87,7 @@ export const mockTx = async (
     publicCalldataSize?: number;
     feePayer?: AztecAddress;
     clientIvcProof?: ClientIvcProof;
+    maxPriorityFeesPerGas?: GasFees;
   } = {},
 ) => {
   const totalPublicCallRequests =
@@ -95,7 +97,10 @@ export const mockTx = async (
   const isForPublic = totalPublicCallRequests > 0;
   const data = PrivateKernelTailCircuitPublicInputs.empty();
   const firstNullifier = new Nullifier(new Fr(seed + 1), 0, Fr.ZERO);
-  data.constants.txContext.gasSettings = GasSettings.default({ maxFeesPerGas: new GasFees(10, 10) });
+  data.constants.txContext.gasSettings = GasSettings.default({
+    maxFeesPerGas: new GasFees(10, 10),
+    maxPriorityFeesPerGas,
+  });
   data.feePayer = feePayer ?? (await AztecAddress.random());
 
   const publicFunctionCalldata: HashedValues[] = [];

package/src/tx/index.ts

@@ -24,6 +24,8 @@ export * from './public_simulation_output.js';
 export * from './tx_execution_request.js';
 export * from './validator/tx_validator.js';
 export * from './validator/empty_validator.js';
+export * from './validator/error_texts.js';
 export * from './capsule.js';
 export * from './global_variable_builder.js';
 export * from './hashed_values.js';
+export * from './indexed_tx_effect.js';

package/src/tx/indexed_tx_effect.ts

@@ -0,0 +1,17 @@
+import { schemas } from '@aztec/foundation/schemas';
+
+import { type InBlock, inBlockSchemaFor, randomInBlock } from '../block/in_block.js';
+import { TxEffect } from './tx_effect.js';
+
+export type IndexedTxEffect = InBlock<TxEffect> & { txIndexInBlock: number };
+
+export function indexedTxSchema() {
+  return inBlockSchemaFor(TxEffect.schema).extend({ txIndexInBlock: schemas.Integer });
+}
+
+export async function randomIndexedTxEffect(): Promise<IndexedTxEffect> {
+  return {
+    ...randomInBlock(await TxEffect.random()),
+    txIndexInBlock: Math.floor(Math.random() * 1000),
+  };
+}

package/src/tx/tx_hash.ts

@@ -12,10 +12,6 @@ export class TxHash {
     public readonly hash: Fr,
   ) {}
 
-  /*
-   * TxHashes are generated from the first nullifier of a transaction, which is a Fr.
-   * @returns A random TxHash.
-   */
   static random() {
     return new TxHash(Fr.random());
   }

package/src/tx/validator/error_texts.ts

@@ -0,0 +1,34 @@
+// Gas and fees
+export const TX_ERROR_INSUFFICIENT_FEE_PER_GAS = 'Insufficient fee per gas';
+export const TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE = 'Insufficient fee payer balance';
+export const TX_ERROR_INSUFFICIENT_GAS_LIMIT = 'Gas limit is below the minimum fixed cost';
+
+// Phases
+export const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = 'Setup function not on allow list';
+
+// Nullifiers
+export const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = 'Duplicate nullifier in tx';
+export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
+
+// Metadata
+export const TX_ERROR_INVALID_BLOCK_NUMBER = 'Invalid block number';
+export const TX_ERROR_INCORRECT_CHAIN_ID = 'Incorrect chain id';
+export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
+
+// Proof
+export const TX_ERROR_INVALID_PROOF = 'Invalid proof';
+
+//Data
+export const TX_ERROR_INCORRECT_CALLDATA = 'Incorrect calldata for public call';
+export const TX_ERROR_CALLDATA_COUNT_MISMATCH = 'Wrong number of calldata for public calls';
+export const TX_ERROR_CALLDATA_COUNT_TOO_LARGE = 'Total calldata too large for enqueued public calls';
+export const TX_ERROR_CONTRACT_CLASS_LOG_COUNT = 'Mismatched number of contract class logs';
+export const TX_ERROR_CONTRACT_CLASS_LOG_LENGTH = 'Mismatched contract class logs length';
+export const TX_ERROR_CONTRACT_CLASS_LOGS = 'Mismatched contract class logs';
+export const TX_ERROR_CONTRACT_CLASS_LOG_SORTING = 'Incorrectly sorted contract class logs';
+
+// Block header
+export const TX_ERROR_BLOCK_HEADER = 'Block header not found';
+
+// General
+export const TX_ERROR_DURING_VALIDATION = 'Unexpected error during validation';

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';