@aztec/stdlib 0.0.1-commit.d3ec352c → 0.0.1-commit.f295ac2

package/src/validators/schemas.ts

@@ -1,4 +1,4 @@
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
+import { schemas, zodFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
@@ -11,20 +11,18 @@ import type {
   ValidatorsStats,
 } from './types.js';
 
-export const ValidatorStatusInSlotSchema = z.enum([
-  'block-mined',
-  'block-proposed',
-  'block-missed',
-  'attestation-sent',
-  'attestation-missed',
-]) satisfies ZodFor<ValidatorStatusInSlot>;
+export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
+  z.enum(['block-mined', 'block-proposed', 'block-missed', 'attestation-sent', 'attestation-missed']),
+);
 
-export const ValidatorStatusHistorySchema = z.array(
-  z.object({
-    slot: schemas.SlotNumber,
-    status: ValidatorStatusInSlotSchema,
-  }),
-) satisfies ZodFor<ValidatorStatusHistory>;
+export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(
+  z.array(
+    z.object({
+      slot: schemas.SlotNumber,
+      status: ValidatorStatusInSlotSchema,
+    }),
+  ),
+);
 
 export const ValidatorStatusHistorySchemaArray = z.array(ValidatorStatusHistorySchema);
 
@@ -36,40 +34,48 @@ const ValidatorTimeStatSchema = z.object({
   date: z.string(),
 });
 
-const ValidatorMissedStatsSchema = z.object({
-  currentStreak: schemas.Integer,
-  rate: z.number().optional(),
-  count: schemas.Integer,
-  total: schemas.Integer,
-}) satisfies ZodFor<ValidatorMissedStats>;
+const ValidatorMissedStatsSchema = zodFor<ValidatorMissedStats>()(
+  z.object({
+    currentStreak: schemas.Integer,
+    rate: z.number().optional(),
+    count: schemas.Integer,
+    total: schemas.Integer,
+  }),
+);
 
-export const ValidatorStatsSchema = z.object({
-  address: schemas.EthAddress,
-  lastProposal: ValidatorTimeStatSchema.optional(),
-  lastAttestation: ValidatorTimeStatSchema.optional(),
-  totalSlots: schemas.Integer,
-  missedProposals: ValidatorMissedStatsSchema,
-  missedAttestations: ValidatorMissedStatsSchema,
-  history: ValidatorStatusHistorySchema,
-}) satisfies ZodFor<ValidatorStats>;
+export const ValidatorStatsSchema = zodFor<ValidatorStats>()(
+  z.object({
+    address: schemas.EthAddress,
+    lastProposal: ValidatorTimeStatSchema.optional(),
+    lastAttestation: ValidatorTimeStatSchema.optional(),
+    totalSlots: schemas.Integer,
+    missedProposals: ValidatorMissedStatsSchema,
+    missedAttestations: ValidatorMissedStatsSchema,
+    history: ValidatorStatusHistorySchema,
+  }),
+);
 
-export const ValidatorsStatsSchema = z.object({
-  stats: z.record(ValidatorStatsSchema),
-  lastProcessedSlot: schemas.SlotNumber.optional(),
-  initialSlot: schemas.SlotNumber.optional(),
-  slotWindow: schemas.Integer,
-}) satisfies ZodFor<ValidatorsStats>;
+export const ValidatorsStatsSchema = zodFor<ValidatorsStats>()(
+  z.object({
+    stats: z.record(ValidatorStatsSchema),
+    lastProcessedSlot: schemas.SlotNumber.optional(),
+    initialSlot: schemas.SlotNumber.optional(),
+    slotWindow: schemas.Integer,
+  }),
+);
 
-export const SingleValidatorStatsSchema = z.object({
-  validator: ValidatorStatsSchema,
-  allTimeProvenPerformance: z.array(
-    z.object({
-      missed: schemas.Integer,
-      total: schemas.Integer,
-      epoch: schemas.EpochNumber,
-    }),
-  ),
-  lastProcessedSlot: schemas.SlotNumber.optional(),
-  initialSlot: schemas.SlotNumber.optional(),
-  slotWindow: schemas.Integer,
-}) satisfies ZodFor<SingleValidatorStats>;
+export const SingleValidatorStatsSchema = zodFor<SingleValidatorStats>()(
+  z.object({
+    validator: ValidatorStatsSchema,
+    allTimeProvenPerformance: z.array(
+      z.object({
+        missed: schemas.Integer,
+        total: schemas.Integer,
+        epoch: schemas.EpochNumber,
+      }),
+    ),
+    lastProcessedSlot: schemas.SlotNumber.optional(),
+    initialSlot: schemas.SlotNumber.optional(),
+    slotWindow: schemas.Integer,
+  }),
+);

package/src/versioning/versioning.ts

@@ -1,5 +1,5 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 
 import type Koa from 'koa';

package/src/vks/verification_key.ts

@@ -1,7 +1,7 @@
 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';
+import { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';

package/src/vks/vk_data.ts

@@ -1,6 +1,6 @@
 import { VK_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex } from '@aztec/foundation/string';
 

package/src/zkpassport/index.ts

@@ -1,18 +1,17 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { randomBytes } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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.d.ts

@@ -1,143 +0,0 @@
-import { type BlockBlobData } from '@aztec/blob-lib/encoding';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { z } from 'zod';
-import { Checkpoint } from '../checkpoint/checkpoint.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import type { BlockHeader } from '../tx/block_header.js';
-import { Body } from './body.js';
-import { L2BlockHeader } from './l2_block_header.js';
-import type { L2BlockInfo } from './l2_block_info.js';
-import { L2BlockNew } from './l2_block_new.js';
-/**
- * The data that makes up the rollup proof, with encoder decoder functions.
- *
- * @deprecated Use `L2BlockNew` instead.
- */
-export declare class L2Block {
-    archive: AppendOnlyTreeSnapshot;
-    header: L2BlockHeader;
-    body: Body;
-    private blockHash;
-    constructor(
-    /** Snapshot of archive tree after the block is applied. */
-    archive: AppendOnlyTreeSnapshot, 
-    /** L2 block header. */
-    header: L2BlockHeader, 
-    /** L2 block body. */
-    body: Body, blockHash?: Fr | undefined);
-    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<L2BlockHeader>;
-        body: import("../schemas/schemas.js").ZodFor<Body>;
-    }, "strip", z.ZodTypeAny, {
-        archive: AppendOnlyTreeSnapshot;
-        header: L2BlockHeader;
-        body: Body;
-    }, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        body?: any;
-    }>, L2Block, {
-        archive: {
-            root: string;
-            nextAvailableLeafIndex: string | number | bigint;
-        };
-        header?: any;
-        body?: any;
-    }>;
-    /**
-     * Deserializes a block from a buffer
-     * @returns A deserialized L2 block.
-     */
-    static fromBuffer(buf: Buffer | BufferReader): L2Block;
-    /**
-     * Serializes a block
-     * @returns A serialized L2 block as a Buffer.
-     */
-    toBuffer(): Buffer<ArrayBufferLike>;
-    /**
-     * Deserializes L2 block from a buffer.
-     * @param str - A serialized L2 block.
-     * @returns Deserialized L2 block.
-     */
-    static fromString(str: string): L2Block;
-    /**
-     * Serializes a block to a string.
-     * @returns A serialized L2 block as a string.
-     */
-    toString(): string;
-    /**
-     * 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(l2BlockNum: BlockNumber, txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, inHash?: Fr | undefined, slotNumber?: number | undefined, maxEffects?: number | undefined): Promise<L2Block>;
-    /**
-     * Creates an L2 block containing empty data.
-     * @returns The L2 block.
-     */
-    static empty(): L2Block;
-    get number(): BlockNumber;
-    get slot(): SlotNumber;
-    get timestamp(): bigint;
-    /**
-     * Returns the block's hash (hash of block header).
-     * @returns The block's hash.
-     */
-    hash(): Promise<Fr>;
-    /**
-     * @deprecated
-     * This only works when there's one block per checkpoint.
-     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
-     */
-    getCheckpointHeader(): import("../rollup/checkpoint_header.js").CheckpointHeader;
-    getBlockHeader(): BlockHeader;
-    toL2Block(): L2BlockNew;
-    toCheckpoint(): Checkpoint;
-    static fromCheckpoint(checkpoint: Checkpoint): L2Block;
-    /**
-     * @deprecated
-     * This only works when there's one block per checkpoint.
-     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
-     */
-    getCheckpointBlobFields(): Fr[];
-    toBlobFields(isFirstBlock: boolean): Fr[];
-    toBlockBlobData(isFirstBlock: boolean): BlockBlobData;
-    /**
-     * 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;
-    };
-    toBlockInfo(): L2BlockInfo;
-    equals(other: L2Block): boolean;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9sMl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQTJELE1BQU0sMEJBQTBCLENBQUM7QUFDdkgsT0FBTyxFQUFFLFdBQVcsRUFBb0IsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFHOUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDekQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVqQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRS9DOzs7O0dBSUc7QUFDSCxxQkFBYSxPQUFPO0lBR1QsT0FBTyxFQUFFLHNCQUFzQjtJQUUvQixNQUFNLEVBQUUsYUFBYTtJQUVyQixJQUFJLEVBQUUsSUFBSTtJQUNqQixPQUFPLENBQUMsU0FBUztJQVBuQjtJQUNFLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLHVCQUF1QjtJQUNoQixNQUFNLEVBQUUsYUFBYTtJQUM1QixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSSxFQUNULFNBQVMsR0FBRSxFQUFFLEdBQUcsU0FBcUIsRUFDM0M7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVFoQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLFdBTzNDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUV0QztJQUVEOzs7T0FHRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFhLE1BQU0sQ0FDakIsVUFBVSxFQUFFLFdBQVcsRUFDdkIsV0FBVyxTQUFJLEVBQ2YsbUJBQW1CLFNBQUksRUFDdkIsb0JBQW9CLFNBQUksRUFDeEIsTUFBTSxHQUFFLEVBQUUsR0FBRyxTQUFxQixFQUNsQyxVQUFVLEdBQUUsTUFBTSxHQUFHLFNBQXFCLEVBQzFDLFVBQVUsR0FBRSxNQUFNLEdBQUcsU0FBcUIsR0FDekMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVFsQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxLQUFLLElBQUksT0FBTyxDQUV0QjtJQUVELElBQUksTUFBTSxJQUFJLFdBQVcsQ0FFeEI7SUFFRCxJQUFJLElBQUksSUFBSSxVQUFVLENBRXJCO0lBRUQsSUFBSSxTQUFTLElBQUksTUFBTSxDQUV0QjtJQUVEOzs7T0FHRztJQUNVLElBQUksSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBSy9CO0lBRUQ7Ozs7T0FJRztJQUNJLG1CQUFtQiw4REFFekI7SUFHTSxjQUFjLElBQUksV0FBVyxDQUVuQztJQUVNLFNBQVMsZUFFZjtJQUVNLFlBQVksZUFPbEI7SUFFRCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLFdBYzNDO0lBRUQ7Ozs7T0FJRztJQUNJLHVCQUF1QixTQUc3QjtJQUVNLFlBQVksQ0FBQyxZQUFZLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxDQUcvQztJQUVNLGVBQWUsQ0FBQyxZQUFZLEVBQUUsT0FBTyxHQUFHLGFBQWEsQ0FxQjNEO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxXQUFXLElBQUksV0FBVyxDQVV6QjtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsT0FBTyxXQUVwQjtDQUNGIn0=

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA2D,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,WAAW,EAAoB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;GAIG;AACH,qBAAa,OAAO;IAGT,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,aAAa;IAErB,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;IAPnB;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB,EAC3C;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,WAO3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEtC;IAED;;;OAGG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,UAAU,EAAE,WAAW,EACvB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,EAAE,GAAG,SAAqB,EAClC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC,CAQlB;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO,CAEtB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAK/B;IAED;;;;OAIG;IACI,mBAAmB,8DAEzB;IAGM,cAAc,IAAI,WAAW,CAEnC;IAEM,SAAS,eAEf;IAEM,YAAY,eAOlB;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,WAc3C;IAED;;;;OAIG;IACI,uBAAuB,SAG7B;IAEM,YAAY,CAAC,YAAY,EAAE,OAAO,GAAG,EAAE,EAAE,CAG/C;IAEM,eAAe,CAAC,YAAY,EAAE,OAAO,GAAG,aAAa,CAqB3D;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,WAAW,IAAI,WAAW,CAUzB;IAED,MAAM,CAAC,KAAK,EAAE,OAAO,WAEpB;CACF"}

package/dest/block/l2_block.js

@@ -1,196 +0,0 @@
-import { encodeBlockBlobData, encodeCheckpointBlobDataFromBlocks } from '@aztec/blob-lib/encoding';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { z } from 'zod';
-import { Checkpoint } from '../checkpoint/checkpoint.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { Body } from './body.js';
-import { makeAppendOnlyTreeSnapshot, makeL2BlockHeader } from './l2_block_code_to_purge.js';
-import { L2BlockHeader } from './l2_block_header.js';
-import { L2BlockNew } from './l2_block_new.js';
-/**
- * The data that makes up the rollup proof, with encoder decoder functions.
- *
- * @deprecated Use `L2BlockNew` instead.
- */ export class L2Block {
-    archive;
-    header;
-    body;
-    blockHash;
-    constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** L2 block header. */ header, /** L2 block body. */ body, blockHash = undefined){
-        this.archive = archive;
-        this.header = header;
-        this.body = body;
-        this.blockHash = blockHash;
-    }
-    static get schema() {
-        return z.object({
-            archive: AppendOnlyTreeSnapshot.schema,
-            header: L2BlockHeader.schema,
-            body: Body.schema
-        }).transform(({ archive, header, body })=>new L2Block(archive, header, body));
-    }
-    /**
-   * Deserializes a block from a buffer
-   * @returns A deserialized L2 block.
-   */ static fromBuffer(buf) {
-        const reader = BufferReader.asReader(buf);
-        const header = reader.readObject(L2BlockHeader);
-        const archive = reader.readObject(AppendOnlyTreeSnapshot);
-        const body = reader.readObject(Body);
-        return new L2Block(archive, header, body);
-    }
-    /**
-   * Serializes a block
-   * @returns A serialized L2 block as a Buffer.
-   */ toBuffer() {
-        return serializeToBuffer(this.header, this.archive, this.body);
-    }
-    /**
-   * Deserializes L2 block from a buffer.
-   * @param str - A serialized L2 block.
-   * @returns Deserialized L2 block.
-   */ static fromString(str) {
-        return L2Block.fromBuffer(hexToBuffer(str));
-    }
-    /**
-   * Serializes a block to a string.
-   * @returns A serialized L2 block as a string.
-   */ toString() {
-        return bufferToHex(this.toBuffer());
-    }
-    /**
-   * 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 async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined, maxEffects = undefined) {
-        const body = await Body.random({
-            txsPerBlock,
-            numPublicCallsPerTx,
-            numPublicLogsPerCall,
-            maxEffects
-        });
-        return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, {}, inHash), body);
-    }
-    /**
-   * Creates an L2 block containing empty data.
-   * @returns The L2 block.
-   */ static empty() {
-        return new L2Block(AppendOnlyTreeSnapshot.empty(), L2BlockHeader.empty(), Body.empty());
-    }
-    get number() {
-        return this.header.getBlockNumber();
-    }
-    get slot() {
-        return this.header.getSlot();
-    }
-    get timestamp() {
-        return this.header.globalVariables.timestamp;
-    }
-    /**
-   * Returns the block's hash (hash of block header).
-   * @returns The block's hash.
-   */ async hash() {
-        if (this.blockHash === undefined) {
-            this.blockHash = await this.getBlockHeader().hash();
-        }
-        return this.blockHash;
-    }
-    /**
-   * @deprecated
-   * This only works when there's one block per checkpoint.
-   * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
-   */ getCheckpointHeader() {
-        return this.header.toCheckpointHeader();
-    }
-    // Temporary helper to get the actual block header.
-    getBlockHeader() {
-        return this.header.toBlockHeader();
-    }
-    toL2Block() {
-        return new L2BlockNew(this.archive, this.getBlockHeader(), this.body);
-    }
-    toCheckpoint() {
-        return new Checkpoint(this.archive, this.getCheckpointHeader(), [
-            this.toL2Block()
-        ], CheckpointNumber.fromBlockNumber(this.number));
-    }
-    static fromCheckpoint(checkpoint) {
-        const checkpointHeader = checkpoint.header;
-        const block = checkpoint.blocks.at(-1);
-        const header = new L2BlockHeader(new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, block.number), checkpointHeader.contentCommitment, block.header.state, block.header.globalVariables, block.header.totalFees, checkpointHeader.totalManaUsed, block.header.spongeBlobHash, checkpointHeader.blockHeadersHash);
-        return new L2Block(checkpoint.archive, header, block.body);
-    }
-    /**
-   * @deprecated
-   * This only works when there's one block per checkpoint.
-   * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
-   */ getCheckpointBlobFields() {
-        const blockBlobData = this.toBlockBlobData(true);
-        return encodeCheckpointBlobDataFromBlocks([
-            blockBlobData
-        ]);
-    }
-    toBlobFields(isFirstBlock) {
-        const blockBlobData = this.toBlockBlobData(isFirstBlock);
-        return encodeBlockBlobData(blockBlobData);
-    }
-    toBlockBlobData(isFirstBlock) {
-        return {
-            blockEndMarker: {
-                numTxs: this.body.txEffects.length,
-                timestamp: this.header.globalVariables.timestamp,
-                blockNumber: this.number
-            },
-            blockEndStateField: {
-                l1ToL2MessageNextAvailableLeafIndex: this.header.state.l1ToL2MessageTree.nextAvailableLeafIndex,
-                noteHashNextAvailableLeafIndex: this.header.state.partial.noteHashTree.nextAvailableLeafIndex,
-                nullifierNextAvailableLeafIndex: this.header.state.partial.nullifierTree.nextAvailableLeafIndex,
-                publicDataNextAvailableLeafIndex: this.header.state.partial.publicDataTree.nextAvailableLeafIndex,
-                totalManaUsed: this.header.totalManaUsed.toBigInt()
-            },
-            lastArchiveRoot: this.header.lastArchive.root,
-            noteHashRoot: this.header.state.partial.noteHashTree.root,
-            nullifierRoot: this.header.state.partial.nullifierTree.root,
-            publicDataRoot: this.header.state.partial.publicDataTree.root,
-            l1ToL2MessageRoot: isFirstBlock ? this.header.state.l1ToL2MessageTree.root : undefined,
-            txs: this.body.toTxBlobData()
-        };
-    }
-    /**
-   * Returns stats used for logging.
-   * @returns Stats on tx count, number, and log size and count.
-   */ getStats() {
-        const logsStats = {
-            privateLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.privateLogs.length, 0),
-            publicLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.publicLogs.length, 0),
-            contractClassLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.contractClassLogs.length, 0),
-            contractClassLogSize: this.body.txEffects.reduce((totalLogSize, txEffect)=>totalLogSize + txEffect.contractClassLogs.reduce((acc, log)=>acc + log.emittedLength, 0), 0)
-        };
-        return {
-            txCount: this.body.txEffects.length,
-            blockNumber: this.number,
-            blockTimestamp: Number(this.header.globalVariables.timestamp),
-            ...logsStats
-        };
-    }
-    toBlockInfo() {
-        return {
-            blockHash: this.blockHash,
-            archive: this.archive.root,
-            lastArchive: this.header.lastArchive.root,
-            blockNumber: this.number,
-            slotNumber: this.header.getSlot(),
-            txCount: this.body.txEffects.length,
-            timestamp: this.header.globalVariables.timestamp
-        };
-    }
-    equals(other) {
-        return this.archive.equals(other.archive) && this.header.equals(other.header) && this.body.equals(other.body);
-    }
-}

package/dest/block/l2_block_code_to_purge.d.ts

@@ -1,12 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-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>>, inHash?: Fr): 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfY29kZV90b19wdXJnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2NvZGVfdG9fcHVyZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXhELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBSy9FLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVyRCx3QkFBZ0IsaUJBQWlCLENBQy9CLElBQUksU0FBSSxFQUNSLFdBQVcsQ0FBQyxFQUFFLE1BQU0sRUFDcEIsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUNuQixTQUFTLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBTSxFQUNoRCxNQUFNLENBQUMsRUFBRSxFQUFFLGlCQWVaO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQiwwQkFBMEIsQ0FBQyxJQUFJLFNBQUksR0FBRyxzQkFBc0IsQ0FFM0UifQ==

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":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAK/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,EAChD,MAAM,CAAC,EAAE,EAAE,iBAeZ;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E"}

package/dest/block/l2_block_code_to_purge.js

@@ -1,61 +0,0 @@
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { compact } from '@aztec/foundation/collection';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '../aztec-address/index.js';
-import { GasFees } from '../gas/gas_fees.js';
-import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { ContentCommitment } from '../tx/content_commitment.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 = {}, inHash) {
-    return new L2BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash), 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 content commitment
- */ function makeContentCommitment(seed = 0, inHash) {
-    return new ContentCommitment(new Fr(seed + 0x100), inHash ?? new Fr(seed + 0x200), new Fr(seed + 0x300));
-}
-/**
- * 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)
-    });
-}