@aztec/pxe 3.0.0-nightly.20251201.2 → 3.0.0-nightly.20251203

package/src/private_kernel/private_kernel_execution_prover.ts

@@ -35,7 +35,6 @@ import {
 import { VerificationKeyAsFields, VerificationKeyData, VkData } from '@aztec/stdlib/vks';
 
 import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js';
-import { computeSideEffectUniquenessHints } from './hints/compute_side_effect_uniqueness_hints.js';
 import type { PrivateKernelOracle } from './private_kernel_oracle.js';
 
 const NULL_SIMULATE_OUTPUT: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs> = {
@@ -417,8 +416,6 @@ export class PrivateKernelExecutionProver {
 
     const updatedClassIdHints = await this.oracle.getUpdatedClassIdHints(contractAddress);
 
-    const sideEffectUniquenessHints = computeSideEffectUniquenessHints(publicInputs);
-
     return PrivateCallData.from({
       publicInputs,
       vk,
@@ -430,7 +427,6 @@ export class PrivateKernelExecutionProver {
         functionLeafMembershipWitness,
         updatedClassIdHints,
       }),
-      sideEffectUniquenessHints,
     });
   }
 }

package/src/storage/note_data_provider/note_data_provider.ts

@@ -3,7 +3,7 @@ import type { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { InBlock } from '@aztec/stdlib/block';
+import type { DataInBlock } from '@aztec/stdlib/block';
 import { NoteStatus, type NotesFilter } from '@aztec/stdlib/note';
 import { NoteDao } from '@aztec/stdlib/note';
 
@@ -224,7 +224,7 @@ export class NoteDataProvider {
    * parameters.
    *
    * @param filter - Filter criteria including contractAddress (required), and optional
-   *                 storageSlot, status, scopes and siloedNullifier.
+   *                 owner, storageSlot, status, scopes, and siloedNullifier.
    * @returns Promise resolving to array of NoteDao objects matching the filter
    * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
    */
@@ -307,6 +307,10 @@ export class NoteDataProvider {
           continue;
         }
 
+        if (filter.owner && !note.owner.equals(filter.owner)) {
+          continue;
+        }
+
         if (filter.storageSlot && !note.storageSlot.equals(filter.storageSlot!)) {
           continue;
         }
@@ -333,7 +337,7 @@ export class NoteDataProvider {
    * @returns Promise resolving to array of nullified NoteDao objects
    * @throws Error if any nullifier is not found in the active notes
    */
-  applyNullifiers(nullifiers: InBlock<Fr>[]): Promise<NoteDao[]> {
+  applyNullifiers(nullifiers: DataInBlock<Fr>[]): Promise<NoteDao[]> {
     if (nullifiers.length === 0) {
       return Promise.resolve([]);
     }

package/dest/private_kernel/hints/compute_side_effect_uniqueness_hints.d.ts

@@ -1,3 +0,0 @@
-import { type PrivateCircuitPublicInputs, SideEffectUniquenessHints } from '@aztec/stdlib/kernel';
-export declare function computeSideEffectUniquenessHints(publicInputs: PrivateCircuitPublicInputs): SideEffectUniquenessHints;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZV9zaWRlX2VmZmVjdF91bmlxdWVuZXNzX2hpbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJpdmF0ZV9rZXJuZWwvaGludHMvY29tcHV0ZV9zaWRlX2VmZmVjdF91bmlxdWVuZXNzX2hpbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXdCQSxPQUFPLEVBR0wsS0FBSywwQkFBMEIsRUFFL0IseUJBQXlCLEVBQzFCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsd0JBQWdCLGdDQUFnQyxDQUFDLFlBQVksRUFBRSwwQkFBMEIsR0FBRyx5QkFBeUIsQ0F3SHBIIn0=

package/dest/private_kernel/hints/compute_side_effect_uniqueness_hints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"compute_side_effect_uniqueness_hints.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/compute_side_effect_uniqueness_hints.ts"],"names":[],"mappings":"AAwBA,OAAO,EAGL,KAAK,0BAA0B,EAE/B,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAE9B,wBAAgB,gCAAgC,CAAC,YAAY,EAAE,0BAA0B,GAAG,yBAAyB,CAwHpH"}

package/dest/private_kernel/hints/compute_side_effect_uniqueness_hints.js

@@ -1,48 +0,0 @@
-import { GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET, GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET, GLOBAL_INDEX_NOTE_HASH_OFFSET, GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET, GLOBAL_INDEX_NULLIFIER_OFFSET, GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET, GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET, GLOBAL_INDEX_PRIVATE_LOG_OFFSET, GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET, MAX_CONTRACT_CLASS_LOGS_PER_CALL, MAX_ENQUEUED_CALLS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { SideEffectCounterRange, SideEffectUniquenessHints } from '@aztec/stdlib/kernel';
-export function computeSideEffectUniquenessHints(publicInputs) {
-    let sideEffectRanges = [];
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.noteHashReadRequests, GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.nullifierReadRequests, GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.noteHashes, GLOBAL_INDEX_NOTE_HASH_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.nullifiers, GLOBAL_INDEX_NULLIFIER_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.privateCallRequests, GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET, createRangeFromPrivateCallRequest));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.publicCallRequests, GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.l2ToL1Msgs, GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.privateLogs, GLOBAL_INDEX_PRIVATE_LOG_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges = sideEffectRanges.concat(createRangesFromClaimedLengthArray(publicInputs.contractClassLogsHashes, GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET, createRangeFromCountedItem));
-    sideEffectRanges.sort((a, b)=>a.start - b.start);
-    const sideEffectRangeIndices = makeTuple(TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL, ()=>0);
-    for(let i = 0; i < sideEffectRanges.length; i++){
-        const range = sideEffectRanges[i];
-        sideEffectRangeIndices[range.sideEffectGlobalIndex] = i;
-    }
-    const hints = SideEffectUniquenessHints.from({
-        sideEffectRanges: padArrayEnd(sideEffectRanges, SideEffectCounterRange.empty(), TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL),
-        noteHashReadRequestIndices: makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET]),
-        nullifierReadRequestIndices: makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET]),
-        noteHashesIndices: makeTuple(MAX_NOTE_HASHES_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_NOTE_HASH_OFFSET]),
-        nullifiersIndices: makeTuple(MAX_NULLIFIERS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_NULLIFIER_OFFSET]),
-        privateCallRequestsIndices: makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET]),
-        publicCallRequestsIndices: makeTuple(MAX_ENQUEUED_CALLS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET]),
-        l2ToL1MsgsIndices: makeTuple(MAX_L2_TO_L1_MSGS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET]),
-        privateLogsIndices: makeTuple(MAX_PRIVATE_LOGS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_PRIVATE_LOG_OFFSET]),
-        contractClassLogsHashesIndices: makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, (i)=>sideEffectRangeIndices[i + GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET])
-    });
-    return hints;
-}
-function createRangesFromClaimedLengthArray(array, globalIndexOffset, rangeConstructor) {
-    const ranges = [];
-    for(let i = 0; i < array.claimedLength; i++){
-        ranges.push(rangeConstructor(array.array[i], globalIndexOffset + i));
-    }
-    return ranges;
-}
-function createRangeFromCountedItem(item, globalIndex) {
-    return new SideEffectCounterRange(item.counter, item.counter, globalIndex);
-}
-function createRangeFromPrivateCallRequest(item, globalIndex) {
-    return new SideEffectCounterRange(item.startSideEffectCounter, item.endSideEffectCounter, globalIndex);
-}

package/src/private_kernel/hints/compute_side_effect_uniqueness_hints.ts

@@ -1,173 +0,0 @@
-import {
-  GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET,
-  GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET,
-  GLOBAL_INDEX_NOTE_HASH_OFFSET,
-  GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET,
-  GLOBAL_INDEX_NULLIFIER_OFFSET,
-  GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET,
-  GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET,
-  GLOBAL_INDEX_PRIVATE_LOG_OFFSET,
-  GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET,
-  MAX_CONTRACT_CLASS_LOGS_PER_CALL,
-  MAX_ENQUEUED_CALLS_PER_CALL,
-  MAX_L2_TO_L1_MSGS_PER_CALL,
-  MAX_NOTE_HASHES_PER_CALL,
-  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
-  MAX_NULLIFIERS_PER_CALL,
-  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
-  MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-  MAX_PRIVATE_LOGS_PER_CALL,
-  TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL,
-} from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import type { Serializable } from '@aztec/foundation/serialize';
-import {
-  ClaimedLengthArray,
-  PrivateCallRequest,
-  type PrivateCircuitPublicInputs,
-  SideEffectCounterRange,
-  SideEffectUniquenessHints,
-} from '@aztec/stdlib/kernel';
-
-export function computeSideEffectUniquenessHints(publicInputs: PrivateCircuitPublicInputs): SideEffectUniquenessHints {
-  let sideEffectRanges: SideEffectCounterRange[] = [];
-
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.noteHashReadRequests,
-      GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.nullifierReadRequests,
-      GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.noteHashes,
-      GLOBAL_INDEX_NOTE_HASH_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.nullifiers,
-      GLOBAL_INDEX_NULLIFIER_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.privateCallRequests,
-      GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET,
-      createRangeFromPrivateCallRequest,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.publicCallRequests,
-      GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.l2ToL1Msgs,
-      GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.privateLogs,
-      GLOBAL_INDEX_PRIVATE_LOG_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-  sideEffectRanges = sideEffectRanges.concat(
-    createRangesFromClaimedLengthArray(
-      publicInputs.contractClassLogsHashes,
-      GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET,
-      createRangeFromCountedItem,
-    ),
-  );
-
-  sideEffectRanges.sort((a, b) => a.start - b.start);
-
-  const sideEffectRangeIndices = makeTuple(TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL, () => 0);
-  for (let i = 0; i < sideEffectRanges.length; i++) {
-    const range = sideEffectRanges[i];
-    sideEffectRangeIndices[range.sideEffectGlobalIndex] = i;
-  }
-
-  const hints = SideEffectUniquenessHints.from({
-    sideEffectRanges: padArrayEnd(
-      sideEffectRanges,
-      SideEffectCounterRange.empty(),
-      TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL,
-    ),
-    noteHashReadRequestIndices: makeTuple(
-      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET],
-    ),
-    nullifierReadRequestIndices: makeTuple(
-      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET],
-    ),
-    noteHashesIndices: makeTuple(
-      MAX_NOTE_HASHES_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_NOTE_HASH_OFFSET],
-    ),
-    nullifiersIndices: makeTuple(
-      MAX_NULLIFIERS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_NULLIFIER_OFFSET],
-    ),
-    privateCallRequestsIndices: makeTuple(
-      MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET],
-    ),
-    publicCallRequestsIndices: makeTuple(
-      MAX_ENQUEUED_CALLS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET],
-    ),
-    l2ToL1MsgsIndices: makeTuple(
-      MAX_L2_TO_L1_MSGS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET],
-    ),
-    privateLogsIndices: makeTuple(
-      MAX_PRIVATE_LOGS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_PRIVATE_LOG_OFFSET],
-    ),
-    contractClassLogsHashesIndices: makeTuple(
-      MAX_CONTRACT_CLASS_LOGS_PER_CALL,
-      i => sideEffectRangeIndices[i + GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET],
-    ),
-  });
-
-  return hints;
-}
-
-function createRangesFromClaimedLengthArray<T extends Serializable, N extends number>(
-  array: ClaimedLengthArray<T, N>,
-  globalIndexOffset: number,
-  rangeConstructor: (item: T, globalIndex: number) => SideEffectCounterRange,
-): SideEffectCounterRange[] {
-  const ranges = [];
-  for (let i = 0; i < array.claimedLength; i++) {
-    ranges.push(rangeConstructor(array.array[i], globalIndexOffset + i));
-  }
-  return ranges;
-}
-
-function createRangeFromCountedItem(item: { counter: number }, globalIndex: number): SideEffectCounterRange {
-  return new SideEffectCounterRange(item.counter, item.counter, globalIndex);
-}
-
-function createRangeFromPrivateCallRequest(item: PrivateCallRequest, globalIndex: number): SideEffectCounterRange {
-  return new SideEffectCounterRange(item.startSideEffectCounter, item.endSideEffectCounter, globalIndex);
-}