@aztec/stdlib 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/src/kernel/hints/build_nullifier_read_request_hints.ts

@@ -3,10 +3,10 @@ import {
   MAX_NULLIFIER_READ_REQUESTS_PER_TX,
   type NULLIFIER_TREE_HEIGHT,
 } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
-import { type IndexedTreeLeafPreimage, MembershipWitness } from '@aztec/foundation/trees';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { MembershipWitness } from '@aztec/foundation/trees';
 
-import { siloNullifier } from '../../hash/hash.js';
+import type { NullifierLeafPreimage } from '../../trees/nullifier_leaf.js';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
 import type { ScopedNullifier } from '../nullifier.js';
 import { NullifierReadRequestHintsBuilder } from './nullifier_read_request_hints.js';
@@ -24,7 +24,7 @@ export function isValidNullifierReadRequest(readRequest: ScopedReadRequest, null
 
 interface NullifierMembershipWitnessWithPreimage {
   membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
-  leafPreimage: IndexedTreeLeafPreimage;
+  leafPreimage: NullifierLeafPreimage;
 }
 
 export function getNullifierReadRequestResetActions(
@@ -73,7 +73,6 @@ export async function buildNullifierReadRequestHintsFromResetActions<PENDING ext
   resetActions: ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
   maxPending: PENDING = MAX_NULLIFIER_READ_REQUESTS_PER_TX as PENDING,
   maxSettled: SETTLED = MAX_NULLIFIER_READ_REQUESTS_PER_TX as SETTLED,
-  siloed = false,
 ) {
   const builder = new NullifierReadRequestHintsBuilder(maxPending, maxSettled);
 
@@ -81,21 +80,28 @@ export async function buildNullifierReadRequestHintsFromResetActions<PENDING ext
     builder.addPendingReadRequest(hint.readRequestIndex, hint.pendingValueIndex);
   });
 
+  // Collect all settled read requests
+  const settledRequests: { index: number; readRequest: ScopedReadRequest }[] = [];
   for (let i = 0; i < resetActions.actions.length; i++) {
     if (resetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
-      const readRequest = nullifierReadRequests.array[i];
-      const siloedValue = siloed
-        ? readRequest.value
-        : await siloNullifier(readRequest.contractAddress, readRequest.value);
-      const membershipWitnessWithPreimage = await oracle.getNullifierMembershipWitness(siloedValue);
-      builder.addSettledReadRequest(
-        i,
-        membershipWitnessWithPreimage.membershipWitness,
-        membershipWitnessWithPreimage.leafPreimage,
-      );
+      settledRequests.push({ index: i, readRequest: nullifierReadRequests.array[i] });
     }
   }
 
+  const siloedValues = settledRequests.map(({ readRequest }) => readRequest.value);
+
+  // Fetch all membership witnesses in parallel
+  const membershipWitnesses = await Promise.all(siloedValues.map(value => oracle.getNullifierMembershipWitness(value)));
+
+  // Add settled read requests to builder
+  for (let i = 0; i < settledRequests.length; i++) {
+    builder.addSettledReadRequest(
+      settledRequests[i].index,
+      membershipWitnesses[i].membershipWitness,
+      membershipWitnesses[i].leafPreimage,
+    );
+  }
+
   return builder.toHints();
 }
 
@@ -108,7 +114,6 @@ export async function buildNullifierReadRequestHints<PENDING extends number, SET
   futureNullifiers: ScopedNullifier[],
   maxPending: PENDING = MAX_NULLIFIER_READ_REQUESTS_PER_TX as PENDING,
   maxSettled: SETTLED = MAX_NULLIFIER_READ_REQUESTS_PER_TX as SETTLED,
-  siloed = false,
 ) {
   const resetActions = getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers, futureNullifiers);
   return await buildNullifierReadRequestHintsFromResetActions(
@@ -117,6 +122,5 @@ export async function buildNullifierReadRequestHints<PENDING extends number, SET
     resetActions,
     maxPending,
     maxSettled,
-    siloed,
   );
 }

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/find_private_kernel_reset_dimensions.ts

@@ -1,3 +1,5 @@
+import { isDefined } from '@aztec/foundation/types';
+
 import {
   PrivateKernelResetDimensions,
   type PrivateKernelResetDimensionsConfig,
@@ -10,10 +12,6 @@ interface DimensionOption {
   remainder?: PrivateKernelResetDimensions;
 }
 
-function isDefined<T>(value: T | undefined): value is T {
-  return value !== undefined;
-}
-
 function computeCost(dimensions: PrivateKernelResetDimensions, config: PrivateKernelResetDimensionsConfig) {
   return privateKernelResetDimensionNames.reduce(
     (accum, name) => accum + dimensions[name] * config.dimensions[name].cost,

package/src/kernel/hints/index.ts

@@ -6,10 +6,10 @@ export * from './note_hash_read_request_hints.js';
 export * from './nullifier_read_request_hints.js';
 export * from './read_request_hints.js';
 export * from './key_validation_hint.js';
-export * from './key_validation_request_and_generator.js';
+export * from './key_validation_request_and_separator.js';
 export * from './read_request.js';
 export * from './key_validation_request.js';
-export * from './scoped_key_validation_request_and_generator.js';
+export * from './scoped_key_validation_request_and_separator.js';
 export * from './transient_data_squashing_hint.js';
 export * from './private_kernel_reset_hints.js';
 export * from './tree_leaf_read_request.js';

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_separator.ts

@@ -0,0 +1,49 @@
+import { KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { KeyValidationRequest } from './key_validation_request.js';
+
+/**
+ * Request for validating keys used in the app, along with a domain separator for the key type.
+ */
+export class KeyValidationRequestAndSeparator {
+  constructor(
+    /** The key validation request. */
+    public readonly request: KeyValidationRequest,
+    /** Domain separator for the key type, used along with sk_m to derive the sk_app stored in the request. */
+    public readonly keyTypeDomainSeparator: Fr,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(this.request, this.keyTypeDomainSeparator);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new KeyValidationRequestAndSeparator(reader.readObject(KeyValidationRequest), Fr.fromBuffer(reader));
+  }
+
+  toFields(): Fr[] {
+    const fields = [...this.request.toFields(), this.keyTypeDomainSeparator];
+    if (fields.length !== KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH) {
+      throw new Error(
+        `Invalid number of fields for KeyValidationRequestAndSeparator. Expected ${KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`,
+      );
+    }
+    return fields;
+  }
+
+  static fromFields(fields: Fr[] | FieldReader): KeyValidationRequestAndSeparator {
+    const reader = FieldReader.asReader(fields);
+    return new KeyValidationRequestAndSeparator(KeyValidationRequest.fromFields(reader), reader.readField());
+  }
+
+  isEmpty() {
+    return this.request.isEmpty() && this.keyTypeDomainSeparator.isZero();
+  }
+
+  static empty() {
+    return new KeyValidationRequestAndSeparator(KeyValidationRequest.empty(), Fr.ZERO);
+  }
+}

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/nullifier_read_request_hints.ts

@@ -1,7 +1,7 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import type { BufferReader } from '@aztec/foundation/serialize';
-import type { MembershipWitness, TreeLeafPreimage } from '@aztec/foundation/trees';
+import type { MembershipWitness } from '@aztec/foundation/trees';
 
 import { NullifierLeafPreimage } from '../../trees/index.js';
 import { PendingReadHint, ReadRequestAction, ReadRequestResetHints, SettledReadHint } from './read_request_hints.js';
@@ -11,7 +11,7 @@ export type NullifierReadRequestHints<PENDING extends number, SETTLED extends nu
   PENDING,
   SETTLED,
   typeof NULLIFIER_TREE_HEIGHT,
-  TreeLeafPreimage
+  NullifierLeafPreimage
 >;
 
 export function nullifierReadRequestHintsFromBuffer<PENDING extends number, SETTLED extends number>(
@@ -64,7 +64,7 @@ export class NullifierReadRequestHintsBuilder<PENDING extends number, SETTLED ex
   addSettledReadRequest(
     readRequestIndex: number,
     membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>,
-    leafPreimage: TreeLeafPreimage,
+    leafPreimage: NullifierLeafPreimage,
   ) {
     if (this.numSettledReadHints === this.maxSettled) {
       throw new Error('Cannot add more settled read request.');

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 → scoped_key_validation_request_and_separator.ts}

@@ -1,16 +1,16 @@
 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';
-import { KeyValidationRequestAndGenerator } from './key_validation_request_and_generator.js';
+import { KeyValidationRequestAndSeparator } from './key_validation_request_and_separator.js';
 
 /**
  * Request for validating keys used in the app.
  */
-export class ScopedKeyValidationRequestAndGenerator {
+export class ScopedKeyValidationRequestAndSeparator {
   constructor(
-    public readonly request: KeyValidationRequestAndGenerator,
+    public readonly request: KeyValidationRequestAndSeparator,
     public readonly contractAddress: AztecAddress,
   ) {}
 
@@ -20,8 +20,8 @@ export class ScopedKeyValidationRequestAndGenerator {
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new ScopedKeyValidationRequestAndGenerator(
-      KeyValidationRequestAndGenerator.fromBuffer(reader),
+    return new ScopedKeyValidationRequestAndSeparator(
+      KeyValidationRequestAndSeparator.fromBuffer(reader),
       AztecAddress.fromBuffer(reader),
     );
   }
@@ -30,16 +30,16 @@ export class ScopedKeyValidationRequestAndGenerator {
     const fields = [...this.request.toFields(), this.contractAddress.toField()];
     if (fields.length !== SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH) {
       throw new Error(
-        `Invalid number of fields for ScopedKeyValidationRequestAndGenerator. Expected ${SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`,
+        `Invalid number of fields for ScopedKeyValidationRequestAndSeparator. Expected ${SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH}, got ${fields.length}`,
       );
     }
     return fields;
   }
 
-  static fromFields(fields: Fr[] | FieldReader): ScopedKeyValidationRequestAndGenerator {
+  static fromFields(fields: Fr[] | FieldReader): ScopedKeyValidationRequestAndSeparator {
     const reader = FieldReader.asReader(fields);
-    return new ScopedKeyValidationRequestAndGenerator(
-      KeyValidationRequestAndGenerator.fromFields(reader),
+    return new ScopedKeyValidationRequestAndSeparator(
+      KeyValidationRequestAndSeparator.fromFields(reader),
       AztecAddress.fromFields(reader),
     );
   }
@@ -49,6 +49,6 @@ export class ScopedKeyValidationRequestAndGenerator {
   }
 
   static empty() {
-    return new ScopedKeyValidationRequestAndGenerator(KeyValidationRequestAndGenerator.empty(), AztecAddress.ZERO);
+    return new ScopedKeyValidationRequestAndSeparator(KeyValidationRequestAndSeparator.empty(), AztecAddress.ZERO);
   }
 }

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';
@@ -7,38 +7,38 @@ import type { Ordered } from './utils/interfaces.js';
 export class Nullifier implements Ordered {
   constructor(
     public value: Fr,
-    public counter: number,
     public noteHash: Fr,
+    public counter: number,
   ) {}
 
   toFields(): Fr[] {
-    return [this.value, new Fr(this.counter), this.noteHash];
+    return [this.value, this.noteHash, new Fr(this.counter)];
   }
 
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
-    return new Nullifier(reader.readField(), reader.readU32(), reader.readField());
+    return new Nullifier(reader.readField(), reader.readField(), reader.readU32());
   }
 
   isEmpty() {
-    return this.value.isZero() && !this.counter && this.noteHash.isZero();
+    return this.value.isZero() && this.noteHash.isZero() && !this.counter;
   }
 
   static empty() {
-    return new Nullifier(Fr.zero(), 0, Fr.zero());
+    return new Nullifier(Fr.zero(), Fr.zero(), 0);
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer(this.value, this.counter, this.noteHash);
+    return serializeToBuffer(this.value, this.noteHash, this.counter);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new Nullifier(Fr.fromBuffer(reader), reader.readNumber(), Fr.fromBuffer(reader));
+    return new Nullifier(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readNumber());
   }
 
   toString(): string {
-    return `value=${this.value} counter=${this.counter} noteHash=${this.noteHash}`;
+    return `value=${this.value} noteHash=${this.noteHash} counter=${this.counter}`;
   }
 
   scope(contractAddress: AztecAddress) {

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,17 +1,12 @@
-import {
-  FUNCTION_TREE_HEIGHT,
-  PROTOCOL_CONTRACT_TREE_HEIGHT,
-  PUBLIC_DATA_TREE_HEIGHT,
-  UPDATES_VALUE_SIZE,
-} from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
+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';
 
 import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { ProtocolContractLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { PublicDataTreeLeafPreimage } from '../trees/index.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 
@@ -94,16 +89,6 @@ export class PrivateVerificationKeyHints {
      * The membership witness for the function leaf corresponding to the function being invoked.
      */
     public functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>,
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    public protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>,
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    public protocolContractLeaf: ProtocolContractLeafPreimage,
 
     public updatedClassIdHints: UpdatedClassIdHints,
   ) {}
@@ -120,8 +105,6 @@ export class PrivateVerificationKeyHints {
       fields.publicKeys,
       fields.saltedInitializationHash,
       fields.functionLeafMembershipWitness,
-      fields.protocolContractMembershipWitness,
-      fields.protocolContractLeaf,
       fields.updatedClassIdHints,
     ] as const;
   }
@@ -151,8 +134,6 @@ export class PrivateVerificationKeyHints {
       reader.readObject(PublicKeys),
       reader.readObject(Fr),
       reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)),
-      reader.readObject(MembershipWitness.deserializer(PROTOCOL_CONTRACT_TREE_HEIGHT)),
-      reader.readObject(ProtocolContractLeafPreimage),
       reader.readObject(UpdatedClassIdHints),
     );
   }

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';