@aztec/stdlib 0.0.1-commit.6d3c34e → 0.0.1-commit.6ebe706df

package/src/update-checker/version_checker.ts

@@ -0,0 +1,65 @@
+import { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/promise';
+
+import { EventEmitter } from 'node:events';
+
+export type EventMap = {
+  newVersion: [{ name: string; currentVersion: string; latestVersion: string }];
+};
+
+export type VersionCheck = {
+  name: string;
+  currentVersion: string;
+  getLatestVersion: () => Promise<string | undefined>;
+};
+
+export class VersionChecker extends EventEmitter<EventMap> {
+  private runningPromise: RunningPromise;
+  constructor(
+    private checks: Array<VersionCheck>,
+    intervalCheckMs = 60_000,
+    private logger = createLogger('version_checker'),
+  ) {
+    super();
+    this.runningPromise = new RunningPromise(this.run, logger, intervalCheckMs);
+  }
+
+  public start(): void {
+    if (this.runningPromise.isRunning()) {
+      this.logger.warn('VersionChecker is already running');
+      return;
+    }
+
+    this.runningPromise.start();
+    this.logger.info('Version check started');
+  }
+
+  public trigger(): Promise<void> {
+    return this.runningPromise.trigger();
+  }
+
+  public async stop(): Promise<void> {
+    if (!this.runningPromise.isRunning()) {
+      this.logger.warn('VersionChecker is not running');
+      return;
+    }
+
+    await this.runningPromise.stop();
+    this.logger.info('Version checker stopped');
+  }
+
+  private run = async () => {
+    await Promise.allSettled(this.checks.map(check => this.checkVersion(check)));
+  };
+
+  private async checkVersion({ name, currentVersion, getLatestVersion }: VersionCheck): Promise<void> {
+    try {
+      const latestVersion = await getLatestVersion();
+      if (latestVersion && latestVersion !== currentVersion) {
+        this.emit('newVersion', { name, latestVersion, currentVersion });
+      }
+    } catch (err) {
+      this.logger.warn(`Error checking for new ${name} versions: ${err}`, { err });
+    }
+  }
+}

package/src/validators/errors.ts

@@ -36,6 +36,15 @@ export class FailedToReExecuteTransactionsError extends ValidatorError {
   }
 }
 
+export class ReExInitialStateMismatchError extends ValidatorError {
+  constructor(
+    public readonly expectedArchiveRoot: Fr,
+    public readonly actualArchiveRoot: Fr,
+  ) {
+    super('Re-execution initial state mismatch');
+  }
+}
+
 export class ReExStateMismatchError extends ValidatorError {
   constructor(
     public readonly expectedArchiveRoot: Fr,

package/src/validators/schemas.ts

@@ -12,7 +12,14 @@ import type {
 } from './types.js';
 
 export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
-  z.enum(['block-mined', 'block-proposed', 'block-missed', 'attestation-sent', 'attestation-missed']),
+  z.enum([
+    'checkpoint-mined',
+    'checkpoint-proposed',
+    'checkpoint-missed',
+    'blocks-missed',
+    'attestation-sent',
+    'attestation-missed',
+  ]),
 );
 
 export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(

package/src/validators/types.ts

@@ -1,12 +1,13 @@
 import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
-export type ValidatorStatusType = 'block' | 'attestation';
+export type ValidatorStatusType = 'proposer' | 'attestation';
 
 export type ValidatorStatusInSlot =
-  | 'block-mined'
-  | 'block-proposed'
-  | 'block-missed'
+  | 'checkpoint-mined'
+  | 'checkpoint-proposed'
+  | 'checkpoint-missed'
+  | 'blocks-missed'
   | 'attestation-sent'
   | 'attestation-missed';
 

package/src/versioning/versioning.ts

@@ -115,7 +115,7 @@ export function validatePartialComponentVersionsMatch(
 }
 
 /** Returns a Koa middleware that injects the versioning info as headers. */
-export function getVersioningMiddleware(versions: Partial<ComponentsVersions>) {
+export function getVersioningMiddleware(versions: Partial<ComponentsVersions>, opts?: { packageVersion?: string }) {
   return async (ctx: Koa.Context, next: () => Promise<void>) => {
     try {
       await next();
@@ -128,6 +128,9 @@ export function getVersioningMiddleware(versions: Partial<ComponentsVersions>) {
           ctx.set(`x-aztec-${key}`, value.toString());
         }
       }
+      if (opts?.packageVersion) {
+        ctx.set('x-aztec-packageVersion', opts.packageVersion);
+      }
     }
   };
 }

package/src/zkpassport/index.ts

@@ -5,14 +5,13 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { withoutHexPrefix } from '@aztec/foundation/string';
 
 export type ViemZkPassportProofParams = {
+  version: `0x${string}`;
   proofVerificationData: {
     vkeyHash: `0x${string}`;
     proof: `0x${string}`;
     publicInputs: `0x${string}`[];
   };
-  commitments: {
-    committedInputs: `0x${string}`;
-  };
+  committedInputs: `0x${string}`;
   serviceConfig: {
     validityPeriodInSeconds: bigint;
     domain: string;
@@ -91,7 +90,7 @@ export class ZkPassportProofParams {
       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'),
+      Buffer.from(withoutHexPrefix(params.committedInputs), 'hex'),
       params.serviceConfig.validityPeriodInSeconds,
       params.serviceConfig.domain,
       params.serviceConfig.scope,
@@ -99,20 +98,20 @@ export class ZkPassportProofParams {
   }
 
   toViem(): ViemZkPassportProofParams {
+    // Version is set to bytes32(0) as per zkpassport library convention
     return {
-      serviceConfig: {
-        devMode: this.devMode,
-        validityPeriodInSeconds: this.validityPeriodInSeconds,
-        domain: this.domain,
-        scope: this.scope,
-      },
+      version: '0x0000000000000000000000000000000000000000000000000000000000000000',
       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')}`,
+      committedInputs: `0x${this.committedInputs.toString('hex')}`,
+      serviceConfig: {
+        devMode: this.devMode,
+        validityPeriodInSeconds: this.validityPeriodInSeconds,
+        domain: this.domain,
+        scope: this.scope,
       },
     };
   }

package/dest/block/l2_block_code_to_purge.d.ts

@@ -1,11 +0,0 @@
-import type { FieldsOf } from '@aztec/foundation/types';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { L2BlockHeader } from './l2_block_header.js';
-export declare function makeL2BlockHeader(seed?: number, blockNumber?: number, slotNumber?: number, overrides?: Partial<FieldsOf<L2BlockHeader>>): L2BlockHeader;
-/**
- * Makes arbitrary append only tree snapshot.
- * @param seed - The seed to use for generating the append only tree snapshot.
- * @returns An append only tree snapshot.
- */
-export declare function makeAppendOnlyTreeSnapshot(seed?: number): AppendOnlyTreeSnapshot;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfY29kZV90b19wdXJnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2NvZGVfdG9fcHVyZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJeEQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJL0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXJELHdCQUFnQixpQkFBaUIsQ0FDL0IsSUFBSSxTQUFJLEVBQ1IsV0FBVyxDQUFDLEVBQUUsTUFBTSxFQUNwQixVQUFVLENBQUMsRUFBRSxNQUFNLEVBQ25CLFNBQVMsR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFNLGlCQWdCakQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLDBCQUEwQixDQUFDLElBQUksU0FBSSxHQUFHLHNCQUFzQixDQUUzRSJ9

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_code_to_purge.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_code_to_purge.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAI/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,wBAAgB,iBAAiB,CAC/B,IAAI,SAAI,EACR,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM,iBAgBjD;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E"}

package/dest/block/l2_block_code_to_purge.js

@@ -1,55 +0,0 @@
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { compact } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { AztecAddress } from '../aztec-address/index.js';
-import { GasFees } from '../gas/gas_fees.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-import { PartialStateReference } from '../tx/partial_state_reference.js';
-import { StateReference } from '../tx/state_reference.js';
-import { L2BlockHeader } from './l2_block_header.js';
-export function makeL2BlockHeader(seed = 0, blockNumber, slotNumber, overrides = {}) {
-    return new L2BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), overrides.blobsHash ?? new Fr(seed + 0x200), overrides.inHash ?? new Fr(seed + 0x300), overrides.state ?? makeStateReference(seed + 0x600), makeGlobalVariables(seed += 0x700, {
-        ...blockNumber ? {
-            blockNumber: BlockNumber(blockNumber)
-        } : {},
-        ...slotNumber ? {
-            slotNumber: SlotNumber(slotNumber)
-        } : {}
-    }), new Fr(seed + 0x300), new Fr(seed + 0x800), new Fr(seed + 0x900), new Fr(seed + 0xa00));
-}
-/**
- * Makes arbitrary append only tree snapshot.
- * @param seed - The seed to use for generating the append only tree snapshot.
- * @returns An append only tree snapshot.
- */ export function makeAppendOnlyTreeSnapshot(seed = 1) {
-    return new AppendOnlyTreeSnapshot(new Fr(seed), seed);
-}
-/**
- * Makes arbitrary state reference.
- * @param seed - The seed to use for generating the state reference.
- * @returns A state reference.
- */ function makeStateReference(seed = 0) {
-    return new StateReference(makeAppendOnlyTreeSnapshot(seed), makePartialStateReference(seed + 1));
-}
-/**
- * Makes arbitrary partial state reference.
- * @param seed - The seed to use for generating the partial state reference.
- * @returns A partial state reference.
- */ function makePartialStateReference(seed = 0) {
-    return new PartialStateReference(makeAppendOnlyTreeSnapshot(seed), makeAppendOnlyTreeSnapshot(seed + 1), makeAppendOnlyTreeSnapshot(seed + 2));
-}
-function makeGlobalVariables(seed = 1, overrides = {}) {
-    return GlobalVariables.from({
-        chainId: new Fr(seed),
-        version: new Fr(seed + 1),
-        blockNumber: BlockNumber(seed + 2),
-        slotNumber: SlotNumber(seed + 3),
-        timestamp: BigInt(seed + 4),
-        coinbase: EthAddress.fromField(new Fr(seed + 5)),
-        feeRecipient: AztecAddress.fromField(new Fr(seed + 6)),
-        gasFees: new GasFees(seed + 7, seed + 8),
-        ...compact(overrides)
-    });
-}

package/dest/block/l2_block_header.d.ts

@@ -1,94 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { type ZodFor } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { inspect } from 'util';
-import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader, GlobalVariables, StateReference } from '../tx/index.js';
-/**
- * TO BE DELETED
- *
- * A header of an L2 block combining the block header and the checkpoint header.
- * This is a temporary workaround to avoid changing too many things before building in chunks is properly implemented.
- * This works for now because we only have one block per checkpoint.
- *
- * @deprecated Use BlockHeader or CheckpointHeader instead.
- */
-export declare class L2BlockHeader {
-    lastArchive: AppendOnlyTreeSnapshot;
-    blobsHash: Fr;
-    inHash: Fr;
-    state: StateReference;
-    globalVariables: GlobalVariables;
-    totalFees: Fr;
-    totalManaUsed: Fr;
-    spongeBlobHash: Fr;
-    blockHeadersHash: Fr;
-    constructor(
-    /** Snapshot of archive before the block is applied. */
-    lastArchive: AppendOnlyTreeSnapshot, blobsHash: Fr, inHash: Fr, 
-    /** State reference. */
-    state: StateReference, 
-    /** Global variables of an L2 block. */
-    globalVariables: GlobalVariables, 
-    /** Total fees in the block, computed by the root rollup circuit */
-    totalFees: Fr, 
-    /** Total mana used in the block, computed by the root rollup circuit */
-    totalManaUsed: Fr, 
-    /** Hash of the sponge blob of the block. */
-    spongeBlobHash: Fr, 
-    /** Hash of the block headers in the checkpoint. */
-    blockHeadersHash: Fr);
-    static get schema(): ZodFor<L2BlockHeader>;
-    static getFields(fields: FieldsOf<L2BlockHeader>): readonly [AppendOnlyTreeSnapshot, Fr, Fr, StateReference, GlobalVariables, Fr, Fr, Fr, Fr];
-    static from(fields: FieldsOf<L2BlockHeader>): L2BlockHeader;
-    getSlot(): SlotNumber;
-    getBlockNumber(): import("@aztec/foundation/branded-types").BlockNumber;
-    getSize(): number;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    toFields(): Fr[];
-    clone(): L2BlockHeader;
-    static fromBuffer(buffer: Buffer | BufferReader): L2BlockHeader;
-    static fromFields(fields: Fr[] | FieldReader): L2BlockHeader;
-    static empty(fields?: Partial<FieldsOf<L2BlockHeader>>): L2BlockHeader;
-    isEmpty(): boolean;
-    /**
-     * Serializes this instance into a string.
-     * @returns Encoded string.
-     */
-    toString(): `0x${string}`;
-    static fromString(str: string): L2BlockHeader;
-    toCheckpointHeader(): CheckpointHeader;
-    toBlockHeader(): BlockHeader;
-    toInspect(): {
-        lastArchive: `0x${string}`;
-        blobsHash: `0x${string}`;
-        inHash: `0x${string}`;
-        state: {
-            l1ToL2MessageTree: `0x${string}`;
-            noteHashTree: `0x${string}`;
-            nullifierTree: `0x${string}`;
-            publicDataTree: `0x${string}`;
-        };
-        globalVariables: {
-            chainId: number;
-            version: number;
-            blockNumber: import("@aztec/foundation/branded-types").BlockNumber;
-            slotNumber: SlotNumber;
-            timestamp: bigint;
-            coinbase: `0x${string}`;
-            feeRecipient: `0x${string}`;
-            feePerDaGas: number;
-            feePerL2Gas: number;
-        };
-        totalFees: bigint;
-        totalManaUsed: bigint;
-        spongeBlobHash: `0x${string}`;
-        blockHeadersHash: `0x${string}`;
-    };
-    [inspect.custom](): string;
-    equals(other: this): boolean;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaGVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfaGVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU5RTs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLGFBQWE7SUFHZixXQUFXLEVBQUUsc0JBQXNCO0lBQ25DLFNBQVMsRUFBRSxFQUFFO0lBQ2IsTUFBTSxFQUFFLEVBQUU7SUFFVixLQUFLLEVBQUUsY0FBYztJQUVyQixlQUFlLEVBQUUsZUFBZTtJQUVoQyxTQUFTLEVBQUUsRUFBRTtJQUViLGFBQWEsRUFBRSxFQUFFO0lBRWpCLGNBQWMsRUFBRSxFQUFFO0lBRWxCLGdCQUFnQixFQUFFLEVBQUU7SUFoQjdCO0lBQ0UsdURBQXVEO0lBQ2hELFdBQVcsRUFBRSxzQkFBc0IsRUFDbkMsU0FBUyxFQUFFLEVBQUUsRUFDYixNQUFNLEVBQUUsRUFBRTtJQUNqQix1QkFBdUI7SUFDaEIsS0FBSyxFQUFFLGNBQWM7SUFDNUIsdUNBQXVDO0lBQ2hDLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLG1FQUFtRTtJQUM1RCxTQUFTLEVBQUUsRUFBRTtJQUNwQix3RUFBd0U7SUFDakUsYUFBYSxFQUFFLEVBQUU7SUFDeEIsNENBQTRDO0lBQ3JDLGNBQWMsRUFBRSxFQUFFO0lBQ3pCLG1EQUFtRDtJQUM1QyxnQkFBZ0IsRUFBRSxFQUFFLEVBQ3pCO0lBRUosTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLENBY3pDO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGFBQWEsQ0FBQyw4RkFZL0M7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLGlCQUUxQztJQUVELE9BQU8sSUFBSSxVQUFVLENBRXBCO0lBRUQsY0FBYywwREFFYjtJQUVELE9BQU8sV0FZTjtJQUVELFFBQVEsNEJBRVA7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxLQUFLLGtCQUVKO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksaUJBYzlDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxpQkFjM0M7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFNLGlCQWF6RDtJQUVELE9BQU8sSUFBSSxPQUFPLENBWWpCO0lBRUQ7OztPQUdHO0lBQ0ksUUFBUSxrQkFFZDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0saUJBRTVCO0lBRUQsa0JBQWtCLHFCQWFqQjtJQUVELGFBQWEsZ0JBU1o7SUFFRCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BWVI7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FlZjtJQUVNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FZbEM7Q0FDRiJ9

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_header.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE9E;;;;;;;;GAQG;AACH,qBAAa,aAAa;IAGf,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;IAEV,KAAK,EAAE,cAAc;IAErB,eAAe,EAAE,eAAe;IAEhC,SAAS,EAAE,EAAE;IAEb,aAAa,EAAE,EAAE;IAEjB,cAAc,EAAE,EAAE;IAElB,gBAAgB,EAAE,EAAE;IAhB7B;IACE,uDAAuD;IAChD,WAAW,EAAE,sBAAsB,EACnC,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,EAAE;IACjB,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IACxB,4CAA4C;IACrC,cAAc,EAAE,EAAE;IACzB,mDAAmD;IAC5C,gBAAgB,EAAE,EAAE,EACzB;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,CAczC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,8FAY/C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,iBAE1C;IAED,OAAO,IAAI,UAAU,CAEpB;IAED,cAAc,0DAEb;IAED,OAAO,WAYN;IAED,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,KAAK,kBAEJ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAc9C;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,iBAc3C;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM,iBAazD;IAED,OAAO,IAAI,OAAO,CAYjB;IAED;;;OAGG;IACI,QAAQ,kBAEd;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,iBAE5B;IAED,kBAAkB,qBAajB;IAED,aAAa,gBASZ;IAED,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;MAYR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAef;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAYlC;CACF"}

package/dest/block/l2_block_header.js

@@ -1,160 +0,0 @@
-var _computedKey;
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { inspect } from 'util';
-import { z } from 'zod';
-import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader, GlobalVariables, StateReference } from '../tx/index.js';
-_computedKey = inspect.custom;
-/**
- * TO BE DELETED
- *
- * A header of an L2 block combining the block header and the checkpoint header.
- * This is a temporary workaround to avoid changing too many things before building in chunks is properly implemented.
- * This works for now because we only have one block per checkpoint.
- *
- * @deprecated Use BlockHeader or CheckpointHeader instead.
- */ export class L2BlockHeader {
-    lastArchive;
-    blobsHash;
-    inHash;
-    state;
-    globalVariables;
-    totalFees;
-    totalManaUsed;
-    spongeBlobHash;
-    blockHeadersHash;
-    constructor(/** Snapshot of archive before the block is applied. */ lastArchive, blobsHash, inHash, /** State reference. */ state, /** Global variables of an L2 block. */ globalVariables, /** Total fees in the block, computed by the root rollup circuit */ totalFees, /** Total mana used in the block, computed by the root rollup circuit */ totalManaUsed, /** Hash of the sponge blob of the block. */ spongeBlobHash, /** Hash of the block headers in the checkpoint. */ blockHeadersHash){
-        this.lastArchive = lastArchive;
-        this.blobsHash = blobsHash;
-        this.inHash = inHash;
-        this.state = state;
-        this.globalVariables = globalVariables;
-        this.totalFees = totalFees;
-        this.totalManaUsed = totalManaUsed;
-        this.spongeBlobHash = spongeBlobHash;
-        this.blockHeadersHash = blockHeadersHash;
-    }
-    static get schema() {
-        return z.object({
-            lastArchive: AppendOnlyTreeSnapshot.schema,
-            blobsHash: schemas.Fr,
-            inHash: schemas.Fr,
-            state: StateReference.schema,
-            globalVariables: GlobalVariables.schema,
-            totalFees: schemas.Fr,
-            totalManaUsed: schemas.Fr,
-            spongeBlobHash: schemas.Fr,
-            blockHeadersHash: schemas.Fr
-        }).transform(L2BlockHeader.from);
-    }
-    static getFields(fields) {
-        return [
-            fields.lastArchive,
-            fields.blobsHash,
-            fields.inHash,
-            fields.state,
-            fields.globalVariables,
-            fields.totalFees,
-            fields.totalManaUsed,
-            fields.spongeBlobHash,
-            fields.blockHeadersHash
-        ];
-    }
-    static from(fields) {
-        return new L2BlockHeader(...L2BlockHeader.getFields(fields));
-    }
-    getSlot() {
-        return this.globalVariables.slotNumber;
-    }
-    getBlockNumber() {
-        return this.globalVariables.blockNumber;
-    }
-    getSize() {
-        return this.lastArchive.getSize() + this.blobsHash.size + this.inHash.size + this.state.getSize() + this.globalVariables.getSize() + this.totalFees.size + this.totalManaUsed.size + this.spongeBlobHash.size + this.blockHeadersHash.size;
-    }
-    toBuffer() {
-        return serializeToBuffer(...L2BlockHeader.getFields(this));
-    }
-    toFields() {
-        return serializeToFields(...L2BlockHeader.getFields(this));
-    }
-    clone() {
-        return L2BlockHeader.fromBuffer(this.toBuffer());
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new L2BlockHeader(reader.readObject(AppendOnlyTreeSnapshot), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(StateReference), reader.readObject(GlobalVariables), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr));
-    }
-    static fromFields(fields) {
-        const reader = FieldReader.asReader(fields);
-        return new L2BlockHeader(AppendOnlyTreeSnapshot.fromFields(reader), reader.readField(), reader.readField(), StateReference.fromFields(reader), GlobalVariables.fromFields(reader), reader.readField(), reader.readField(), reader.readField(), reader.readField());
-    }
-    static empty(fields = {}) {
-        return L2BlockHeader.from({
-            lastArchive: AppendOnlyTreeSnapshot.empty(),
-            blobsHash: Fr.ZERO,
-            inHash: Fr.ZERO,
-            state: StateReference.empty(),
-            globalVariables: GlobalVariables.empty(),
-            totalFees: Fr.ZERO,
-            totalManaUsed: Fr.ZERO,
-            spongeBlobHash: Fr.ZERO,
-            blockHeadersHash: Fr.ZERO,
-            ...fields
-        });
-    }
-    isEmpty() {
-        return this.lastArchive.isEmpty() && this.blobsHash.isZero() && this.inHash.isZero() && this.state.isEmpty() && this.globalVariables.isEmpty() && this.totalFees.isZero() && this.totalManaUsed.isZero() && this.spongeBlobHash.isZero() && this.blockHeadersHash.isZero();
-    }
-    /**
-   * Serializes this instance into a string.
-   * @returns Encoded string.
-   */ toString() {
-        return bufferToHex(this.toBuffer());
-    }
-    static fromString(str) {
-        return L2BlockHeader.fromBuffer(hexToBuffer(str));
-    }
-    toCheckpointHeader() {
-        return new CheckpointHeader(this.lastArchive.root, this.blockHeadersHash, this.blobsHash, this.inHash, this.globalVariables.slotNumber, this.globalVariables.timestamp, this.globalVariables.coinbase, this.globalVariables.feeRecipient, this.globalVariables.gasFees, this.totalManaUsed);
-    }
-    toBlockHeader() {
-        return new BlockHeader(this.lastArchive, this.state, this.spongeBlobHash, this.globalVariables, this.totalFees, this.totalManaUsed);
-    }
-    toInspect() {
-        return {
-            lastArchive: this.lastArchive.root.toString(),
-            blobsHash: this.blobsHash.toString(),
-            inHash: this.inHash.toString(),
-            state: this.state.toInspect(),
-            globalVariables: this.globalVariables.toInspect(),
-            totalFees: this.totalFees.toBigInt(),
-            totalManaUsed: this.totalManaUsed.toBigInt(),
-            spongeBlobHash: this.spongeBlobHash.toString(),
-            blockHeadersHash: this.blockHeadersHash.toString()
-        };
-    }
-    [_computedKey]() {
-        return `L2BlockHeader {
-  lastArchive: ${inspect(this.lastArchive)},
-  blobsHash: ${inspect(this.blobsHash)},
-  inHash: ${inspect(this.inHash)},
-  state.l1ToL2MessageTree: ${inspect(this.state.l1ToL2MessageTree)},
-  state.noteHashTree: ${inspect(this.state.partial.noteHashTree)},
-  state.nullifierTree: ${inspect(this.state.partial.nullifierTree)},
-  state.publicDataTree: ${inspect(this.state.partial.publicDataTree)},
-  globalVariables: ${inspect(this.globalVariables)},
-  totalFees: ${this.totalFees},
-  totalManaUsed: ${this.totalManaUsed},
-  spongeBlobHash: ${this.spongeBlobHash},
-  blockHeadersHash: ${this.blockHeadersHash},
-}`;
-    }
-    equals(other) {
-        return this.lastArchive.equals(other.lastArchive) && this.blobsHash.equals(other.blobsHash) && this.inHash.equals(other.inHash) && this.state.equals(other.state) && this.globalVariables.equals(other.globalVariables) && this.totalFees.equals(other.totalFees) && this.totalManaUsed.equals(other.totalManaUsed) && this.spongeBlobHash.equals(other.spongeBlobHash) && this.blockHeadersHash.equals(other.blockHeadersHash);
-    }
-}

package/dest/block/l2_block_new.d.ts

@@ -1,134 +0,0 @@
-import { type BlockBlobData } from '@aztec/blob-lib/encoding';
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { z } from 'zod';
-import type { PrivateLog } from '../logs/private_log.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
-import { Body } from './body.js';
-import type { L2BlockInfo } from './l2_block_info.js';
-/**
- * An L2 block with a header and a body.
- */
-export declare class L2BlockNew {
-    archive: AppendOnlyTreeSnapshot;
-    header: BlockHeader;
-    body: Body;
-    checkpointNumber: CheckpointNumber;
-    indexWithinCheckpoint: number;
-    constructor(
-    /** Snapshot of archive tree after the block is applied. */
-    archive: AppendOnlyTreeSnapshot, 
-    /** Header of the block. */
-    header: BlockHeader, 
-    /** L2 block body. */
-    body: Body, 
-    /** Number of the checkpoint that the block belongs to. */
-    checkpointNumber: CheckpointNumber, 
-    /** Index of the block within the checkpoint. */
-    indexWithinCheckpoint: number);
-    get number(): BlockNumber;
-    get timestamp(): bigint;
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        archive: z.ZodEffects<z.ZodObject<{
-            root: z.ZodType<Fr, any, string>;
-            nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-        }, "strip", z.ZodTypeAny, {
-            root: Fr;
-            nextAvailableLeafIndex: number;
-        }, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>, AppendOnlyTreeSnapshot, {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        }>;
-        header: import("../schemas/schemas.js").ZodFor<BlockHeader>;
-        body: import("../schemas/schemas.js").ZodFor<Body>;
-        checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
-        indexWithinCheckpoint: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        archive: AppendOnlyTreeSnapshot;
-        header: BlockHeader;
-        body: Body;
-        checkpointNumber: number & {
-            _branding: "CheckpointNumber";
-        };
-        indexWithinCheckpoint: number;
-    }, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        body?: any;
-        checkpointNumber: string | number | bigint;
-        indexWithinCheckpoint: number;
-    }>, L2BlockNew, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        body?: any;
-        checkpointNumber: string | number | bigint;
-        indexWithinCheckpoint: number;
-    }>;
-    /**
-     * Deserializes a block from a buffer
-     * @returns A deserialized L2 block.
-     */
-    static fromBuffer(buf: Buffer | BufferReader): L2BlockNew;
-    /**
-     * Serializes a block
-     * @returns A serialized L2 block as a Buffer.
-     */
-    toBuffer(): Buffer<ArrayBufferLike>;
-    /**
-     * Returns the block's hash (hash of block header).
-     * @returns The block's hash.
-     */
-    hash(): Promise<Fr>;
-    /**
-     * Checks if this block equals another block.
-     * @param other - The other block to compare with.
-     * @returns True if both blocks are equal.
-     */
-    equals(other: this): boolean;
-    toBlobFields(): Fr[];
-    toBlockBlobData(): BlockBlobData;
-    static empty(): L2BlockNew;
-    /**
-     * Creates an L2 block containing random data.
-     * @param l2BlockNum - The number of the L2 block.
-     * @param txsPerBlock - The number of transactions to include in the block.
-     * @param numPublicCallsPerTx - The number of public function calls to include in each transaction.
-     * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
-     * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
-     * @returns The L2 block.
-     */
-    static random(blockNumber: BlockNumber, { checkpointNumber, indexWithinCheckpoint, txsPerBlock, txOptions, makeTxOptions, ...blockHeaderOverrides }?: {
-        checkpointNumber?: CheckpointNumber;
-        indexWithinCheckpoint?: number;
-        txsPerBlock?: number;
-        txOptions?: Partial<Parameters<typeof Body.random>[0]>;
-        makeTxOptions?: (txIndex: number) => Partial<Parameters<typeof Body.random>[0]>;
-    } & Partial<Parameters<typeof BlockHeader.random>[0]>): Promise<L2BlockNew>;
-    /**
-     * Returns stats used for logging.
-     * @returns Stats on tx count, number, and log size and count.
-     */
-    getStats(): {
-        privateLogCount: number;
-        publicLogCount: number;
-        contractClassLogCount: number;
-        contractClassLogSize: number;
-        txCount: number;
-        blockNumber: BlockNumber;
-        blockTimestamp: number;
-    };
-    getPrivateLogs(): PrivateLog[];
-    toBlockInfo(): L2BlockInfo;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUEwQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDekQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFPdEQ7O0dBRUc7QUFDSCxxQkFBYSxVQUFVO0lBR1osT0FBTyxFQUFFLHNCQUFzQjtJQUUvQixNQUFNLEVBQUUsV0FBVztJQUVuQixJQUFJLEVBQUUsSUFBSTtJQUVWLGdCQUFnQixFQUFFLGdCQUFnQjtJQUVsQyxxQkFBcUIsRUFBRSxNQUFNO0lBVnRDO0lBQ0UsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsMkJBQTJCO0lBQ3BCLE1BQU0sRUFBRSxXQUFXO0lBQzFCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJO0lBQ2pCLDBEQUEwRDtJQUNuRCxnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDekMsZ0RBQWdEO0lBQ3pDLHFCQUFxQixFQUFFLE1BQU0sRUFDbEM7SUFFSixJQUFJLE1BQU0sSUFBSSxXQUFXLENBRXhCO0lBRUQsSUFBSSxTQUFTLElBQUksTUFBTSxDQUV0QjtJQUVELE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQWFoQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLGNBUzNDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXpCO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FRbEM7SUFFTSxZQUFZLElBQUksRUFBRSxFQUFFLENBRzFCO0lBRU0sZUFBZSxJQUFJLGFBQWEsQ0FzQnRDO0lBRUQsTUFBTSxDQUFDLEtBQUssZUFFWDtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxNQUFNLENBQ2pCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEVBQ0UsZ0JBQXdELEVBQ3hELHFCQUF5QixFQUN6QixXQUFlLEVBQ2YsU0FBYyxFQUNkLGFBQWEsRUFDYixHQUFHLG9CQUFvQixFQUN4QixHQUFFO1FBQ0QsZ0JBQWdCLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNwQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUMvQixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDckIsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELGFBQWEsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDakYsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFNLEdBQ3pELE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FLckI7SUFFRDs7O09BR0c7SUFDSCxRQUFROzs7Ozs7OztNQXFCUDtJQUVELGNBQWMsSUFBSSxVQUFVLEVBQUUsQ0FFN0I7SUFFRCxXQUFXLElBQUksV0FBVyxDQVN6QjtDQUNGIn0=