@aztec/stdlib 0.0.1-commit.9b94fc1 → 0.0.1-commit.9badcec54

package/dest/update-checker/update-checker.js

@@ -1,130 +0,0 @@
-import { RegistryContract } from '@aztec/ethereum';
-import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
-import { fileURLToPath } from '@aztec/foundation/url';
-import { EventEmitter } from 'events';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { isDeepStrictEqual } from 'util';
-import { z } from 'zod';
-const updateConfigSchema = z.object({
-    version: z.string().optional(),
-    publicTelemetry: z.any().optional(),
-    config: z.any().optional()
-});
-export class UpdateChecker extends EventEmitter {
-    updatesUrl;
-    nodeVersion;
-    rollupVersion;
-    fetch;
-    getLatestRollupVersion;
-    checkIntervalMs;
-    log;
-    runningPromise;
-    lastPatchedConfig;
-    lastPatchedPublicTelemetryConfig;
-    constructor(updatesUrl, nodeVersion, rollupVersion, fetch1, getLatestRollupVersion, checkIntervalMs = 10 * 60_000, log = createLogger('foundation:update-check')){
-        super(), this.updatesUrl = updatesUrl, this.nodeVersion = nodeVersion, this.rollupVersion = rollupVersion, this.fetch = fetch1, this.getLatestRollupVersion = getLatestRollupVersion, this.checkIntervalMs = checkIntervalMs, this.log = log, this.lastPatchedConfig = {}, this.lastPatchedPublicTelemetryConfig = {}, this.runChecks = async ()=>{
-            await Promise.all([
-                this.checkRollupVersion(),
-                this.checkConfig()
-            ]);
-        };
-        this.runningPromise = new RunningPromise(this.runChecks, this.log, this.checkIntervalMs);
-    }
-    static async new(config) {
-        const registryContract = new RegistryContract(config.publicClient, config.registryContractAddress);
-        const getLatestRollupVersion = ()=>registryContract.getRollupVersions().then((versions)=>versions.at(-1));
-        return new UpdateChecker(config.baseURL, config.nodeVersion ?? getPackageVersion(), await getLatestRollupVersion(), config.fetch ?? fetch, getLatestRollupVersion, config.checkIntervalMs);
-    }
-    start() {
-        if (this.runningPromise.isRunning()) {
-            this.log.debug(`Can't start update checker again`);
-            return;
-        }
-        this.log.info('Starting update checker', {
-            nodeVersion: this.nodeVersion,
-            rollupVersion: this.rollupVersion
-        });
-        this.runningPromise.start();
-    }
-    stop() {
-        if (!this.runningPromise.isRunning()) {
-            this.log.debug(`Can't stop update checker because it is not running`);
-            return Promise.resolve();
-        }
-        return this.runningPromise.stop();
-    }
-    trigger() {
-        return this.runningPromise.trigger();
-    }
-    runChecks;
-    async checkRollupVersion() {
-        try {
-            const canonicalRollupVersion = await this.getLatestRollupVersion();
-            if (canonicalRollupVersion !== this.rollupVersion) {
-                this.log.debug('New canonical rollup version', {
-                    currentVersion: this.rollupVersion,
-                    latestVersion: canonicalRollupVersion
-                });
-                this.emit('newRollupVersion', {
-                    currentVersion: this.rollupVersion,
-                    latestVersion: canonicalRollupVersion
-                });
-            }
-        } catch (err) {
-            this.log.warn(`Failed to check if there is a new rollup`, err);
-        }
-    }
-    async checkConfig() {
-        try {
-            const response = await this.fetch(this.updatesUrl);
-            const body = await response.json();
-            if (!response.ok) {
-                this.log.warn(`Unexpected HTTP response checking for updates`, {
-                    status: response.status,
-                    body: await response.text(),
-                    url: this.updatesUrl
-                });
-            }
-            const { version, config, publicTelemetry } = updateConfigSchema.parse(body);
-            if (this.nodeVersion && version && version !== this.nodeVersion) {
-                this.log.debug('New node version', {
-                    currentVersion: this.nodeVersion,
-                    latestVersion: version
-                });
-                this.emit('newNodeVersion', {
-                    currentVersion: this.nodeVersion,
-                    latestVersion: version
-                });
-            }
-            if (config && Object.keys(config).length > 0 && !isDeepStrictEqual(config, this.lastPatchedConfig)) {
-                this.log.debug('New node config', {
-                    config
-                });
-                this.lastPatchedConfig = config;
-                this.emit('updateNodeConfig', config);
-            }
-            if (publicTelemetry && Object.keys(publicTelemetry).length > 0 && !isDeepStrictEqual(publicTelemetry, this.lastPatchedPublicTelemetryConfig)) {
-                this.log.debug('New metrics config', {
-                    config
-                });
-                this.lastPatchedPublicTelemetryConfig = publicTelemetry;
-                this.emit('updatePublicTelemetryConfig', publicTelemetry);
-            }
-        } catch (err) {
-            this.log.warn(`Failed to check if there is an update`, err);
-        }
-    }
-}
-/**
- * Returns package version.
- */ export function getPackageVersion() {
-    try {
-        const releasePleaseManifestPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json');
-        const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString())['.'];
-        return version;
-    } catch  {
-        return undefined;
-    }
-}

package/src/abi/mocked_keys.ts

@@ -1,2 +0,0 @@
-export const mockVerificationKey =
-  '0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f';

package/src/block/l2_block_code_to_purge.ts

@@ -1,88 +0,0 @@
-import { 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 type { FieldsOf } from '@aztec/foundation/types';
-
-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?: number,
-  slotNumber?: number,
-  overrides: Partial<FieldsOf<L2BlockHeader>> = {},
-  inHash?: Fr,
-) {
-  return new L2BlockHeader(
-    makeAppendOnlyTreeSnapshot(seed + 0x100),
-    overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash),
-    overrides?.state ?? makeStateReference(seed + 0x600),
-    makeGlobalVariables((seed += 0x700), {
-      ...(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): AppendOnlyTreeSnapshot {
-  return new AppendOnlyTreeSnapshot(new Fr(seed), seed);
-}
-
-/**
- * Makes content commitment
- */
-function makeContentCommitment(seed = 0, inHash?: Fr): ContentCommitment {
-  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): StateReference {
-  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): PartialStateReference {
-  return new PartialStateReference(
-    makeAppendOnlyTreeSnapshot(seed),
-    makeAppendOnlyTreeSnapshot(seed + 1),
-    makeAppendOnlyTreeSnapshot(seed + 2),
-  );
-}
-
-function makeGlobalVariables(seed = 1, overrides: Partial<FieldsOf<GlobalVariables>> = {}): GlobalVariables {
-  return GlobalVariables.from({
-    chainId: new Fr(seed),
-    version: new Fr(seed + 1),
-    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/src/block/l2_block_header.ts

@@ -1,246 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-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, ContentCommitment, 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 class L2BlockHeader {
-  constructor(
-    /** Snapshot of archive before the block is applied. */
-    public lastArchive: AppendOnlyTreeSnapshot,
-    /** Hash of the body of an L2 block. */
-    public contentCommitment: ContentCommitment,
-    /** State reference. */
-    public state: StateReference,
-    /** Global variables of an L2 block. */
-    public globalVariables: GlobalVariables,
-    /** Total fees in the block, computed by the root rollup circuit */
-    public totalFees: Fr,
-    /** Total mana used in the block, computed by the root rollup circuit */
-    public totalManaUsed: Fr,
-    /** Hash of the sponge blob of the block. */
-    public spongeBlobHash: Fr,
-    /** Hash of the block headers in the checkpoint. */
-    public blockHeadersHash: Fr,
-  ) {}
-
-  static get schema(): ZodFor<L2BlockHeader> {
-    return z
-      .object({
-        lastArchive: AppendOnlyTreeSnapshot.schema,
-        contentCommitment: ContentCommitment.schema,
-        state: StateReference.schema,
-        globalVariables: GlobalVariables.schema,
-        totalFees: schemas.Fr,
-        totalManaUsed: schemas.Fr,
-        spongeBlobHash: schemas.Fr,
-        blockHeadersHash: schemas.Fr,
-      })
-      .transform(L2BlockHeader.from);
-  }
-
-  static getFields(fields: FieldsOf<L2BlockHeader>) {
-    return [
-      fields.lastArchive,
-      fields.contentCommitment,
-      fields.state,
-      fields.globalVariables,
-      fields.totalFees,
-      fields.totalManaUsed,
-      fields.spongeBlobHash,
-      fields.blockHeadersHash,
-    ] as const;
-  }
-
-  static from(fields: FieldsOf<L2BlockHeader>) {
-    return new L2BlockHeader(...L2BlockHeader.getFields(fields));
-  }
-
-  getSlot(): SlotNumber {
-    return this.globalVariables.slotNumber;
-  }
-
-  getBlockNumber() {
-    return this.globalVariables.blockNumber;
-  }
-
-  getSize() {
-    return (
-      this.lastArchive.getSize() +
-      this.contentCommitment.getSize() +
-      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(): Fr[] {
-    return serializeToFields(...L2BlockHeader.getFields(this));
-  }
-
-  clone() {
-    return L2BlockHeader.fromBuffer(this.toBuffer());
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-
-    return new L2BlockHeader(
-      reader.readObject(AppendOnlyTreeSnapshot),
-      reader.readObject(ContentCommitment),
-      reader.readObject(StateReference),
-      reader.readObject(GlobalVariables),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-    );
-  }
-
-  static fromFields(fields: Fr[] | FieldReader) {
-    const reader = FieldReader.asReader(fields);
-
-    return new L2BlockHeader(
-      AppendOnlyTreeSnapshot.fromFields(reader),
-      ContentCommitment.fromFields(reader),
-      StateReference.fromFields(reader),
-      GlobalVariables.fromFields(reader),
-      reader.readField(),
-      reader.readField(),
-      reader.readField(),
-      reader.readField(),
-    );
-  }
-
-  static empty(fields: Partial<FieldsOf<L2BlockHeader>> = {}) {
-    return L2BlockHeader.from({
-      lastArchive: AppendOnlyTreeSnapshot.empty(),
-      contentCommitment: ContentCommitment.empty(),
-      state: StateReference.empty(),
-      globalVariables: GlobalVariables.empty(),
-      totalFees: Fr.ZERO,
-      totalManaUsed: Fr.ZERO,
-      spongeBlobHash: Fr.ZERO,
-      blockHeadersHash: Fr.ZERO,
-      ...fields,
-    });
-  }
-
-  isEmpty(): boolean {
-    return (
-      this.lastArchive.isEmpty() &&
-      this.contentCommitment.isEmpty() &&
-      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.
-   */
-  public toString() {
-    return bufferToHex(this.toBuffer());
-  }
-
-  static fromString(str: string) {
-    return L2BlockHeader.fromBuffer(hexToBuffer(str));
-  }
-
-  toCheckpointHeader() {
-    return new CheckpointHeader(
-      this.lastArchive.root,
-      this.blockHeadersHash,
-      this.contentCommitment,
-      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(),
-      contentCommitment: this.contentCommitment.toInspect(),
-      state: this.state.toInspect(),
-      globalVariables: this.globalVariables.toInspect(),
-      totalFees: this.totalFees.toBigInt(),
-      totalManaUsed: this.totalManaUsed.toBigInt(),
-      spongeBlobHash: this.spongeBlobHash.toString(),
-      blockHeadersHash: this.blockHeadersHash.toString(),
-    };
-  }
-
-  [inspect.custom]() {
-    return `L2BlockHeader {
-  lastArchive: ${inspect(this.lastArchive)},
-  contentCommitment.blobsHash: ${inspect(this.contentCommitment.blobsHash)},
-  contentCommitment.inHash: ${inspect(this.contentCommitment.inHash)},
-  contentCommitment.outHash: ${inspect(this.contentCommitment.outHash)},
-  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},
-}`;
-  }
-
-  public equals(other: this): boolean {
-    return (
-      this.contentCommitment.equals(other.contentCommitment) &&
-      this.state.equals(other.state) &&
-      this.globalVariables.equals(other.globalVariables) &&
-      this.totalFees.equals(other.totalFees) &&
-      this.totalManaUsed.equals(other.totalManaUsed) &&
-      this.lastArchive.equals(other.lastArchive) &&
-      this.spongeBlobHash.equals(other.spongeBlobHash) &&
-      this.blockHeadersHash.equals(other.blockHeadersHash)
-    );
-  }
-}

package/src/block/l2_block_new.ts

@@ -1,171 +0,0 @@
-import { type BlockBlobData, encodeBlockBlobData } from '@aztec/blob-lib/encoding';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import { z } from 'zod';
-
-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.
- * TODO: Delete the existing `L2Block` class and rename this to `L2Block`.
- */
-export class L2BlockNew {
-  constructor(
-    /** Snapshot of archive tree after the block is applied. */
-    public archive: AppendOnlyTreeSnapshot,
-    /** Header of the block. */
-    public header: BlockHeader,
-    /** L2 block body. */
-    public body: Body,
-    private blockHash: Fr | undefined = undefined,
-  ) {}
-
-  get number(): number {
-    return this.header.globalVariables.blockNumber;
-  }
-
-  get timestamp(): bigint {
-    return this.header.globalVariables.timestamp;
-  }
-
-  static get schema() {
-    return z
-      .object({
-        archive: AppendOnlyTreeSnapshot.schema,
-        header: BlockHeader.schema,
-        body: Body.schema,
-      })
-      .transform(({ archive, header, body }) => new L2BlockNew(archive, header, body));
-  }
-
-  /**
-   * Deserializes a block from a buffer
-   * @returns A deserialized L2 block.
-   */
-  static fromBuffer(buf: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buf);
-    const header = reader.readObject(BlockHeader);
-    const archive = reader.readObject(AppendOnlyTreeSnapshot);
-    const body = reader.readObject(Body);
-
-    return new L2BlockNew(archive, header, body);
-  }
-
-  /**
-   * Serializes a block
-   * @returns A serialized L2 block as a Buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(this.header, this.archive, this.body);
-  }
-
-  /**
-   * Returns the block's hash (hash of block header).
-   * @returns The block's hash.
-   */
-  public async hash(): Promise<Fr> {
-    if (this.blockHash === undefined) {
-      this.blockHash = await this.header.hash();
-    }
-    return this.blockHash;
-  }
-
-  public toBlobFields(isFirstBlock: boolean): Fr[] {
-    const blockBlobData = this.toBlockBlobData(isFirstBlock);
-    return encodeBlockBlobData(blockBlobData);
-  }
-
-  public toBlockBlobData(isFirstBlock: boolean): BlockBlobData {
-    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(),
-    };
-  }
-
-  /**
-   * 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(
-    blockNumber: number,
-    {
-      txsPerBlock = 1,
-      txOptions = {},
-      makeTxOptions,
-      ...blockHeaderOverrides
-    }: {
-      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> {
-    const archive = new AppendOnlyTreeSnapshot(Fr.random(), blockNumber + 1);
-    const header = BlockHeader.random({ blockNumber, ...blockHeaderOverrides });
-    const body = await Body.random({ txsPerBlock, makeTxOptions, ...txOptions });
-    return new L2BlockNew(archive, header, body);
-  }
-
-  /**
-   * 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(): L2BlockInfo {
-    return {
-      blockHash: this.blockHash,
-      archive: this.archive.root,
-      lastArchive: this.header.lastArchive.root,
-      blockNumber: this.number,
-      slotNumber: Number(this.header.getSlot()),
-      txCount: this.body.txEffects.length,
-      timestamp: this.header.globalVariables.timestamp,
-    };
-  }
-}

package/src/block/l2_block_number.ts

@@ -1,8 +0,0 @@
-import { z } from 'zod';
-
-import { schemas } from '../schemas/index.js';
-
-export const L2BlockNumberSchema = z.union([schemas.Integer, z.literal('latest')]);
-
-/** Helper type for a specific L2 block number or the latest block number */
-export type L2BlockNumber = z.infer<typeof L2BlockNumberSchema>;