@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.b655e406

package/src/versioning/versioning.ts

@@ -4,10 +4,7 @@ import { jsonStringify } from '@aztec/foundation/json-rpc';
 
 import type Koa from 'koa';
 
-import type { ChainConfig } from '../config/config.js';
-
-// REFACTOR: This file is not a circuit-type, but at the moment we don't have any other
-// package common to all components that we can use for this shared code.
+import type { ChainConfig } from '../config/chain-config.js';
 
 /** Fields that identify a version of the Aztec protocol. Any mismatch between these fields should signal an incompatibility between nodes. */
 export type ComponentsVersions = {
@@ -16,22 +13,22 @@ export type ComponentsVersions = {
   // Note that we are using the rollup address as identifier in multiple places
   // such as the keystore, we need to change it so we can handle updates.
   l1RollupAddress: EthAddress;
-  l2ChainVersion: number;
-  l2ProtocolContractsTreeRoot: string;
+  rollupVersion: number;
+  l2ProtocolContractsHash: string;
   l2CircuitsVkTreeRoot: string;
 };
 
 /** Returns components versions from chain config. */
 export function getComponentsVersionsFromConfig(
   config: ChainConfig,
-  l2ProtocolContractsTreeRoot: string | Fr,
+  l2ProtocolContractsHash: string | Fr,
   l2CircuitsVkTreeRoot: string | Fr,
 ): ComponentsVersions {
   return {
     l1ChainId: config.l1ChainId,
     l1RollupAddress: config.l1Contracts?.rollupAddress, // This should not be undefined, but sometimes the config lies to us and it is...
-    l2ChainVersion: config.version,
-    l2ProtocolContractsTreeRoot: l2ProtocolContractsTreeRoot.toString(),
+    rollupVersion: config.rollupVersion,
+    l2ProtocolContractsHash: l2ProtocolContractsHash.toString(),
     l2CircuitsVkTreeRoot: l2CircuitsVkTreeRoot.toString(),
   };
 }
@@ -40,7 +37,7 @@ export function getComponentsVersionsFromConfig(
 export function compressComponentVersions(versions: ComponentsVersions): string {
   if (
     versions.l1RollupAddress === undefined ||
-    versions.l2ProtocolContractsTreeRoot === undefined ||
+    versions.l2ProtocolContractsHash === undefined ||
     versions.l2CircuitsVkTreeRoot === undefined
   ) {
     throw new Error(`Component versions are not set: ${jsonStringify(versions)}`);
@@ -50,8 +47,8 @@ export function compressComponentVersions(versions: ComponentsVersions): string
     '00',
     versions.l1ChainId,
     versions.l1RollupAddress.toString().slice(2, 10),
-    versions.l2ChainVersion,
-    versions.l2ProtocolContractsTreeRoot.toString().slice(2, 10),
+    versions.rollupVersion,
+    versions.l2ProtocolContractsHash.toString().slice(2, 10),
     versions.l2CircuitsVkTreeRoot.toString().slice(2, 10),
   ].join('-');
 }
@@ -65,14 +62,8 @@ export class ComponentsVersionsError extends Error {
 
 /** Checks if the compressed string matches against the expected versions. Throws on mismatch. */
 export function checkCompressedComponentVersion(compressed: string, expected: ComponentsVersions) {
-  const [
-    versionVersion,
-    l1ChainId,
-    l1RollupAddress,
-    l2ChainVersion,
-    l2ProtocolContractsTreeRoot,
-    l2CircuitsVkTreeRoot,
-  ] = compressed.split('-');
+  const [versionVersion, l1ChainId, l1RollupAddress, rollupVersion, l2ProtocolContractsHash, l2CircuitsVkTreeRoot] =
+    compressed.split('-');
   if (versionVersion !== '00') {
     throw new ComponentsVersionsError('version', '00', versionVersion);
   }
@@ -82,14 +73,14 @@ export function checkCompressedComponentVersion(compressed: string, expected: Co
   if (l1RollupAddress !== expected.l1RollupAddress.toString().slice(2, 10)) {
     throw new ComponentsVersionsError(`L1 address`, expected.l1RollupAddress.toString(), l1RollupAddress);
   }
-  if (l2ChainVersion !== expected.l2ChainVersion.toString()) {
-    throw new ComponentsVersionsError('L2 chain version', expected.l2ChainVersion.toString(), l2ChainVersion);
+  if (rollupVersion !== expected.rollupVersion.toString()) {
+    throw new ComponentsVersionsError('L2 chain version', expected.rollupVersion.toString(), rollupVersion);
   }
-  if (l2ProtocolContractsTreeRoot !== expected.l2ProtocolContractsTreeRoot.toString().slice(2, 10)) {
+  if (l2ProtocolContractsHash !== expected.l2ProtocolContractsHash.toString().slice(2, 10)) {
     throw new ComponentsVersionsError(
       `L2 protocol contracts vk tree root`,
-      expected.l2ProtocolContractsTreeRoot.toString(),
-      l2ProtocolContractsTreeRoot,
+      expected.l2ProtocolContractsHash.toString(),
+      l2ProtocolContractsHash,
     );
   }
   if (l2CircuitsVkTreeRoot !== expected.l2CircuitsVkTreeRoot.toString().slice(2, 10)) {
@@ -108,10 +99,10 @@ export function validatePartialComponentVersionsMatch(
 ) {
   for (const key of [
     'l1RollupAddress',
-    'l2ProtocolContractsTreeRoot',
+    'l2ProtocolContractsHash',
     'l2CircuitsVkTreeRoot',
     'l1ChainId',
-    'l2ChainVersion',
+    'rollupVersion',
   ] as const) {
     const actualValue = actual[key];
     const expectedValue = expected[key];
@@ -126,11 +117,16 @@ export function validatePartialComponentVersionsMatch(
 /** Returns a Koa middleware that injects the versioning info as headers. */
 export function getVersioningMiddleware(versions: Partial<ComponentsVersions>) {
   return async (ctx: Koa.Context, next: () => Promise<void>) => {
-    await next();
-    for (const key in versions) {
-      const value = versions[key as keyof ComponentsVersions];
-      if (value !== undefined) {
-        ctx.set(`x-aztec-${key}`, value.toString());
+    try {
+      await next();
+    } finally {
+      // Always add version headers, even if there was an error
+      // This allows the client to detect version mismatches before processing other errors
+      for (const key in versions) {
+        const value = versions[key as keyof ComponentsVersions];
+        if (value !== undefined) {
+          ctx.set(`x-aztec-${key}`, value.toString());
+        }
       }
     }
   };

package/src/vks/index.ts

@@ -1,2 +1,2 @@
 export * from './verification_key.js';
-export * from './vk_witness_data.js';
+export * from './vk_data.js';

package/src/vks/verification_key.ts

@@ -1,7 +1,4 @@
-import {
-  HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS,
-  ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS,
-} from '@aztec/constants';
+import { ULTRA_VK_LENGTH_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { times } from '@aztec/foundation/collection';
 import { Fq, Fr } from '@aztec/foundation/fields';
@@ -9,6 +6,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
+import { hashVK } from '../hash/index.js';
 import { CircuitType } from '../types/shared.js';
 
 /**
@@ -82,13 +80,20 @@ export class CommitmentMap {
 // TODO: find better home for these constants
 export const CIRCUIT_SIZE_INDEX = 0;
 export const CIRCUIT_PUBLIC_INPUTS_INDEX = 1;
-export const CIRCUIT_RECURSIVE_INDEX = 3;
 
 /**
  * Provides a 'fields' representation of a circuit's verification key
  */
 export class VerificationKeyAsFields {
-  constructor(public key: Fr[], public hash: Fr) {}
+  constructor(
+    public key: Fr[],
+    public hash: Fr,
+  ) {}
+
+  static async fromKey(key: Fr[]) {
+    const hash = await hashVK(key);
+    return new VerificationKeyAsFields(key, hash);
+  }
 
   public get numPublicInputs() {
     return Number(this.key[CIRCUIT_PUBLIC_INPUTS_INDEX]);
@@ -98,10 +103,6 @@ export class VerificationKeyAsFields {
     return Number(this.key[CIRCUIT_SIZE_INDEX]);
   }
 
-  public get isRecursive() {
-    return this.key[CIRCUIT_RECURSIVE_INDEX].equals(Fr.ONE);
-  }
-
   static get schema() {
     // TODO(palla/schemas): Should we verify the hash matches the key when deserializing?
     return bufferSchemaFor(VerificationKeyAsFields);
@@ -142,12 +143,12 @@ export class VerificationKeyAsFields {
   }
 
   static makeFakeHonk(seed = 1): VerificationKeyAsFields {
-    return new VerificationKeyAsFields(makeTuple(HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS, Fr.random, seed), Fr.random());
+    return new VerificationKeyAsFields(makeTuple(ULTRA_VK_LENGTH_IN_FIELDS, Fr.random, seed), Fr.random());
   }
 
   static makeFakeRollupHonk(seed = 1): VerificationKeyAsFields {
     return new VerificationKeyAsFields(
-      makeTuple(ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS, i => new Fr(i), seed),
+      makeTuple(ULTRA_VK_LENGTH_IN_FIELDS, i => new Fr(i), seed),
       new Fr(seed + 1),
     );
   }
@@ -252,7 +253,10 @@ export class VerificationKey {
 }
 
 export class VerificationKeyData {
-  constructor(public readonly keyAsFields: VerificationKeyAsFields, public readonly keyAsBytes: Buffer) {}
+  constructor(
+    public readonly keyAsFields: VerificationKeyAsFields,
+    public readonly keyAsBytes: Buffer,
+  ) {}
 
   public get numPublicInputs() {
     return this.keyAsFields.numPublicInputs;
@@ -262,10 +266,6 @@ export class VerificationKeyData {
     return this.keyAsFields.circuitSize;
   }
 
-  public get isRecursive() {
-    return this.keyAsFields.isRecursive;
-  }
-
   static empty() {
     return new VerificationKeyData(VerificationKeyAsFields.makeEmpty(0), Buffer.alloc(0));
   }
@@ -281,7 +281,7 @@ export class VerificationKeyData {
     );
   }
 
-  static makeFake(len = ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS): VerificationKeyData {
+  static makeFake(len = ULTRA_VK_LENGTH_IN_FIELDS): VerificationKeyData {
     return new VerificationKeyData(VerificationKeyAsFields.makeFake(len), VerificationKey.makeFake().toBuffer());
   }
 

package/src/vks/{vk_witness_data.ts → vk_data.ts}

@@ -7,26 +7,26 @@ import { bufferToHex } from '@aztec/foundation/string';
 import type { UInt32 } from '../types/shared.js';
 import { VerificationKeyData } from './verification_key.js';
 
-export class VkWitnessData {
+export class VkData {
   constructor(
     public vk: VerificationKeyData,
     /**
      * Index of the vk in the vk tree.
      */
-    public vkIndex: UInt32,
+    public leafIndex: UInt32,
     /**
      * Sibling path of the vk in the vk tree.
      */
-    public vkPath: Tuple<Fr, typeof VK_TREE_HEIGHT>,
+    public siblingPath: Tuple<Fr, typeof VK_TREE_HEIGHT>,
   ) {}
 
   static empty() {
-    return new VkWitnessData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
+    return new VkData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new VkWitnessData(
+    return new VkData(
       reader.readObject(VerificationKeyData),
       reader.readNumber(),
       reader.readArray(VK_TREE_HEIGHT, Fr),
@@ -34,7 +34,7 @@ export class VkWitnessData {
   }
 
   toBuffer() {
-    return serializeToBuffer(this.vk, this.vkIndex, this.vkPath);
+    return serializeToBuffer(this.vk, this.leafIndex, this.siblingPath);
   }
 
   toString() {

package/src/world-state/index.ts

@@ -0,0 +1 @@
+export * from './world_state_revision.js';

package/src/world-state/world_state_revision.ts

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+
+export class WorldStateRevision {
+  constructor(
+    public readonly forkId: number,
+    public readonly blockNumber: number,
+    public readonly includeUncommitted: boolean,
+  ) {}
+
+  static empty() {
+    return new WorldStateRevision(0, 0, false);
+  }
+
+  static get schema() {
+    return z.object({
+      forkId: z.number(),
+      blockNumber: z.number(),
+      includeUncommitted: z.boolean(),
+    });
+  }
+}

package/src/zkpassport/index.ts

@@ -0,0 +1,119 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { withoutHexPrefix } from '@aztec/foundation/string';
+
+export type ViemZkPassportProofParams = {
+  proofVerificationData: {
+    vkeyHash: `0x${string}`;
+    proof: `0x${string}`;
+    publicInputs: `0x${string}`[];
+  };
+  commitments: {
+    committedInputs: `0x${string}`;
+  };
+  serviceConfig: {
+    validityPeriodInSeconds: bigint;
+    domain: string;
+    scope: string;
+    devMode: boolean;
+  };
+};
+
+// NOTE: Must match the ZkPassportProofParams struct in the zkpassport verifier contract
+// find here: ROOT/l1-contracts/lib/circuits/src/solidity/src/ZKPassportVerifier.sol
+export class ZkPassportProofParams {
+  constructor(
+    public devMode: boolean,
+    public vkeyHash: Buffer32,
+    public proof: Buffer,
+    public publicInputs: Fr[],
+    public committedInputs: Buffer,
+    public validityPeriodInSeconds: bigint,
+    public domain: string,
+    public scope: string,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer([
+      this.devMode,
+      this.vkeyHash,
+      this.proof.length,
+      this.proof,
+      this.publicInputs.length,
+      this.publicInputs,
+      this.committedInputs.length,
+      this.committedInputs,
+      this.validityPeriodInSeconds,
+      this.domain,
+      this.scope,
+    ]);
+  }
+
+  static random() {
+    const committedInputCounts = [BigInt(1), BigInt(2), BigInt(3), BigInt(4)];
+    const numberOfCommittedInputs = committedInputCounts.reduce((acc, count) => acc + count, BigInt(0));
+    const committedInputs = randomBytes(Number(numberOfCommittedInputs) * 32);
+
+    const publicInputsCount = numberOfCommittedInputs + 16n;
+    const publicInputs = Array.from({ length: Number(publicInputsCount) }, () => Fr.random());
+
+    return new ZkPassportProofParams(
+      false,
+      Buffer32.random(),
+      randomBytes(1024),
+      publicInputs,
+      committedInputs,
+      BigInt(7 * 24 * 60 * 60), // 7 days
+      'sequencer.alpha-testnet.aztec.network',
+      'personhood',
+    );
+  }
+
+  static fromBuffer(buffer: Buffer) {
+    const reader = BufferReader.asReader(buffer);
+    return new ZkPassportProofParams(
+      reader.readBoolean(),
+      reader.readObject(Buffer32),
+      reader.readBuffer(),
+      reader.readVector(Fr),
+      reader.readBuffer(),
+      reader.readUInt256(),
+      reader.readString(),
+      reader.readString(),
+    );
+  }
+
+  static fromViem(params: ViemZkPassportProofParams) {
+    return new ZkPassportProofParams(
+      params.serviceConfig.devMode,
+      Buffer32.fromString(params.proofVerificationData.vkeyHash),
+      Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'),
+      params.proofVerificationData.publicInputs.map(input => Fr.fromString(input)),
+      Buffer.from(withoutHexPrefix(params.commitments.committedInputs), 'hex'),
+      params.serviceConfig.validityPeriodInSeconds,
+      params.serviceConfig.domain,
+      params.serviceConfig.scope,
+    );
+  }
+
+  toViem(): ViemZkPassportProofParams {
+    return {
+      serviceConfig: {
+        devMode: this.devMode,
+        validityPeriodInSeconds: this.validityPeriodInSeconds,
+        domain: this.domain,
+        scope: this.scope,
+      },
+      proofVerificationData: {
+        vkeyHash: this.vkeyHash.toString(),
+        proof: `0x${this.proof.toString('hex')}`,
+        publicInputs: this.publicInputs.map(input => input.toString()),
+      },
+      commitments: {
+        committedInputs: `0x${this.committedInputs.toString('hex')}`,
+      },
+    };
+  }
+}

package/dest/avm/public_data_hint.d.ts

@@ -1,18 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-export declare class PublicDataHint {
-    leafSlot: Fr;
-    value: Fr;
-    membershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>;
-    leafPreimage: PublicDataTreeLeafPreimage;
-    constructor(leafSlot: Fr, value: Fr, membershipWitness: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>, leafPreimage: PublicDataTreeLeafPreimage);
-    static empty(): PublicDataHint;
-    static fromBuffer(buffer: Buffer | BufferReader): PublicDataHint;
-    toBuffer(): Buffer;
-}
-//# sourceMappingURL=public_data_hint.d.ts.map

package/dest/avm/public_data_hint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"public_data_hint.d.ts","sourceRoot":"","sources":["../../src/avm/public_data_hint.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE/D,qBAAa,cAAc;IAEhB,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE,EAAE;IACT,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IACpE,YAAY,EAAE,0BAA0B;gBAHxC,QAAQ,EAAE,EAAE,EACZ,KAAK,EAAE,EAAE,EACT,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,EACpE,YAAY,EAAE,0BAA0B;IAGjD,MAAM,CAAC,KAAK;IASZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAU/C,QAAQ;CAGT"}

package/dest/avm/public_data_hint.js

@@ -1,27 +0,0 @@
-import { PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataTreeLeafPreimage } from '../trees/index.js';
-export class PublicDataHint {
-    leafSlot;
-    value;
-    membershipWitness;
-    leafPreimage;
-    constructor(leafSlot, value, membershipWitness, leafPreimage){
-        this.leafSlot = leafSlot;
-        this.value = value;
-        this.membershipWitness = membershipWitness;
-        this.leafPreimage = leafPreimage;
-    }
-    static empty() {
-        return new PublicDataHint(Fr.ZERO, Fr.ZERO, MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT), PublicDataTreeLeafPreimage.empty());
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new PublicDataHint(reader.readObject(Fr), reader.readObject(Fr), MembershipWitness.fromBuffer(reader, PUBLIC_DATA_TREE_HEIGHT), reader.readObject(PublicDataTreeLeafPreimage));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.leafSlot, this.value, this.membershipWitness, this.leafPreimage);
-    }
-}

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