@aztec/stdlib 3.0.0-nightly.20251118 → 3.0.0-nightly.20251120

package/src/kernel/private_kernel_init_circuit_private_inputs.ts

@@ -34,6 +34,10 @@ export class PrivateKernelInitCircuitPrivateInputs {
      * A hint to what will be the first nullifier of the transaction, used for nonce generation.
      */
     public firstNullifierHint: Fr,
+    /**
+     * A claim to the final min revertible side effect counter of a tx.
+     */
+    public revertibleCounterHint: number,
   ) {}
 
   /**
@@ -47,6 +51,7 @@ export class PrivateKernelInitCircuitPrivateInputs {
       this.protocolContracts,
       this.privateCall,
       this.firstNullifierHint,
+      this.revertibleCounterHint,
     );
   }
 
@@ -64,6 +69,7 @@ export class PrivateKernelInitCircuitPrivateInputs {
       reader.readObject(PrivateCallData),
       reader.readBoolean(),
       Fr.fromBuffer(reader),
+      reader.readNumber(),
     );
   }
 }

package/src/kernel/private_validation_requests.ts

@@ -11,7 +11,6 @@ import { inspect } from 'util';
 import { ScopedKeyValidationRequestAndGenerator } from '../kernel/hints/scoped_key_validation_request_and_generator.js';
 import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.js';
 import { ScopedReadRequest } from './hints/read_request.js';
-import { OptionalNumber } from './utils/optional_number.js';
 
 /**
  * Validation requests accumulated during the execution of the transaction.
@@ -33,20 +32,13 @@ export class PrivateValidationRequests {
       ScopedKeyValidationRequestAndGenerator,
       typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX
     >,
-    /**
-     * The counter to split the data for squashing.
-     * A revertible nullifier and a non-revertible note hash will not be squashed.
-     * It should be the "final" minRevertibleSideEffectCounter of a tx.
-     */
-    public splitCounter: OptionalNumber,
   ) {}
 
   getSize() {
     return (
       this.noteHashReadRequests.getSize() +
       this.nullifierReadRequests.getSize() +
-      this.scopedKeyValidationRequestsAndGenerators.getSize() +
-      this.splitCounter.getSize()
+      this.scopedKeyValidationRequestsAndGenerators.getSize()
     );
   }
 
@@ -55,7 +47,6 @@ export class PrivateValidationRequests {
       this.noteHashReadRequests,
       this.nullifierReadRequests,
       this.scopedKeyValidationRequestsAndGenerators,
-      this.splitCounter,
     );
   }
 
@@ -76,7 +67,6 @@ export class PrivateValidationRequests {
       reader.readObject(
         ClaimedLengthArrayFromBuffer(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX),
       ),
-      reader.readObject(OptionalNumber),
     );
   }
 
@@ -94,7 +84,6 @@ export class PrivateValidationRequests {
       ClaimedLengthArray.empty(ScopedReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_TX),
       ClaimedLengthArray.empty(ScopedReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_TX),
       ClaimedLengthArray.empty(ScopedKeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_TX),
-      OptionalNumber.empty(),
     );
   }
 
@@ -103,7 +92,6 @@ export class PrivateValidationRequests {
   noteHashReadRequests: ${inspect(this.noteHashReadRequests)},
   nullifierReadRequests: ${inspect(this.nullifierReadRequests)},
   scopedKeyValidationRequestsAndGenerators: ${inspect(this.scopedKeyValidationRequestsAndGenerators)},
-  splitCounter: ${this.splitCounter.getSize()}
   `;
   }
 }

package/src/rollup/checkpoint_root_rollup_private_inputs.ts

@@ -1,5 +1,5 @@
 import { BlobAccumulator, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
-import { ARCHIVE_HEIGHT, BLOBS_PER_BLOCK, FIELDS_PER_BLOB } from '@aztec/constants';
+import { ARCHIVE_HEIGHT, BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB } from '@aztec/constants';
 import { BLS12Point, Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -31,13 +31,13 @@ export class CheckpointRootRollupHints {
     /**
      * Flat list of all tx effects which will be added to the blob.
      * Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-     * Tuple<Fr, FIELDS_PER_BLOB * BLOBS_PER_BLOCK>
+     * Tuple<Fr, FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT>
      */
     public blobFields: Fr[],
     /**
      * KZG commitments representing the blob (precomputed in ts, injected to use inside circuit).
      */
-    public blobCommitments: Tuple<BLS12Point, typeof BLOBS_PER_BLOCK>,
+    public blobCommitments: Tuple<BLS12Point, typeof BLOBS_PER_CHECKPOINT>,
     /**
      * The hash of eth blob hashes for this block
      * See yarn-project/foundation/src/blob/index.ts or body.ts for calculation
@@ -74,8 +74,8 @@ export class CheckpointRootRollupHints {
       reader.readObject(FinalBlobBatchingChallenges),
       // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
       // reader.readArray(FIELDS_PER_BLOB, Fr),
-      Array.from({ length: FIELDS_PER_BLOB * BLOBS_PER_BLOCK }, () => Fr.fromBuffer(reader)),
-      reader.readArray(BLOBS_PER_BLOCK, BLS12Point),
+      Array.from({ length: FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT }, () => Fr.fromBuffer(reader)),
+      reader.readArray(BLOBS_PER_CHECKPOINT, BLS12Point),
       Fr.fromBuffer(reader),
     );
   }

package/src/tests/factories.ts

@@ -663,6 +663,8 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
     contractClassLogsHashes: makeClaimedLengthArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, makeCountedLogHash, seed + 0xa00),
     startSideEffectCounter: fr(seed + 0x849),
     endSideEffectCounter: fr(seed + 0x850),
+    expectedNonRevertibleSideEffectCounter: fr(seed + 0x860),
+    expectedRevertibleSideEffectCounter: fr(seed + 0x861),
     anchorBlockHeader: makeHeader(seed + 0xd00, undefined),
     txContext: makeTxContext(seed + 0x1400),
     isFeePayer: false,

package/src/tx/public_simulation_output.ts

@@ -7,6 +7,7 @@ import { z } from 'zod';
 import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
+import { NullishToUndefined } from '../schemas/schemas.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { GlobalVariables } from './global_variables.js';
 
@@ -23,15 +24,31 @@ export class NestedProcessReturnValues {
     this.nested = nested ?? [];
   }
 
+  equals(other: NestedProcessReturnValues): boolean {
+    return (
+      this.values?.length === other.values?.length &&
+      this.nested.length === other.nested.length &&
+      (this.values === undefined || this.values.every((v, i) => v.equals(other.values![i]))) &&
+      this.nested.every((n, i) => n.equals(other.nested[i]))
+    );
+  }
+
   static get schema(): ZodFor<NestedProcessReturnValues> {
     return z
       .object({
-        values: z.array(schemas.Fr).optional(),
+        values: NullishToUndefined(z.array(schemas.Fr)),
         nested: z.array(z.lazy(() => NestedProcessReturnValues.schema)),
       })
       .transform(({ values, nested }) => new NestedProcessReturnValues(values, nested));
   }
 
+  static fromPlainObject(obj: any): NestedProcessReturnValues {
+    return new NestedProcessReturnValues(
+      obj.values?.map(Fr.fromPlainObject),
+      obj.nested?.map(NestedProcessReturnValues.fromPlainObject),
+    );
+  }
+
   static empty() {
     return new NestedProcessReturnValues([]);
   }