@aztec/stdlib 3.0.0-devnet.2 → 3.0.0-devnet.2-patch.1

package/src/interfaces/epoch-prover.ts

@@ -1,6 +1,7 @@
-import type { BatchedBlob, FinalBlobBatchingChallenges } from '@aztec/blob-lib';
+import type { BatchedBlob, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
+import type { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 
 import type { Proof } from '../proofs/proof.js';
 import type { CheckpointConstantData } from '../rollup/checkpoint_constant_data.js';
@@ -19,7 +20,7 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted' | '
    * @param finalBlobBatchingChallenges - The final blob batching challenges for the epoch.
    **/
   startNewEpoch(
-    epochNumber: number,
+    epochNumber: EpochNumber,
     totalNumCheckpoints: number,
     finalBlobBatchingChallenges: FinalBlobBatchingChallenges,
   ): void;
@@ -30,7 +31,6 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted' | '
    * @param constants - The constants for this checkpoint.
    * @param l1ToL2Messages - The set of L1 to L2 messages to be included in this checkpoint.
    * @param totalNumBlocks - The total number of blocks expected in the checkpoint (must be at least one).
-   * @param totalNumBlobFields - The total number of blob fields expected in the checkpoint.
    * @param headerOfLastBlockInPreviousCheckpoint - The header of the last block in the previous checkpoint.
    */
   startNewCheckpoint(
@@ -38,7 +38,6 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted' | '
     constants: CheckpointConstantData,
     l1ToL2Messages: Fr[],
     totalNumBlocks: number,
-    totalNumBlobFields: number,
     headerOfLastBlockInPreviousCheckpoint: BlockHeader,
   ): Promise<void>;
 
@@ -48,16 +47,16 @@ export interface EpochProver extends Omit<IBlockFactory, 'setBlockCompleted' | '
    * @param timestamp - The timestamp of the block.
    * @param totalNumTxs - The total number of txs in the block.
    */
-  startNewBlock(blockNumber: number, timestamp: UInt64, totalNumTxs: number): Promise<void>;
+  startNewBlock(blockNumber: BlockNumber, timestamp: UInt64, totalNumTxs: number): Promise<void>;
 
   /**
-   * Kickstarts tube circuits for the specified txs. These will be used during epoch proving.
-   * Note that if the tube circuits are not started this way, they will be started nontheless after processing.
+   * Kickstarts chonk verifier circuits for the specified txs. These will be used during epoch proving.
+   * Note that if the chonk verifier circuits are not started this way, they will be started nonetheless after processing.
    */
-  startTubeCircuits(txs: Tx[]): Promise<void>;
+  startChonkVerifierCircuits(txs: Tx[]): Promise<void>;
 
   /** Returns the block. */
-  setBlockCompleted(blockNumber: number, expectedBlockHeader?: BlockHeader): Promise<BlockHeader>;
+  setBlockCompleted(blockNumber: BlockNumber, expectedBlockHeader?: BlockHeader): Promise<BlockHeader>;
 
   /** Pads the epoch with empty block roots if needed and blocks until proven. Throws if proving has failed. */
   finalizeEpoch(): Promise<{ publicInputs: RootRollupPublicInputs; proof: Proof; batchedBlobInputs: BatchedBlob }>;

package/src/interfaces/l2_logs_source.ts

@@ -1,7 +1,7 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { LogFilter } from '../logs/log_filter.js';
-import type { PrivateLog } from '../logs/private_log.js';
 import type { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
 import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js';
 
@@ -9,14 +9,6 @@ import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_
  * Interface of classes allowing for the retrieval of logs.
  */
 export interface L2LogsSource {
-  /**
-   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-   * @param from - The block number from which to begin retrieving logs.
-   * @param limit - The maximum number of blocks to retrieve logs from.
-   * @returns An array of private logs from the specified range of blocks.
-   */
-  getPrivateLogs(from: number, limit: number): Promise<PrivateLog[]>;
-
   /**
    * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
    * @param tags - The tags to filter the logs by.
@@ -44,5 +36,5 @@ export interface L2LogsSource {
    * Gets the number of the latest L2 block processed by the implementation.
    * @returns The number of the latest L2 block processed by the implementation.
    */
-  getBlockNumber(): Promise<number>;
+  getBlockNumber(): Promise<BlockNumber>;
 }

package/src/interfaces/merkle_tree_operations.ts

@@ -1,4 +1,5 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { type IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/trees';
 
@@ -7,7 +8,7 @@ import type { NullifierLeaf } from '../trees/nullifier_leaf.js';
 import type { PublicDataTreeLeaf } from '../trees/public_data_leaf.js';
 import type { BlockHeader } from '../tx/block_header.js';
 import type { StateReference } from '../tx/state_reference.js';
-import type { WorldStateRevision } from '../world-state/world_state_revision.js';
+import type { WorldStateRevision, WorldStateRevisionWithHandle } from '../world-state/world_state_revision.js';
 
 /**
  * Type alias for the nullifier tree ID.
@@ -136,7 +137,7 @@ export interface MerkleTreeReadOperations {
   /**
    * Gets the current revision.
    */
-  getRevision(): WorldStateRevision;
+  getRevision(): WorldStateRevision | WorldStateRevisionWithHandle;
 
   /**
    * Gets sibling path for a leaf.
@@ -220,7 +221,7 @@ export interface MerkleTreeReadOperations {
   getBlockNumbersForLeafIndices<ID extends MerkleTreeId>(
     treeId: ID,
     leafIndices: bigint[],
-  ): Promise<(bigint | undefined)[]>;
+  ): Promise<(BlockNumber | undefined)[]>;
 }
 
 export interface MerkleTreeCheckpointOperations {

package/src/interfaces/p2p.ts

@@ -1,3 +1,5 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+
 import { z } from 'zod';
 
 import { BlockAttestation } from '../p2p/block_attestation.js';
@@ -56,7 +58,7 @@ export interface P2PApiWithAttestations extends P2PApiWithoutAttestations {
    * @param proposalId - the proposal id to query, or undefined to query all proposals for the slot
    * @returns BlockAttestations
    */
-  getAttestationsForSlot(slot: bigint, proposalId?: string): Promise<BlockAttestation[]>;
+  getAttestationsForSlot(slot: SlotNumber, proposalId?: string): Promise<BlockAttestation[]>;
 
   /** Deletes a given attestation manually from the p2p client attestation pool. */
   deleteAttestation(attestation: BlockAttestation): Promise<void>;
@@ -78,7 +80,7 @@ export type P2PApiFull<T extends P2PClientType = P2PClientType.Full> = T extends
 export const P2PApiSchema: ApiSchemaFor<P2PApi> = {
   getAttestationsForSlot: z
     .function()
-    .args(schemas.BigInt, optional(z.string()))
+    .args(schemas.SlotNumber, optional(z.string()))
     .returns(z.array(BlockAttestation.schema)),
   getPendingTxs: z
     .function()

package/src/interfaces/private_kernel_prover.ts

@@ -10,7 +10,7 @@ import type {
   PrivateKernelTailCircuitPrivateInputs,
   PrivateKernelTailCircuitPublicInputs,
 } from '../kernel/index.js';
-import type { ClientIvcProofWithPublicInputs } from '../proofs/client_ivc_proof.js';
+import type { ChonkProofWithPublicInputs } from '../proofs/chonk_proof.js';
 
 /**
  * PrivateKernelProver provides functionality to simulate and validate circuits, and retrieve
@@ -110,7 +110,7 @@ export interface PrivateKernelProver {
    * @param acirs The program bytecode.
    * @param witnessStack The witnessses for each program bytecode.
    */
-  createClientIvcProof(executionSteps: PrivateExecutionStep[]): Promise<ClientIvcProofWithPublicInputs>;
+  createChonkProof(executionSteps: PrivateExecutionStep[]): Promise<ChonkProofWithPublicInputs>;
 
   /**
    * Compute the gate count for a given circuit.

package/src/interfaces/proving-job.ts

@@ -4,6 +4,7 @@ import {
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   RECURSIVE_PROOF_LENGTH,
 } from '@aztec/constants';
+import { EpochNumber, EpochNumberSchema } from '@aztec/foundation/branded-types';
 import type { ZodFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
@@ -32,8 +33,8 @@ import {
   CheckpointRootSingleBlockRollupPrivateInputs,
 } from '../rollup/checkpoint_root_rollup_private_inputs.js';
 import { PrivateTxBaseRollupPrivateInputs } from '../rollup/private_tx_base_rollup_private_inputs.js';
-import { PublicTubePrivateInputs } from '../rollup/public_tube_private_inputs.js';
-import { PublicTubePublicInputs } from '../rollup/public_tube_public_inputs.js';
+import { PublicChonkVerifierPrivateInputs } from '../rollup/public_chonk_verifier_private_inputs.js';
+import { PublicChonkVerifierPublicInputs } from '../rollup/public_chonk_verifier_public_inputs.js';
 import { PublicTxBaseRollupPrivateInputs } from '../rollup/public_tx_base_rollup_private_inputs.js';
 import { RootRollupPrivateInputs } from '../rollup/root_rollup_private_inputs.js';
 import { RootRollupPublicInputs } from '../rollup/root_rollup_public_inputs.js';
@@ -91,7 +92,10 @@ export const ProvingJobInputs = z.discriminatedUnion('type', [
   AvmProvingRequestSchema,
   z.object({ type: z.literal(ProvingRequestType.PARITY_BASE), inputs: ParityBasePrivateInputs.schema }),
   z.object({ type: z.literal(ProvingRequestType.PARITY_ROOT), inputs: ParityRootPrivateInputs.schema }),
-  z.object({ type: z.literal(ProvingRequestType.PUBLIC_TUBE), inputs: PublicTubePrivateInputs.schema }),
+  z.object({
+    type: z.literal(ProvingRequestType.PUBLIC_CHONK_VERIFIER),
+    inputs: PublicChonkVerifierPrivateInputs.schema,
+  }),
   z.object({
     type: z.literal(ProvingRequestType.PRIVATE_TX_BASE_ROLLUP),
     inputs: PrivateTxBaseRollupPrivateInputs.schema,
@@ -142,8 +146,8 @@ export function getProvingJobInputClassFor(type: ProvingRequestType) {
   switch (type) {
     case ProvingRequestType.PUBLIC_VM:
       return AvmCircuitInputs;
-    case ProvingRequestType.PUBLIC_TUBE:
-      return PublicTubePrivateInputs;
+    case ProvingRequestType.PUBLIC_CHONK_VERIFIER:
+      return PublicChonkVerifierPrivateInputs;
     case ProvingRequestType.PRIVATE_TX_BASE_ROLLUP:
       return PrivateTxBaseRollupPrivateInputs;
     case ProvingRequestType.PUBLIC_TX_BASE_ROLLUP:
@@ -187,7 +191,7 @@ export type ProvingJobInputs = z.infer<typeof ProvingJobInputs>;
 
 export type ProvingJobInputsMap = {
   [ProvingRequestType.PUBLIC_VM]: AvmCircuitInputs;
-  [ProvingRequestType.PUBLIC_TUBE]: PublicTubePrivateInputs;
+  [ProvingRequestType.PUBLIC_CHONK_VERIFIER]: PublicChonkVerifierPrivateInputs;
   [ProvingRequestType.PRIVATE_TX_BASE_ROLLUP]: PrivateTxBaseRollupPrivateInputs;
   [ProvingRequestType.PUBLIC_TX_BASE_ROLLUP]: PublicTxBaseRollupPrivateInputs;
   [ProvingRequestType.TX_MERGE_ROLLUP]: TxMergeRollupPrivateInputs;
@@ -212,9 +216,9 @@ export const ProvingJobResult = z.discriminatedUnion('type', [
     result: schemaForRecursiveProofAndVerificationKey(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED),
   }),
   z.object({
-    type: z.literal(ProvingRequestType.PUBLIC_TUBE),
+    type: z.literal(ProvingRequestType.PUBLIC_CHONK_VERIFIER),
     result: schemaForPublicInputsAndRecursiveProof(
-      PublicTubePublicInputs.schema,
+      PublicChonkVerifierPublicInputs.schema,
       NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
     ),
   }),
@@ -325,8 +329,8 @@ export const ProvingJobResult = z.discriminatedUnion('type', [
 export type ProvingJobResult = z.infer<typeof ProvingJobResult>;
 export type ProvingJobResultsMap = {
   [ProvingRequestType.PUBLIC_VM]: ProofAndVerificationKey<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
-  [ProvingRequestType.PUBLIC_TUBE]: PublicInputsAndRecursiveProof<
-    PublicTubePublicInputs,
+  [ProvingRequestType.PUBLIC_CHONK_VERIFIER]: PublicInputsAndRecursiveProof<
+    PublicChonkVerifierPublicInputs,
     typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
   >;
   [ProvingRequestType.PRIVATE_TX_BASE_ROLLUP]: PublicInputsAndRecursiveProof<
@@ -397,24 +401,32 @@ export const ProofUri = z.string().brand('ProvingJobUri');
 export type ProofUri = z.infer<typeof ProofUri>;
 
 export type ProvingJobId = z.infer<typeof ProvingJobId>;
-export const ProvingJob = z.object({
+
+type ProvingJobShape = {
+  id: ProvingJobId;
+  type: ProvingRequestType;
+  epochNumber: EpochNumber;
+  inputsUri: ProofUri;
+};
+
+export const ProvingJob: z.ZodType<ProvingJobShape, z.ZodTypeDef, any> = z.object({
   id: ProvingJobId,
   type: z.nativeEnum(ProvingRequestType),
-  epochNumber: z.number(),
+  epochNumber: EpochNumberSchema,
   inputsUri: ProofUri,
 });
 
-export const makeProvingJobId = (epochNumber: number, type: ProvingRequestType, inputsHash: string) => {
+export const makeProvingJobId = (epochNumber: EpochNumber, type: ProvingRequestType, inputsHash: string) => {
   return `${epochNumber}:${ProvingRequestType[type]}:${inputsHash}`;
 };
 
-export const getEpochFromProvingJobId = (id: ProvingJobId) => {
+export const getEpochFromProvingJobId = (id: ProvingJobId): EpochNumber => {
   const components = id.split(':');
   const epochNumber = components.length < 1 ? Number.NaN : parseInt(components[0], 10);
   if (!Number.isSafeInteger(epochNumber) || epochNumber < 0) {
     throw new Error(`Proving Job ID ${id} does not contain valid epoch`);
   }
-  return epochNumber;
+  return EpochNumber(epochNumber);
 };
 
 export type ProvingJob = z.infer<typeof ProvingJob>;

package/src/interfaces/public_state_source.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { AztecAddress } from '../aztec-address/index.js';
 

package/src/interfaces/server_circuit_prover.ts

@@ -26,8 +26,8 @@ import type {
   CheckpointRootSingleBlockRollupPrivateInputs,
 } from '../rollup/checkpoint_root_rollup_private_inputs.js';
 import type { PrivateTxBaseRollupPrivateInputs } from '../rollup/private_tx_base_rollup_private_inputs.js';
-import type { PublicTubePrivateInputs } from '../rollup/public_tube_private_inputs.js';
-import type { PublicTubePublicInputs } from '../rollup/public_tube_public_inputs.js';
+import type { PublicChonkVerifierPrivateInputs } from '../rollup/public_chonk_verifier_private_inputs.js';
+import type { PublicChonkVerifierPublicInputs } from '../rollup/public_chonk_verifier_public_inputs.js';
 import type { PublicTxBaseRollupPrivateInputs } from '../rollup/public_tx_base_rollup_private_inputs.js';
 import type { RootRollupPrivateInputs } from '../rollup/root_rollup_private_inputs.js';
 import type { RootRollupPublicInputs } from '../rollup/root_rollup_public_inputs.js';
@@ -60,11 +60,13 @@ export interface ServerCircuitProver {
     epochNumber?: number,
   ): Promise<PublicInputsAndRecursiveProof<ParityPublicInputs, typeof NESTED_RECURSIVE_PROOF_LENGTH>>;
 
-  getPublicTubeProof(
-    inputs: PublicTubePrivateInputs,
+  getPublicChonkVerifierProof(
+    inputs: PublicChonkVerifierPrivateInputs,
     signal?: AbortSignal,
     epochNumber?: number,
-  ): Promise<PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
+  ): Promise<
+    PublicInputsAndRecursiveProof<PublicChonkVerifierPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
+  >;
 
   /**
    * Creates a proof for the given input.

package/src/interfaces/tx_provider.ts

@@ -1,4 +1,4 @@
-import type { L2Block } from '@aztec/stdlib/block';
+import type { L2BlockNew } from '@aztec/stdlib/block';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import { type Tx, TxHash } from '@aztec/stdlib/tx';
 
@@ -13,5 +13,5 @@ export interface ITxProvider {
     opts: { pinnedPeer: PeerId | undefined; deadline: Date },
   ): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
 
-  getTxsForBlock(block: L2Block, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
+  getTxsForBlock(block: L2BlockNew, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
 }

package/src/interfaces/validator.ts

@@ -1,11 +1,11 @@
 import type { SecretValue } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
-import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
-import type { StateReference, Tx } from '@aztec/stdlib/tx';
+import type { Tx } from '@aztec/stdlib/tx';
 
 import type { PeerId } from '@libp2p/interface';
 import { z } from 'zod';
@@ -41,6 +41,9 @@ export interface ValidatorClientConfig {
 
   /** Whether to always reexecute block proposals, even for non-validator nodes or when out of the currnet committee */
   alwaysReexecuteBlockProposals?: boolean;
+
+  /** Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus */
+  fishermanMode?: boolean;
 }
 
 export type ValidatorClientFullConfig = ValidatorClientConfig &
@@ -61,6 +64,7 @@ export const ValidatorClientConfigSchema = z.object({
   validatorReexecute: z.boolean(),
   validatorReexecuteDeadlineMs: z.number().min(0),
   alwaysReexecuteBlockProposals: z.boolean().optional(),
+  fishermanMode: z.boolean().optional(),
 }) satisfies ZodFor<Omit<ValidatorClientConfig, 'validatorPrivateKeys'>>;
 
 export const ValidatorClientFullConfigSchema = ValidatorClientConfigSchema.extend({
@@ -79,7 +83,6 @@ export interface Validator {
     blockNumber: number,
     header: CheckpointHeader,
     archive: Fr,
-    stateReference: StateReference,
     txs: Tx[],
     proposerAddress: EthAddress | undefined,
     options: BlockProposalOptions,

package/src/interfaces/world_state.ts

@@ -1,3 +1,4 @@
+import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
 import type { PromiseWithResolvers } from '@aztec/foundation/promise';
 
 import { z } from 'zod';
@@ -18,10 +19,10 @@ export enum WorldStateRunningState {
 }
 
 export interface WorldStateSyncStatus {
-  latestBlockNumber: number;
+  latestBlockNumber: BlockNumber;
   latestBlockHash: string;
-  finalizedBlockNumber: number;
-  oldestHistoricBlockNumber: number;
+  finalizedBlockNumber: BlockNumber;
+  oldestHistoricBlockNumber: BlockNumber;
   treesAreSynched: boolean;
 }
 
@@ -42,10 +43,10 @@ export interface WorldStateSynchronizerStatus {
 /** Provides writeable forks of the world state at a given block number. */
 export interface ForkMerkleTreeOperations {
   /** Forks the world state at the given block number, defaulting to the latest one. */
-  fork(block?: number): Promise<MerkleTreeWriteOperations>;
+  fork(block?: BlockNumber): Promise<MerkleTreeWriteOperations>;
 
   /** Gets a handle that allows reading the state as it was at the given block number. */
-  getSnapshot(blockNumber: number): MerkleTreeReadOperations;
+  getSnapshot(blockNumber: BlockNumber): MerkleTreeReadOperations;
 
   /** Backups the db to the target path. */
   backupTo(dstPath: string, compact?: boolean): Promise<Record<Exclude<SnapshotDataKeys, 'archiver'>, string>>;
@@ -74,7 +75,7 @@ export interface WorldStateSynchronizer extends ForkMerkleTreeOperations {
    * @param skipThrowIfTargetNotReached - Whether to skip throwing if the target block number is not reached.
    * @returns A promise that resolves with the block number the world state was synced to
    */
-  syncImmediate(minBlockNumber?: number, skipThrowIfTargetNotReached?: boolean): Promise<number>;
+  syncImmediate(minBlockNumber?: BlockNumber, skipThrowIfTargetNotReached?: boolean): Promise<BlockNumber>;
 
   /** Returns an instance of MerkleTreeAdminOperations that will not include uncommitted data. */
   getCommitted(): MerkleTreeReadOperations;
@@ -83,10 +84,10 @@ export interface WorldStateSynchronizer extends ForkMerkleTreeOperations {
   clear(): Promise<void>;
 }
 
-export const WorldStateSyncStatusSchema = z.object({
-  finalizedBlockNumber: z.number().int().nonnegative(),
-  latestBlockNumber: z.number().int().nonnegative(),
+export const WorldStateSyncStatusSchema: z.ZodType<WorldStateSyncStatus, z.ZodTypeDef, any> = z.object({
+  finalizedBlockNumber: BlockNumberSchema,
+  latestBlockNumber: BlockNumberSchema,
   latestBlockHash: z.string(),
-  oldestHistoricBlockNumber: z.number().int().nonnegative(),
+  oldestHistoricBlockNumber: BlockNumberSchema,
   treesAreSynched: z.boolean(),
-}) satisfies z.ZodType<WorldStateSyncStatus>;
+});

package/src/kernel/claimed_length_array.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import {
   BufferReader,
   FieldReader,

package/src/kernel/hints/build_nullifier_read_request_hints.ts

@@ -3,7 +3,7 @@ import {
   MAX_NULLIFIER_READ_REQUESTS_PER_TX,
   type NULLIFIER_TREE_HEIGHT,
 } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness } from '@aztec/foundation/trees';
 
 import { siloNullifier } from '../../hash/hash.js';

package/src/kernel/hints/build_transient_data_hints.ts

@@ -16,7 +16,7 @@ export function buildTransientDataHints<NOTE_HASHES_LEN extends number, NULLIFIE
   futureNoteHashReads: ScopedReadRequest[],
   futureNullifierReads: ScopedReadRequest[],
   noteHashNullifierCounterMap: Map<number, number>,
-  validationRequestsSplitCounter: number,
+  splitCounter: number,
 ): { numTransientData: number; hints: Tuple<TransientDataSquashingHint, NULLIFIERS_LEN> } {
   const futureNoteHashReadsMap = new ScopedValueCache(futureNoteHashReads);
   const futureNullifierReadsMap = new ScopedValueCache(futureNullifierReads);
@@ -44,7 +44,7 @@ export function buildTransientDataHints<NOTE_HASHES_LEN extends number, NULLIFIE
 
     const nullifier = nullifiers.array[nullifierIndex];
     // Cannot nullify a non-revertible note hash with a revertible nullifier.
-    if (noteHash.counter < validationRequestsSplitCounter && nullifier.counter >= validationRequestsSplitCounter) {
+    if (noteHash.counter < splitCounter && nullifier.counter >= splitCounter) {
       continue;
     }
 

package/src/kernel/hints/key_validation_hint.ts

@@ -1,4 +1,4 @@
-import { GrumpkinScalar } from '@aztec/foundation/fields';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 export class KeyValidationHint {

package/src/kernel/hints/key_validation_request.ts

@@ -1,5 +1,6 @@
 import { KEY_VALIDATION_REQUEST_LENGTH } from '@aztec/constants';
-import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar, Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 /**

package/src/kernel/hints/key_validation_request_and_generator.ts

@@ -1,5 +1,5 @@
 import { KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { KeyValidationRequest } from './key_validation_request.js';

package/src/kernel/hints/note_hash_read_request_hints.ts

@@ -1,6 +1,6 @@
 import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_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 type { BufferReader } from '@aztec/foundation/serialize';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 

package/src/kernel/hints/private_kernel_reset_hints.ts

@@ -30,11 +30,6 @@ export class PrivateKernelResetHints<
      * Contains hints for the transient note hashes to locate corresponding nullifiers.
      */
     public transientDataSquashingHints: Tuple<TransientDataSquashingHint, TRANSIENT_DATA_HINTS_LEN>,
-    /**
-     * The "final" minRevertibleSideEffectCounter of a tx, to split the data for squashing.
-     * Not the minRevertibleSideEffectCounter at the point the reset circuit is run.
-     */
-    public validationRequestsSplitCounter: number,
   ) {}
 
   toBuffer() {
@@ -43,7 +38,6 @@ export class PrivateKernelResetHints<
       this.nullifierReadRequestHints,
       this.keyValidationHints,
       this.transientDataSquashingHints,
-      this.validationRequestsSplitCounter,
     );
   }
 
@@ -71,7 +65,6 @@ export class PrivateKernelResetHints<
       ),
       this.keyValidationHints.slice(0, useSize(numKeyValidationHints)),
       this.transientDataSquashingHints.slice(0, useSize(numTransientDataSquashingHints)),
-      this.validationRequestsSplitCounter,
     );
   }
   /**
@@ -114,7 +107,6 @@ export class PrivateKernelResetHints<
       }),
       reader.readArray(numKeyValidationHints, KeyValidationHint),
       reader.readArray(numTransientDataSquashingHints, TransientDataSquashingHint),
-      reader.readNumber(),
     );
   }
 }

package/src/kernel/hints/read_request.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../../aztec-address/index.js';

package/src/kernel/hints/scoped_key_validation_request_and_generator.ts

@@ -1,5 +1,5 @@
 import { SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../../aztec-address/index.js';

package/src/kernel/hints/scoped_value_cache.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { AztecAddress } from '../../aztec-address/index.js';
 

package/src/kernel/hints/transient_data_squashing_hint.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';

package/src/kernel/hints/tree_leaf_read_request.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 export class TreeLeafReadRequest {

package/src/kernel/log_hash.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 

package/src/kernel/note_hash.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../aztec-address/index.js';

package/src/kernel/nullifier.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../aztec-address/index.js';

package/src/kernel/padded_side_effects.ts

@@ -1,6 +1,6 @@
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } 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 { PrivateLog } from '../logs/index.js';

package/src/kernel/private_call_data.ts

@@ -1,5 +1,5 @@
 import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';

package/src/kernel/private_call_request.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 
 import { CallContext } from '../tx/call_context.js';