@aztec/stdlib 4.0.0-nightly.20260119 → 4.0.0-nightly.20260120

package/src/tests/factories.ts

@@ -87,7 +87,6 @@ import {
 import { PublicDataRead } from '../avm/public_data_read.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { L2BlockHeader } from '../block/l2_block_header.js';
 import type { L2Tips } from '../block/l2_block_source.js';
 import {
   type ContractClassPublic,
@@ -911,30 +910,7 @@ export function makeBlockHeader(
   });
 }
 
-export function makeL2BlockHeader(
-  seed = 0,
-  blockNumber?: number,
-  slotNumber?: number,
-  overrides: Partial<FieldsOf<L2BlockHeader>> = {},
-) {
-  return new L2BlockHeader(
-    makeAppendOnlyTreeSnapshot(seed + 0x100),
-    overrides?.blobsHash ?? fr(seed + 0x200),
-    overrides?.inHash ?? fr(seed + 0x300),
-    overrides?.epochOutHash ?? fr(seed + 0x400),
-    overrides?.state ?? makeStateReference(seed + 0x600),
-    makeGlobalVariables((seed += 0x700), {
-      ...(blockNumber !== undefined ? { blockNumber: BlockNumber(blockNumber) } : {}),
-      ...(slotNumber !== undefined ? { slotNumber: SlotNumber(slotNumber) } : {}),
-    }),
-    new Fr(seed + 0x800),
-    new Fr(seed + 0x900),
-    new Fr(seed + 0xa00),
-    new Fr(seed + 0xb00),
-  );
-}
-
-export function makeCheckpointHeader(seed = 0) {
+export function makeCheckpointHeader(seed = 0, overrides: Partial<FieldsOf<CheckpointHeader>> = {}) {
   return CheckpointHeader.from({
     lastArchiveRoot: fr(seed + 0x100),
     blockHeadersHash: fr(seed + 0x150),
@@ -947,6 +923,7 @@ export function makeCheckpointHeader(seed = 0) {
     feeRecipient: makeAztecAddress(seed + 0x600),
     gasFees: makeGasFees(seed + 0x700),
     totalManaUsed: fr(seed + 0x800),
+    ...overrides,
   });
 }
 

package/src/tests/jest.ts

@@ -1,26 +1,26 @@
-import { L2Block } from '../block/l2_block.js';
+import { L2BlockNew } from '../block/l2_block_new.js';
 
 /**
- * Checks if two objects are the same L2Block.
+ * Checks if two objects are the same L2BlockNew.
  *
- * Sometimes we might be comparing two L2Block instances that represent the same block but one of them might not have
+ * Sometimes we might be comparing two L2BlockNew instances that represent the same block but one of them might not have
  * calculated and filled its `blockHash` property (which is computed on demand). This function ensures both objects
- * are really the same L2Block.
+ * are really the same L2BlockNew.
  *
  * @param a - An object
  * @param b - Another object
- * @returns True if both a and b are the same L2Block
+ * @returns True if both a and b are the same L2BlockNew
  */
 export function equalL2Blocks(a: any, b: any) {
-  const aAsL2Block = a && a instanceof L2Block ? a : undefined;
-  const bAsL2Block = b && b instanceof L2Block ? b : undefined;
+  const aAsL2Block = a && a instanceof L2BlockNew ? a : undefined;
+  const bAsL2Block = b && b instanceof L2BlockNew ? b : undefined;
 
   if (aAsL2Block && bAsL2Block) {
-    // we got two L2Block instances, so we can compare them
+    // we got two L2BlockNew instances, so we can compare them
     // use a custom comparator because the blockHash property is lazily computed and one instance might not have it
     return aAsL2Block.toBuffer().equals(bAsL2Block.toBuffer());
   } else if (aAsL2Block || bAsL2Block) {
-    // one value is an L2block and the other isn't. Definitely not equal.
+    // one value is an L2BlockNew and the other isn't. Definitely not equal.
     return false;
   } else {
     // we don't know what they are, tell Jest to keep looking

package/src/tests/mocks.ts

@@ -7,7 +7,7 @@ import {
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
 } from '@aztec/constants';
 import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { padArrayEnd, times } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto/random';
@@ -22,8 +22,7 @@ import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CommitteeAttestation, L2BlockHeader, L2BlockNew, PublishedL2Block } from '../block/index.js';
-import { L2Block } from '../block/l2_block.js';
+import { CheckpointedL2Block, CommitteeAttestation, L2BlockNew } from '../block/index.js';
 import type { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
@@ -76,9 +75,9 @@ import {
   makeAvmCircuitInputs,
   makeAztecAddress,
   makeBlockHeader,
+  makeCheckpointHeader,
   makeGas,
   makeGlobalVariables,
-  makeL2BlockHeader,
   makePrivateToPublicAccumulatedData,
   makePrivateToRollupAccumulatedData,
   makeProtocolContracts,
@@ -429,7 +428,7 @@ export async function mockCheckpointAndMessages(
         blocks?.[i] ??
         (await L2BlockNew.random(blockNumber, {
           checkpointNumber,
-          indexWithinCheckpoint: i,
+          indexWithinCheckpoint: IndexWithinCheckpoint(i),
           txsPerBlock: numTxsPerBlock,
           slotNumber,
           ...options,
@@ -493,7 +492,7 @@ export interface MakeConsensusPayloadOptions {
   signer?: Secp256k1Signer;
   attesterSigner?: Secp256k1Signer;
   proposerSigner?: Secp256k1Signer;
-  header?: L2BlockHeader;
+  header?: CheckpointHeader;
   archive?: Fr;
   txHashes?: TxHash[];
   txs?: Tx[];
@@ -501,8 +500,8 @@ export interface MakeConsensusPayloadOptions {
 
 export interface MakeBlockProposalOptions {
   signer?: Secp256k1Signer;
-  blockHeader?: L2BlockHeader;
-  indexWithinCheckpoint?: number;
+  blockHeader?: BlockHeader;
+  indexWithinCheckpoint?: IndexWithinCheckpoint;
   inHash?: Fr;
   archiveRoot?: Fr;
   txHashes?: TxHash[];
@@ -515,8 +514,8 @@ export interface MakeCheckpointProposalOptions {
   archiveRoot?: Fr;
   /** Options for the lastBlock - if undefined, no lastBlock is included */
   lastBlock?: {
-    blockHeader?: L2BlockHeader;
-    indexWithinCheckpoint?: number;
+    blockHeader?: BlockHeader;
+    indexWithinCheckpoint?: IndexWithinCheckpoint;
     txHashes?: TxHash[];
     txs?: Tx[];
   };
@@ -527,18 +526,18 @@ const makeAndSignConsensusPayload = (
   domainSeparator: SignatureDomainSeparator,
   options?: MakeConsensusPayloadOptions,
 ) => {
-  const header = options?.header ?? makeL2BlockHeader(1);
+  const header = options?.header ?? makeCheckpointHeader(1);
   const { signer = Secp256k1Signer.random(), archive = Fr.random() } = options ?? {};
 
   const payload = ConsensusPayload.fromFields({
-    header: header.toCheckpointHeader(),
+    header,
     archive,
   });
 
   const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
   const signature = signer.sign(hash);
 
-  return { blockNumber: header.globalVariables.blockNumber, payload, signature };
+  return { blockNumber: header.slotNumber, payload, signature };
 };
 
 export const makeAndSignCommitteeAttestationsAndSigners = (
@@ -553,9 +552,8 @@ export const makeAndSignCommitteeAttestationsAndSigners = (
 };
 
 export const makeBlockProposal = (options?: MakeBlockProposalOptions): Promise<BlockProposal> => {
-  const l2BlockHeader = options?.blockHeader ?? makeL2BlockHeader(1);
-  const blockHeader = l2BlockHeader.toBlockHeader();
-  const indexWithinCheckpoint = options?.indexWithinCheckpoint ?? 0;
+  const blockHeader = options?.blockHeader ?? makeBlockHeader(1);
+  const indexWithinCheckpoint = options?.indexWithinCheckpoint ?? IndexWithinCheckpoint(0);
   const inHash = options?.inHash ?? Fr.random();
   const archiveRoot = options?.archiveRoot ?? Fr.random();
   const txHashes = options?.txHashes ?? [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
@@ -574,16 +572,16 @@ export const makeBlockProposal = (options?: MakeBlockProposalOptions): Promise<B
 };
 
 export const makeCheckpointProposal = (options?: MakeCheckpointProposalOptions): Promise<CheckpointProposal> => {
-  const l2BlockHeader = options?.lastBlock?.blockHeader ?? makeL2BlockHeader(1);
-  const checkpointHeader = options?.checkpointHeader ?? l2BlockHeader.toCheckpointHeader();
+  const blockHeader = options?.lastBlock?.blockHeader ?? makeBlockHeader(1);
+  const checkpointHeader = options?.checkpointHeader ?? makeCheckpointHeader(1);
   const archiveRoot = options?.archiveRoot ?? Fr.random();
   const signer = options?.signer ?? Secp256k1Signer.random();
 
   // Build lastBlock info if provided
   const lastBlockInfo = options?.lastBlock
     ? {
-        blockHeader: l2BlockHeader.toBlockHeader(),
-        indexWithinCheckpoint: options.lastBlock.indexWithinCheckpoint ?? 4, // Last block in a 5-block checkpoint
+        blockHeader,
+        indexWithinCheckpoint: options.lastBlock.indexWithinCheckpoint ?? IndexWithinCheckpoint(4), // Last block in a 5-block checkpoint
         txHashes: options.lastBlock.txHashes ?? [0, 1, 2, 3, 4, 5].map(() => TxHash.random()),
         txs: options.lastBlock.txs,
       }
@@ -609,7 +607,7 @@ export type MakeCheckpointAttestationOptions = {
  * Create a checkpoint attestation for testing
  */
 export const makeCheckpointAttestation = (options: MakeCheckpointAttestationOptions = {}): CheckpointAttestation => {
-  const header = options.header ?? makeL2BlockHeader(1).toCheckpointHeader();
+  const header = options.header ?? makeCheckpointHeader(1);
   const archive = options.archive ?? Fr.random();
   const { signer, attesterSigner = signer, proposerSigner = signer } = options;
 
@@ -672,14 +670,21 @@ export const makeCheckpointAttestationFromCheckpoint = (
 };
 
 /**
- * Create a checkpoint attestation from an L2Block
+ * Create a checkpoint attestation from an L2BlockNew
+ * Note: This is a compatibility function for tests. L2BlockNew doesn't have a checkpoint header directly.
  */
 export const makeCheckpointAttestationFromBlock = (
-  block: L2Block,
+  block: L2BlockNew,
   attesterSigner?: Secp256k1Signer,
   proposerSigner?: Secp256k1Signer,
 ): CheckpointAttestation => {
-  const header = block.header.toCheckpointHeader();
+  // For L2BlockNew, we create a minimal checkpoint header for testing purposes
+  const header = CheckpointHeader.empty({
+    lastArchiveRoot: block.header.lastArchive.root,
+    slotNumber: block.slot,
+    timestamp: block.timestamp,
+    blockHeadersHash: Fr.ZERO, // Would need to compute from block header hash
+  });
   const archive = block.archive.root;
 
   return makeCheckpointAttestation({ header, archive, attesterSigner, proposerSigner });
@@ -688,8 +693,8 @@ export const makeCheckpointAttestationFromBlock = (
 export async function randomPublishedL2Block(
   l2BlockNumber: number,
   opts: { signers?: Secp256k1Signer[] } = {},
-): Promise<PublishedL2Block> {
-  const block = await L2Block.random(BlockNumber(l2BlockNumber));
+): Promise<CheckpointedL2Block> {
+  const block = await L2BlockNew.random(BlockNumber(l2BlockNumber));
   const l1 = L1PublishedData.fromFields({
     blockNumber: BigInt(block.number),
     timestamp: block.header.globalVariables.timestamp,
@@ -697,15 +702,17 @@ export async function randomPublishedL2Block(
   });
 
   const signers = opts.signers ?? times(3, () => Secp256k1Signer.random());
+  const checkpoint = await Checkpoint.random(CheckpointNumber(l2BlockNumber), { numBlocks: 0 });
+  checkpoint.blocks = [block];
   const atts = signers.map(signer =>
     makeCheckpointAttestation({
       signer,
       archive: block.archive.root,
-      header: block.header.toCheckpointHeader(),
+      header: checkpoint.header,
     }),
   );
   const attestations = atts.map(
     (attestation, i) => new CommitteeAttestation(signers[i].address, attestation.signature),
   );
-  return new PublishedL2Block(block, l1, attestations);
+  return new CheckpointedL2Block(CheckpointNumber(l2BlockNumber), block, l1, attestations);
 }

package/dest/block/l2_block.d.ts

@@ -1,150 +0,0 @@
-import { type BlockBlobData } from '@aztec/blob-lib/encoding';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
-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 {
-    /** Snapshot of archive tree after the block is applied. */
-    archive: AppendOnlyTreeSnapshot;
-    /** L2 block header. */
-    header: L2BlockHeader;
-    /** L2 block body. */
-    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("@aztec/foundation/schemas").ZodFor<L2BlockHeader>;
-        body: import("@aztec/foundation/schemas").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.
-     * @param header - An optional header to assign to the block
-     * @returns The L2 block.
-     */
-    static empty(header?: L2BlockHeader): 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(args?: {
-        checkpointNumber?: CheckpointNumber;
-        indexWithinCheckpoint?: number;
-    }): 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(): Fr[];
-    toBlockBlobData(): 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9sMl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQTJELE1BQU0sMEJBQTBCLENBQUM7QUFDdkgsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRWpDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFL0M7Ozs7R0FJRztBQUNILHFCQUFhLE9BQU87SUFFaEIsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsdUJBQXVCO0lBQ2hCLE1BQU0sRUFBRSxhQUFhO0lBQzVCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTO0lBUG5CO0lBQ0UsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsdUJBQXVCO0lBQ2hCLE1BQU0sRUFBRSxhQUFhO0lBQzVCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJLEVBQ1QsU0FBUyxHQUFFLEVBQUUsR0FBRyxTQUFxQixFQUMzQztJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksV0FPM0M7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBRXRDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE9BQWEsTUFBTSxDQUNqQixVQUFVLEVBQUUsV0FBVyxFQUN2QixXQUFXLFNBQUksRUFDZixtQkFBbUIsU0FBSSxFQUN2QixvQkFBb0IsU0FBSSxFQUN4QixNQUFNLEdBQUUsRUFBRSxHQUFHLFNBQXFCLEVBQ2xDLFVBQVUsR0FBRSxNQUFNLEdBQUcsU0FBcUIsRUFDMUMsVUFBVSxHQUFFLE1BQU0sR0FBRyxTQUFxQixHQUN6QyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUWxCO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FFNUM7SUFFRCxJQUFJLE1BQU0sSUFBSSxXQUFXLENBRXhCO0lBRUQsSUFBSSxJQUFJLElBQUksVUFBVSxDQUVyQjtJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FFdEI7SUFFRDs7O09BR0c7SUFDVSxJQUFJLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUsvQjtJQUVEOzs7O09BSUc7SUFDSSxtQkFBbUIsOERBRXpCO0lBR00sY0FBYyxJQUFJLFdBQVcsQ0FFbkM7SUFFTSxTQUFTLENBQUMsSUFBSSxHQUFFO1FBQUUsZ0JBQWdCLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztRQUFDLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQU8sR0FBRyxVQUFVLENBUS9HO0lBRU0sWUFBWSxlQU9sQjtJQUVELE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLFVBQVUsV0FnQjNDO0lBRUQ7Ozs7T0FJRztJQUNJLHVCQUF1QixTQUc3QjtJQUVNLFlBQVksSUFBSSxFQUFFLEVBQUUsQ0FHMUI7SUFFTSxlQUFlLElBQUksYUFBYSxDQXVCdEM7SUFFRDs7O09BR0c7SUFDSCxRQUFROzs7Ozs7OztNQXFCUDtJQUVELFdBQVcsSUFBSSxXQUFXLENBVXpCO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUFPLFdBRXBCO0NBQ0YifQ==

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,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,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;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,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;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAE5C;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,CAAC,IAAI,GAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,UAAU,CAQ/G;IAEM,YAAY,eAOlB;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,WAgB3C;IAED;;;;OAIG;IACI,uBAAuB,SAG7B;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,eAAe,IAAI,aAAa,CAuBtC;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,201 +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.
-   * @param header - An optional header to assign to the block
-   * @returns The L2 block.
-   */ static empty(header) {
-        return new L2Block(AppendOnlyTreeSnapshot.empty(), header ?? 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(args = {}) {
-        return new L2BlockNew(this.archive, this.getBlockHeader(), this.body, args?.checkpointNumber ?? CheckpointNumber.fromBlockNumber(this.number), args?.indexWithinCheckpoint ?? 0);
-    }
-    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.blobsHash, checkpointHeader.inHash, checkpointHeader.epochOutHash, 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();
-        return encodeCheckpointBlobDataFromBlocks([
-            blockBlobData
-        ]);
-    }
-    toBlobFields() {
-        const blockBlobData = this.toBlockBlobData();
-        return encodeBlockBlobData(blockBlobData);
-    }
-    toBlockBlobData() {
-        // There's only one L2Block per checkpoint, so it's always the first block in the checkpoint.
-        const isFirstBlock = true;
-        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,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfY29kZV90b19wdXJnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2NvZGVfdG9fcHVyZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJeEQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJL0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXJELHdCQUFnQixpQkFBaUIsQ0FDL0IsSUFBSSxTQUFJLEVBQ1IsV0FBVyxDQUFDLEVBQUUsTUFBTSxFQUNwQixVQUFVLENBQUMsRUFBRSxNQUFNLEVBQ25CLFNBQVMsR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFNLGlCQWlCakQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLDBCQUEwQixDQUFDLElBQUksU0FBSSxHQUFHLHNCQUFzQixDQUUzRSJ9

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,iBAiBjD;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E"}