@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/src/tx/tx_receipt.ts

@@ -1,3 +1,4 @@
+import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
@@ -38,7 +39,7 @@ export class TxReceipt {
     /** The hash of the block containing the transaction. */
     public blockHash?: L2BlockHash,
     /** The block number in which the transaction was included. */
-    public blockNumber?: number,
+    public blockNumber?: BlockNumber,
   ) {}
 
   static empty() {
@@ -52,7 +53,7 @@ export class TxReceipt {
         status: z.nativeEnum(TxStatus),
         error: z.string(),
         blockHash: L2BlockHash.schema.optional(),
-        blockNumber: z.number().int().nonnegative().optional(),
+        blockNumber: BlockNumberSchema.optional(),
         transactionFee: schemas.BigInt.optional(),
       })
       .transform(TxReceipt.from);

package/src/tx/tx_request.ts

@@ -1,6 +1,6 @@
 import { GeneratorIndex, TX_REQUEST_LENGTH } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 

package/src/tx/validator/tx_validator.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import type { ZodFor } from '../../schemas/schemas.js';
+import { zodFor } from '../../schemas/schemas.js';
 import type { ProcessedTx } from '../processed_tx.js';
 import type { Tx } from '../tx.js';
 import type { TxHash } from '../tx_hash.js';
@@ -24,8 +24,10 @@ export interface TxValidator<T extends AnyTx = AnyTx> {
   validateTx(tx: T): Promise<TxValidationResult>;
 }
 
-export const TxValidationResultSchema = z.discriminatedUnion('result', [
-  z.object({ result: z.literal('valid'), reason: z.array(z.string()).optional() }),
-  z.object({ result: z.literal('invalid'), reason: z.array(z.string()) }),
-  z.object({ result: z.literal('skipped'), reason: z.array(z.string()) }),
-]) satisfies ZodFor<TxValidationResult>;
+export const TxValidationResultSchema = zodFor<TxValidationResult>()(
+  z.discriminatedUnion('result', [
+    z.object({ result: z.literal('valid') }),
+    z.object({ result: z.literal('invalid'), reason: z.array(z.string()) }),
+    z.object({ result: z.literal('skipped'), reason: z.array(z.string()) }),
+  ]),
+);

package/src/update-checker/update-checker.ts

@@ -1,4 +1,5 @@
-import { RegistryContract, type ViemClient } from '@aztec/ethereum';
+import { RegistryContract } from '@aztec/ethereum/contracts';
+import type { ViemClient } from '@aztec/ethereum/types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';

package/src/validators/errors.ts

@@ -1,5 +1,6 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { StateReference, TxHash } from '@aztec/stdlib/tx';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { TxHash } from '@aztec/stdlib/tx';
 
 export class ValidatorError extends Error {
   constructor(message: string) {
@@ -17,7 +18,7 @@ export class AttestationTimeoutError extends ValidatorError {
   constructor(
     public readonly collectedCount: number,
     public readonly requiredCount: number,
-    public readonly slot: bigint,
+    public readonly slot: SlotNumber,
   ) {
     super(`Timeout collecting attestations for slot ${slot}: ${collectedCount}/${requiredCount}`);
   }
@@ -39,8 +40,6 @@ export class ReExStateMismatchError extends ValidatorError {
   constructor(
     public readonly expectedArchiveRoot: Fr,
     public readonly actualArchiveRoot: Fr,
-    public readonly expectedStateReference?: StateReference,
-    public readonly actualStateReference?: StateReference,
   ) {
     super('Re-execution state mismatch');
   }

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.BigInt,
-    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);
 
@@ -32,44 +30,52 @@ export const ValidatorStatusHistorySchemaMap = z.record(ValidatorStatusHistorySc
 
 const ValidatorTimeStatSchema = z.object({
   timestamp: schemas.BigInt,
-  slot: schemas.BigInt,
+  slot: schemas.SlotNumber,
   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.BigInt.optional(),
-  initialSlot: schemas.BigInt.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.BigInt,
-    }),
-  ),
-  lastProcessedSlot: schemas.BigInt.optional(),
-  initialSlot: schemas.BigInt.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/validators/types.ts

@@ -1,3 +1,4 @@
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
 export type ValidatorStatusType = 'block' | 'attestation';
@@ -9,7 +10,7 @@ export type ValidatorStatusInSlot =
   | 'attestation-sent'
   | 'attestation-missed';
 
-export type ValidatorStatusHistory = { slot: bigint; status: ValidatorStatusInSlot }[];
+export type ValidatorStatusHistory = { slot: SlotNumber; status: ValidatorStatusInSlot }[];
 
 export type ValidatorMissedStats = {
   currentStreak: number;
@@ -20,8 +21,8 @@ export type ValidatorMissedStats = {
 
 export type ValidatorStats = {
   address: EthAddress;
-  lastProposal?: { timestamp: bigint; slot: bigint; date: string };
-  lastAttestation?: { timestamp: bigint; slot: bigint; date: string };
+  lastProposal?: { timestamp: bigint; slot: SlotNumber; date: string };
+  lastAttestation?: { timestamp: bigint; slot: SlotNumber; date: string };
   totalSlots: number;
   missedProposals: ValidatorMissedStats;
   missedAttestations: ValidatorMissedStats;
@@ -30,8 +31,8 @@ export type ValidatorStats = {
 
 export type ValidatorsStats = {
   stats: Record<string, ValidatorStats>;
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };
 
@@ -39,8 +40,8 @@ export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number;
 
 export type SingleValidatorStats = {
   validator: ValidatorStats;
-  allTimeProvenPerformance: { missed: number; total: number; epoch: bigint }[];
-  lastProcessedSlot?: bigint;
-  initialSlot?: bigint;
+  allTimeProvenPerformance: { missed: number; total: number; epoch: EpochNumber }[];
+  lastProcessedSlot?: SlotNumber;
+  initialSlot?: SlotNumber;
   slotWindow: number;
 };

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';
@@ -134,6 +134,13 @@ export class VerificationKeyAsFields {
     return new VerificationKeyAsFields(reader.readVector(Fr), reader.readObject(Fr));
   }
 
+  static fromFrBuffer(vkBytes: Buffer): Promise<VerificationKeyAsFields> {
+    const numFields = vkBytes.length / Fr.SIZE_IN_BYTES;
+    const reader = BufferReader.asReader(vkBytes);
+    const fields = reader.readArray(numFields, Fr);
+    return VerificationKeyAsFields.fromKey(fields);
+  }
+
   /**
    * Builds a fake verification key that should be accepted by circuits.
    * @returns A fake verification key.
@@ -250,6 +257,20 @@ export class VerificationKey {
       times(16, i => i),
     );
   }
+
+  /**
+   * Builds a fake MegaHonk verification key buffer for testing.
+   * Uses a real VK from a compiled contract to ensure proper format.
+   *
+   * @returns A valid MegaHonk VK buffer (4064 bytes)
+   */
+  static makeFakeMegaHonk(): Buffer {
+    // This is a real MegaFlavor VK from token_contract, base64-encoded
+    // Size: 4064 bytes (127 fields × 32 bytes)
+    const vk =
+      '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';
+    return Buffer.from(vk, 'base64');
+  }
 }
 
 export class VerificationKeyData {
@@ -305,6 +326,10 @@ export class VerificationKeyData {
     return new VerificationKeyData(verificationKeyAsFields, bytes);
   }
 
+  static async fromFrBuffer(vkBytes: Buffer): Promise<VerificationKeyData> {
+    return new VerificationKeyData(await VerificationKeyAsFields.fromFrBuffer(vkBytes), vkBytes);
+  }
+
   static fromString(str: string): VerificationKeyData {
     return VerificationKeyData.fromBuffer(hexToBuffer(str));
   }

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/world-state/world_state_revision.ts

@@ -7,15 +7,57 @@ export class WorldStateRevision {
     public readonly includeUncommitted: boolean,
   ) {}
 
+  public toString() {
+    return `WorldStateRevision(forkId: ${this.forkId}, blockNumber: ${this.blockNumber}, includeUncommitted: ${this.includeUncommitted})`;
+  }
+
   static empty() {
     return new WorldStateRevision(0, 0, false);
   }
 
   static get schema() {
-    return z.object({
-      forkId: z.number(),
-      blockNumber: z.number(),
-      includeUncommitted: z.boolean(),
-    });
+    return z
+      .object({
+        forkId: z.number(),
+        blockNumber: z.number(),
+        includeUncommitted: z.boolean(),
+      })
+      .transform(
+        ({ forkId, blockNumber, includeUncommitted }) =>
+          new WorldStateRevision(forkId, blockNumber, includeUncommitted),
+      );
+  }
+}
+
+export class WorldStateRevisionWithHandle extends WorldStateRevision {
+  constructor(
+    forkId: number,
+    blockNumber: number,
+    includeUncommitted: boolean,
+    public readonly handle: any,
+  ) {
+    super(forkId, blockNumber, includeUncommitted);
+  }
+
+  public toWorldStateRevision() {
+    return new WorldStateRevision(this.forkId, this.blockNumber, this.includeUncommitted);
+  }
+
+  static fromWorldStateRevision(revision: WorldStateRevision, handle: any) {
+    return new WorldStateRevisionWithHandle(revision.forkId, revision.blockNumber, revision.includeUncommitted, handle);
+  }
+
+  static override get schema() {
+    return z
+      .object({
+        forkId: z.number(),
+        blockNumber: z.number(),
+        includeUncommitted: z.boolean(),
+        handle: z.any(),
+      })
+      .transform(
+        ({ forkId, blockNumber, includeUncommitted, handle }) =>
+          new WorldStateRevisionWithHandle(forkId, blockNumber, includeUncommitted, handle),
+      );
   }
 }

package/src/zkpassport/index.ts

@@ -1,6 +1,6 @@
 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';
 

package/dest/block/l2_block_number.d.ts

@@ -1,5 +0,0 @@
-import { z } from 'zod';
-export declare const L2BlockNumberSchema: z.ZodUnion<[z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>, z.ZodLiteral<"latest">]>;
-/** Helper type for a specific L2 block number or the latest block number */
-export type L2BlockNumber = z.infer<typeof L2BlockNumberSchema>;
-//# sourceMappingURL=l2_block_number.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block_number.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,mBAAmB,uHAAkD,CAAC;AAEnF,4EAA4E;AAC5E,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC"}

package/dest/block/l2_block_number.js

@@ -1,6 +0,0 @@
-import { z } from 'zod';
-import { schemas } from '../schemas/index.js';
-export const L2BlockNumberSchema = z.union([
-    schemas.Integer,
-    z.literal('latest')
-]);

package/dest/block/published_l2_block.d.ts

@@ -1,143 +0,0 @@
-import { BufferReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { z } from 'zod';
-import { L2Block } from './l2_block.js';
-import { CommitteeAttestation } from './proposal/committee_attestation.js';
-export declare class L1PublishedData {
-    blockNumber: bigint;
-    timestamp: bigint;
-    blockHash: string;
-    constructor(blockNumber: bigint, timestamp: bigint, blockHash: string);
-    static get schema(): z.ZodObject<{
-        blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-        timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-        blockHash: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        blockNumber: bigint;
-        timestamp: bigint;
-        blockHash: string;
-    }, {
-        blockNumber: string | number | bigint;
-        timestamp: string | number | bigint;
-        blockHash: string;
-    }>;
-    static random(): L1PublishedData;
-    static fromFields(fields: FieldsOf<L1PublishedData>): L1PublishedData;
-}
-export declare class PublishedL2Block {
-    block: L2Block;
-    l1: L1PublishedData;
-    attestations: CommitteeAttestation[];
-    constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        block: z.ZodEffects<z.ZodObject<{
-            archive: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
-                root: import("@aztec/foundation/schemas").Fr;
-                nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-            header: import("@aztec/foundation/schemas").ZodFor<import("./l2_block_header.js").L2BlockHeader>;
-            body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
-        }, "strip", z.ZodTypeAny, {
-            archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-            header: import("./l2_block_header.js").L2BlockHeader;
-            body: import("./body.js").Body;
-        }, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>, L2Block, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>;
-        l1: z.ZodObject<{
-            blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            blockHash: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
-        }, {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        }>;
-        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            address: z.ZodType<import("@aztec/foundation/schemas").EthAddress, any, string>;
-            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
-        }, "strip", z.ZodTypeAny, {
-            address: import("@aztec/foundation/schemas").EthAddress;
-            signature: import("./proposal/committee_attestation.js").Signature;
-        }, {
-            address: string;
-            signature: string;
-        }>, CommitteeAttestation, {
-            address: string;
-            signature: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        block: L2Block;
-        l1: {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
-        };
-        attestations: CommitteeAttestation[];
-    }, {
-        block: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        };
-        l1: {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        };
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>, PublishedL2Block, {
-        block: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        };
-        l1: {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        };
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>;
-    static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block;
-    static fromFields(fields: FieldsOf<PublishedL2Block>): PublishedL2Block;
-    toBuffer(): Buffer;
-}
-//# sourceMappingURL=published_l2_block.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,qBAAa,eAAe;IAEjB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;gBAFjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM;IAG1B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAMhB;IAED,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;CAGpD;AAED,qBAAa,gBAAgB;IAElB,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;gBAFpC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE;IAG7C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU1E,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI7C,QAAQ,IAAI,MAAM;CAU1B"}

package/dest/checkpoint/checkpoint_body.d.ts

@@ -1,4 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import type { TxEffect } from '../tx/tx_effect.js';
-export declare function getCheckpointBlobFields(txEffectsInBlocks: TxEffect[][]): Fr[];
-//# sourceMappingURL=checkpoint_body.d.ts.map

package/dest/checkpoint/checkpoint_body.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkpoint_body.d.ts","sourceRoot":"","sources":["../../src/checkpoint/checkpoint_body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,QAAQ,EAAE,EAAE,QAItE"}

package/dest/checkpoint/checkpoint_body.js

@@ -1,9 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { getBlockBlobFields } from '../block/body.js';
-export function getCheckpointBlobFields(txEffectsInBlocks) {
-    const blockBlobFields = txEffectsInBlocks.map((blockTxEffects)=>getBlockBlobFields(blockTxEffects)).flat();
-    const totalNumBlobFields = blockBlobFields.length + 1; // +1 for the prefix indicating the number of total blob fields in a checkpoint.
-    return [
-        new Fr(totalNumBlobFields)
-    ].concat(blockBlobFields);
-}

package/dest/logs/log_with_tx_data.d.ts

@@ -1,19 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { TxHash } from '@aztec/stdlib/tx';
-export declare class PublicLogWithTxData {
-    logPayload: Fr[];
-    txHash: TxHash;
-    uniqueNoteHashesInTx: Fr[];
-    firstNullifierInTx: Fr;
-    constructor(logPayload: Fr[], txHash: TxHash, uniqueNoteHashesInTx: Fr[], firstNullifierInTx: Fr);
-}
-export declare class PrivateLogWithTxData {
-    logPayload: Fr[];
-    txHash: TxHash;
-    uniqueNoteHashesInTx: Fr[];
-    firstNullifierInTx: Fr;
-    constructor(logPayload: Fr[], txHash: TxHash, uniqueNoteHashesInTx: Fr[], firstNullifierInTx: Fr);
-    toNoirSerialization(): (Fr | Fr[])[];
-    static noirSerializationOfEmpty(): (Fr | Fr[])[];
-}
-//# sourceMappingURL=log_with_tx_data.d.ts.map

package/dest/logs/log_with_tx_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"log_with_tx_data.d.ts","sourceRoot":"","sources":["../../src/logs/log_with_tx_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,qBAAa,mBAAmB;IAErB,UAAU,EAAE,EAAE,EAAE;IAChB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;gBAHtB,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE;CAEhC;AAGD,qBAAa,oBAAoB;IAEtB,UAAU,EAAE,EAAE,EAAE;IAChB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;gBAHtB,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE;IAG/B,mBAAmB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;IASpC,MAAM,CAAC,wBAAwB,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;CAGjD"}