@aztec/pxe 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/contract_function_simulator/noir-structs/ephemeral_array.d.ts

@@ -0,0 +1,37 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { EphemeralArrayService } from '../ephemeral_array_service.js';
+import type { TypeMapping } from '../oracle/oracle_registry.js';
+/**
+ * TypeScript counterpart of Noir's `EphemeralArray<T>`.
+ *
+ * An ephemeral array looks very different depending on whether it's being produced (as an oracle return value) or
+ * consumed (as an oracle parameter), so we use a discriminated state to model both without leaking those details to
+ * callers:
+ *
+ * - As a return value (`output` mode), what we have are the typed values the oracle just computed. The slot is just
+ *   an implementation detail of how those values get handed back to ACVM, so we hold onto the values and the service
+ *   they will eventually live in, and only materialize a slot when something actually asks for it.
+ *
+ * - As a parameter (`input` mode), what we have is a slot pointing at fields ACVM already wrote into the service,
+ *   plus the TypeMapping that knows how to interpret those fields. We hold onto both so callers can later ask for
+ *   the typed values without having to think about deserialization.
+ *
+ * In both modes the idea is the same: store everything we already know at construction time, so the rest of the
+ * code can work with typed values and never touch slots, services, or TypeMappings directly.
+ */
+export declare class EphemeralArray<T> {
+    private readonly state;
+    private constructor();
+    /** Create an output-mode array carrying typed values. The service is only used if/when the slot is materialized. */
+    static fromValues<T>(service: EphemeralArrayService, values: T[]): EphemeralArray<T>;
+    /** Wrap an existing slot. Intended for the EPHEMERAL_ARRAY combinator during ACVM deserialization. */
+    static fromSlot<T>(slot: Fr, mapping: TypeMapping<T>): EphemeralArray<T>;
+    /**
+     * Returns the slot, materializing values into the service on first call for output-mode arrays.
+     * Intended for the EPHEMERAL_ARRAY combinator during ACVM serialization.
+     */
+    materializeSlot(serializeItem: (v: T) => Fr[]): Fr;
+    /** Read all elements: returns stored values for output-mode arrays, deserializes from the service for input-mode. */
+    readAll(service: EphemeralArrayService): T[];
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBoZW1lcmFsX2FycmF5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9lcGhlbWVyYWxfYXJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHekQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUVoRTs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCxxQkFBYSxjQUFjLENBQUMsQ0FBQztJQUNQLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUExQyxPQUFPLGVBQStEO0lBRXRFLG9IQUFvSDtJQUNwSCxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FFbkY7SUFFRCxzR0FBc0c7SUFDdEcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FFdkU7SUFFRDs7O09BR0c7SUFDSCxlQUFlLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUUsR0FBRyxFQUFFLENBUWpEO0lBRUQscUhBQXFIO0lBQ3JILE9BQU8sQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsQ0FBQyxFQUFFLENBUTNDO0NBQ0YifQ==

package/dest/contract_function_simulator/noir-structs/ephemeral_array.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ephemeral_array.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/ephemeral_array.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,cAAc,CAAC,CAAC;IACP,OAAO,CAAC,QAAQ,CAAC,KAAK;IAA1C,OAAO,eAA+D;IAEtE,oHAAoH;IACpH,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAEnF;IAED,sGAAsG;IACtG,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAEvE;IAED;;;OAGG;IACH,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAQjD;IAED,qHAAqH;IACrH,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,CAAC,EAAE,CAQ3C;CACF"}

package/dest/contract_function_simulator/noir-structs/ephemeral_array.js

@@ -0,0 +1,59 @@
+import { FieldReader } from '@aztec/foundation/serialize';
+/**
+ * TypeScript counterpart of Noir's `EphemeralArray<T>`.
+ *
+ * An ephemeral array looks very different depending on whether it's being produced (as an oracle return value) or
+ * consumed (as an oracle parameter), so we use a discriminated state to model both without leaking those details to
+ * callers:
+ *
+ * - As a return value (`output` mode), what we have are the typed values the oracle just computed. The slot is just
+ *   an implementation detail of how those values get handed back to ACVM, so we hold onto the values and the service
+ *   they will eventually live in, and only materialize a slot when something actually asks for it.
+ *
+ * - As a parameter (`input` mode), what we have is a slot pointing at fields ACVM already wrote into the service,
+ *   plus the TypeMapping that knows how to interpret those fields. We hold onto both so callers can later ask for
+ *   the typed values without having to think about deserialization.
+ *
+ * In both modes the idea is the same: store everything we already know at construction time, so the rest of the
+ * code can work with typed values and never touch slots, services, or TypeMappings directly.
+ */ export class EphemeralArray {
+    state;
+    constructor(state){
+        this.state = state;
+    }
+    /** Create an output-mode array carrying typed values. The service is only used if/when the slot is materialized. */ static fromValues(service, values) {
+        return new EphemeralArray({
+            kind: 'output',
+            service,
+            values
+        });
+    }
+    /** Wrap an existing slot. Intended for the EPHEMERAL_ARRAY combinator during ACVM deserialization. */ static fromSlot(slot, mapping) {
+        return new EphemeralArray({
+            kind: 'input',
+            slot,
+            mapping
+        });
+    }
+    /**
+   * Returns the slot, materializing values into the service on first call for output-mode arrays.
+   * Intended for the EPHEMERAL_ARRAY combinator during ACVM serialization.
+   */ materializeSlot(serializeItem) {
+        if (this.state.kind === 'input') {
+            return this.state.slot;
+        }
+        if (this.state.cachedSlot === undefined) {
+            this.state.cachedSlot = this.state.service.newArray(this.state.values.map(serializeItem));
+        }
+        return this.state.cachedSlot;
+    }
+    /** Read all elements: returns stored values for output-mode arrays, deserializes from the service for input-mode. */ readAll(service) {
+        if (this.state.kind === 'output') {
+            return this.state.values;
+        }
+        const mapping = this.state.mapping;
+        return service.readArrayAt(this.state.slot).map((fields)=>mapping.deserialization.fn([
+                FieldReader.asReader(fields)
+            ]));
+    }
+}

package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts

@@ -1,20 +1,20 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { EventSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { TxHash } from '@aztec/stdlib/tx';
 /**
- * Intermediate struct used to perform batch event validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
- * expects for values of this type to be stored in a `CapsuleArray`.
+ * Intermediate struct used to perform batch event validation by PXE. The `utilityValidateAndStoreEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `EphemeralArray`.
  */
 export declare class EventValidationRequest {
     contractAddress: AztecAddress;
     eventTypeId: EventSelector;
+    randomness: Fr;
     serializedEvent: Fr[];
     eventCommitment: Fr;
     txHash: TxHash;
-    recipient: AztecAddress;
-    constructor(contractAddress: AztecAddress, eventTypeId: EventSelector, serializedEvent: Fr[], eventCommitment: Fr, txHash: TxHash, recipient: AztecAddress);
+    constructor(contractAddress: AztecAddress, eventTypeId: EventSelector, randomness: Fr, serializedEvent: Fr[], eventCommitment: Fr, txHash: TxHash);
     static fromFields(fields: Fr[] | FieldReader): EventValidationRequest;
 }
-//# sourceMappingURL=event_validation_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRfdmFsaWRhdGlvbl9yZXF1ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9ldmVudF92YWxpZGF0aW9uX3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxxQkFBYSxzQkFBc0I7SUFFeEIsZUFBZSxFQUFFLFlBQVk7SUFDN0IsV0FBVyxFQUFFLGFBQWE7SUFDMUIsVUFBVSxFQUFFLEVBQUU7SUFDZCxlQUFlLEVBQUUsRUFBRSxFQUFFO0lBQ3JCLGVBQWUsRUFBRSxFQUFFO0lBQ25CLE1BQU0sRUFBRSxNQUFNO0lBTnZCLFlBQ1MsZUFBZSxFQUFFLFlBQVksRUFDN0IsV0FBVyxFQUFFLGFBQWEsRUFDMUIsVUFBVSxFQUFFLEVBQUUsRUFDZCxlQUFlLEVBQUUsRUFBRSxFQUFFLEVBQ3JCLGVBQWUsRUFBRSxFQUFFLEVBQ25CLE1BQU0sRUFBRSxNQUFNLEVBQ25CO0lBRUosTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLHNCQUFzQixDQThCcEU7Q0FDRiJ9

package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event_validation_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/event_validation_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK1C;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,EAAE,EAAE;IACrB,eAAe,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,YAAY;gBALvB,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,aAAa,EAC1B,eAAe,EAAE,EAAE,EAAE,EACrB,eAAe,EAAE,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAGhC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB;CAuBtE"}
+{"version":3,"file":"event_validation_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/event_validation_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,EAAE;IACd,eAAe,EAAE,EAAE,EAAE;IACrB,eAAe,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM;IANvB,YACS,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,aAAa,EAC1B,UAAU,EAAE,EAAE,EACd,eAAe,EAAE,EAAE,EAAE,EACrB,eAAe,EAAE,EAAE,EACnB,MAAM,EAAE,MAAM,EACnB;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,sBAAsB,CA8BpE;CACF"}

package/dest/contract_function_simulator/noir-structs/event_validation_request.js

@@ -2,36 +2,38 @@ import { FieldReader } from '@aztec/foundation/serialize';
 import { EventSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { TxHash } from '@aztec/stdlib/tx';
-// TODO(#14617): should we compute this from constants? This value is aztec-nr specific.
-const MAX_EVENT_SERIALIZED_LEN = 12;
 /**
- * Intermediate struct used to perform batch event validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
- * expects for values of this type to be stored in a `CapsuleArray`.
+ * Intermediate struct used to perform batch event validation by PXE. The `utilityValidateAndStoreEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `EphemeralArray`.
  */ export class EventValidationRequest {
     contractAddress;
     eventTypeId;
+    randomness;
     serializedEvent;
     eventCommitment;
     txHash;
-    recipient;
-    constructor(contractAddress, eventTypeId, serializedEvent, eventCommitment, txHash, recipient){
+    constructor(contractAddress, eventTypeId, randomness, serializedEvent, eventCommitment, txHash){
         this.contractAddress = contractAddress;
         this.eventTypeId = eventTypeId;
+        this.randomness = randomness;
         this.serializedEvent = serializedEvent;
         this.eventCommitment = eventCommitment;
         this.txHash = txHash;
-        this.recipient = recipient;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
         const contractAddress = AztecAddress.fromField(reader.readField());
         const eventTypeId = EventSelector.fromField(reader.readField());
-        const eventStorage = reader.readFieldArray(MAX_EVENT_SERIALIZED_LEN);
+        const randomness = reader.readField();
+        const maxEventSerializedLen = reader.readField().toNumber();
+        const eventStorage = reader.readFieldArray(maxEventSerializedLen);
         const eventLen = reader.readField().toNumber();
         const serializedEvent = eventStorage.slice(0, eventLen);
         const eventCommitment = reader.readField();
         const txHash = TxHash.fromField(reader.readField());
-        const recipient = AztecAddress.fromField(reader.readField());
-        return new EventValidationRequest(contractAddress, eventTypeId, serializedEvent, eventCommitment, txHash, recipient);
+        if (reader.remainingFields() !== 0) {
+            throw new Error(`Error converting array of fields to EventValidationRequest: expected ${reader.cursor} fields but received ${reader.cursor + reader.remainingFields()} (maxEventSerializedLen=${maxEventSerializedLen}).`);
+        }
+        return new EventValidationRequest(contractAddress, eventTypeId, randomness, serializedEvent, eventCommitment, txHash);
     }
 }

package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts

@@ -1,15 +1,26 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tag } from '@aztec/stdlib/logs';
+/** Discriminant for which log source to query. */
+export declare enum LogSource {
+    PRIVATE = 0,
+    PUBLIC = 1,
+    PUBLIC_AND_PRIVATE = 2
+}
 /**
  * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle expects values of this
- * type to be stored in a `CapsuleArray`.
+ * type to be stored in a `EphemeralArray`.
  */
 export declare class LogRetrievalRequest {
     contractAddress: AztecAddress;
-    unsiloedTag: Fr;
-    constructor(contractAddress: AztecAddress, unsiloedTag: Fr);
+    tag: Tag;
+    source: LogSource;
+    fromBlock?: BlockNumber | undefined;
+    toBlock?: BlockNumber | undefined;
+    constructor(contractAddress: AztecAddress, tag: Tag, source?: LogSource, fromBlock?: BlockNumber | undefined, toBlock?: BlockNumber | undefined);
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): LogRetrievalRequest;
 }
-//# sourceMappingURL=log_retrieval_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3JldHJpZXZhbF9yZXF1ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9sb2dfcmV0cmlldmFsX3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV6QyxrREFBa0Q7QUFDbEQsb0JBQVksU0FBUztJQUNuQixPQUFPLElBQUk7SUFDWCxNQUFNLElBQUk7SUFDVixrQkFBa0IsSUFBSTtDQUN2QjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQjtJQUVyQixlQUFlLEVBQUUsWUFBWTtJQUM3QixHQUFHLEVBQUUsR0FBRztJQUNSLE1BQU0sRUFBRSxTQUFTO0lBQ2pCLFNBQVMsQ0FBQztJQUNWLE9BQU8sQ0FBQztJQUxqQixZQUNTLGVBQWUsRUFBRSxZQUFZLEVBQzdCLEdBQUcsRUFBRSxHQUFHLEVBQ1IsTUFBTSxHQUFFLFNBQXdDLEVBQ2hELFNBQVMsQ0FBQyx5QkFBYSxFQUN2QixPQUFPLENBQUMseUJBQWEsRUFDMUI7SUFFSixRQUFRLElBQUksRUFBRSxFQUFFLENBVWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsbUJBQW1CLENBcUJqRTtDQUNGIn0=

package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_retrieval_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/log_retrieval_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;GAGG;AACH,qBAAa,mBAAmB;IAErB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,EAAE;gBADf,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE;IAGxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,mBAAmB;CAQnE"}
+{"version":3,"file":"log_retrieval_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/log_retrieval_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEzC,kDAAkD;AAClD,oBAAY,SAAS;IACnB,OAAO,IAAI;IACX,MAAM,IAAI;IACV,kBAAkB,IAAI;CACvB;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAErB,eAAe,EAAE,YAAY;IAC7B,GAAG,EAAE,GAAG;IACR,MAAM,EAAE,SAAS;IACjB,SAAS,CAAC;IACV,OAAO,CAAC;IALjB,YACS,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,GAAG,EACR,MAAM,GAAE,SAAwC,EAChD,SAAS,CAAC,yBAAa,EACvB,OAAO,CAAC,yBAAa,EAC1B;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAUf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,mBAAmB,CAqBjE;CACF"}

package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js

@@ -1,25 +1,57 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tag } from '@aztec/stdlib/logs';
+/** Discriminant for which log source to query. */ export var LogSource = /*#__PURE__*/ function(LogSource) {
+    LogSource[LogSource["PRIVATE"] = 0] = "PRIVATE";
+    LogSource[LogSource["PUBLIC"] = 1] = "PUBLIC";
+    LogSource[LogSource["PUBLIC_AND_PRIVATE"] = 2] = "PUBLIC_AND_PRIVATE";
+    return LogSource;
+}({});
 /**
  * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle expects values of this
- * type to be stored in a `CapsuleArray`.
+ * type to be stored in a `EphemeralArray`.
  */ export class LogRetrievalRequest {
     contractAddress;
-    unsiloedTag;
-    constructor(contractAddress, unsiloedTag){
+    tag;
+    source;
+    fromBlock;
+    toBlock;
+    constructor(contractAddress, tag, source = 2, fromBlock, toBlock){
         this.contractAddress = contractAddress;
-        this.unsiloedTag = unsiloedTag;
+        this.tag = tag;
+        this.source = source;
+        this.fromBlock = fromBlock;
+        this.toBlock = toBlock;
     }
     toFields() {
         return [
             this.contractAddress.toField(),
-            this.unsiloedTag
+            this.tag.value,
+            new Fr(this.source),
+            new Fr(this.fromBlock !== undefined ? 1 : 0),
+            new Fr(this.fromBlock ?? 0),
+            new Fr(this.toBlock !== undefined ? 1 : 0),
+            new Fr(this.toBlock ?? 0)
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
         const contractAddress = AztecAddress.fromField(reader.readField());
-        const unsiloedTag = reader.readField();
-        return new LogRetrievalRequest(contractAddress, unsiloedTag);
+        const tag = new Tag(reader.readField());
+        const sourceNum = reader.readField().toNumber();
+        if (!(sourceNum in LogSource)) {
+            const validNames = Object.keys(LogSource).filter((k)=>isNaN(Number(k)));
+            throw new Error(`Invalid LogSource value ${sourceNum}, expected one of ${validNames.join(', ')}`);
+        }
+        const source = sourceNum;
+        const fromBlockIsSome = reader.readBoolean();
+        const fromBlockValue = reader.readField();
+        const fromBlock = fromBlockIsSome ? BlockNumber(fromBlockValue.toNumber()) : undefined;
+        const toBlockIsSome = reader.readBoolean();
+        const toBlockValue = reader.readField();
+        const toBlock = toBlockIsSome ? BlockNumber(toBlockValue.toNumber()) : undefined;
+        return new LogRetrievalRequest(contractAddress, tag, source, fromBlock, toBlock);
     }
 }

package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts

@@ -1,8 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { TxHash } from '@aztec/stdlib/tx';
 /**
  * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle stores values of this
- * type in a `CapsuleArray`.
+ * type in a `EphemeralArray`.
  */
 export declare class LogRetrievalResponse {
     logPayload: Fr[];
@@ -12,6 +12,6 @@ export declare class LogRetrievalResponse {
     constructor(logPayload: Fr[], txHash: TxHash, uniqueNoteHashesInTx: Fr[], firstNullifierInTx: Fr);
     toFields(): Fr[];
     static toEmptyFields(): Fr[];
-    static toSerializedOption(response?: LogRetrievalResponse): Fr[];
+    static toSerializedOption(response: LogRetrievalResponse | null): Fr[];
 }
-//# sourceMappingURL=log_retrieval_response.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3JldHJpZXZhbF9yZXNwb25zZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9ub2lyLXN0cnVjdHMvbG9nX3JldHJpZXZhbF9yZXNwb25zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJL0M7OztHQUdHO0FBQ0gscUJBQWEsb0JBQW9CO0lBRXRCLFVBQVUsRUFBRSxFQUFFLEVBQUU7SUFDaEIsTUFBTSxFQUFFLE1BQU07SUFDZCxvQkFBb0IsRUFBRSxFQUFFLEVBQUU7SUFDMUIsa0JBQWtCLEVBQUUsRUFBRTtJQUovQixZQUNTLFVBQVUsRUFBRSxFQUFFLEVBQUUsRUFDaEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxvQkFBb0IsRUFBRSxFQUFFLEVBQUUsRUFDMUIsa0JBQWtCLEVBQUUsRUFBRSxFQUMzQjtJQUVKLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FTZjtJQUVELE1BQU0sQ0FBQyxhQUFhLElBQUksRUFBRSxFQUFFLENBUzNCO0lBRUQsTUFBTSxDQUFDLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxvQkFBb0IsR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFFLENBTXJFO0NBQ0YifQ==

package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_retrieval_response.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/log_retrieval_response.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAO/C;;;GAGG;AACH,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,QAAQ,IAAI,EAAE,EAAE;IAWhB,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE;IAW5B,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,oBAAoB,GAAG,EAAE,EAAE;CAOjE"}
+{"version":3,"file":"log_retrieval_response.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/log_retrieval_response.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI/C;;;GAGG;AACH,qBAAa,oBAAoB;IAEtB,UAAU,EAAE,EAAE,EAAE;IAChB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;IAJ/B,YACS,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE,EAC3B;IAEJ,QAAQ,IAAI,EAAE,EAAE,CASf;IAED,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,CAS3B;IAED,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,GAAG,EAAE,EAAE,CAMrE;CACF"}

package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js

@@ -1,12 +1,10 @@
 import { MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_CIPHERTEXT_LEN } from '@aztec/constants';
 import { range } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
-import { MAX_NOTE_PACKED_LEN } from './note_validation_request.js';
-const MAX_PUBLIC_LOG_LEN_FOR_NOTE_COMPLETION = MAX_NOTE_PACKED_LEN;
-const MAX_LOG_CONTENT_LEN = Math.max(MAX_PUBLIC_LOG_LEN_FOR_NOTE_COMPLETION, PRIVATE_LOG_CIPHERTEXT_LEN);
+import { Fr } from '@aztec/foundation/curves/bn254';
+const MAX_LOG_CONTENT_LEN = PRIVATE_LOG_CIPHERTEXT_LEN;
 /**
  * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle stores values of this
- * type in a `CapsuleArray`.
+ * type in a `EphemeralArray`.
  */ export class LogRetrievalResponse {
     logPayload;
     txHash;

package/dest/contract_function_simulator/noir-structs/note_data.d.ts

@@ -0,0 +1,27 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { Note } from '@aztec/stdlib/note';
+/**
+ * Information about a note needed during execution.
+ */
+export interface NoteData {
+    /** The actual note content (the fields of the Noir #[note] struct). */
+    note: Note;
+    /** The address of the contract that owns the note. */
+    contractAddress: AztecAddress;
+    /** The owner of the note. */
+    owner: AztecAddress;
+    /** The storage slot of the note. */
+    storageSlot: Fr;
+    /** The randomness injected to the note */
+    randomness: Fr;
+    /** The nonce injected into the note hash preimage by kernels. */
+    noteNonce: Fr;
+    /** A hash of the note as it gets stored in the note hash tree. */
+    noteHash: Fr;
+    /** True if the note is pending, false if settled. */
+    isPending: boolean;
+    /** The corresponding nullifier of the note. Undefined for pending notes. */
+    siloedNullifier?: Fr;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9ub3RlX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFL0M7O0dBRUc7QUFDSCxNQUFNLFdBQVcsUUFBUTtJQUN2Qix1RUFBdUU7SUFDdkUsSUFBSSxFQUFFLElBQUksQ0FBQztJQUNYLHNEQUFzRDtJQUN0RCxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLDZCQUE2QjtJQUM3QixLQUFLLEVBQUUsWUFBWSxDQUFDO0lBQ3BCLG9DQUFvQztJQUNwQyxXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLDBDQUEwQztJQUMxQyxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQ2YsaUVBQWlFO0lBQ2pFLFNBQVMsRUFBRSxFQUFFLENBQUM7SUFDZCxrRUFBa0U7SUFDbEUsUUFBUSxFQUFFLEVBQUUsQ0FBQztJQUNiLHFEQUFxRDtJQUNyRCxTQUFTLEVBQUUsT0FBTyxDQUFDO0lBQ25CLDRFQUE0RTtJQUM1RSxlQUFlLENBQUMsRUFBRSxFQUFFLENBQUM7Q0FDdEIifQ==

package/dest/contract_function_simulator/noir-structs/note_data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"note_data.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/note_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,uEAAuE;IACvE,IAAI,EAAE,IAAI,CAAC;IACX,sDAAsD;IACtD,eAAe,EAAE,YAAY,CAAC;IAC9B,6BAA6B;IAC7B,KAAK,EAAE,YAAY,CAAC;IACpB,oCAAoC;IACpC,WAAW,EAAE,EAAE,CAAC;IAChB,0CAA0C;IAC1C,UAAU,EAAE,EAAE,CAAC;IACf,iEAAiE;IACjE,SAAS,EAAE,EAAE,CAAC;IACd,kEAAkE;IAClE,QAAQ,EAAE,EAAE,CAAC;IACb,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,EAAE,CAAC;CACtB"}

package/dest/contract_function_simulator/noir-structs/note_data.js

@@ -0,0 +1,3 @@
+/**
+ * Information about a note needed during execution.
+ */ export { };

package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts

@@ -1,22 +1,22 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { TxHash } from '@aztec/stdlib/tx';
-export declare const MAX_NOTE_PACKED_LEN = 12;
 /**
- * Intermediate struct used to perform batch note validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
- * expects for values of this type to be stored in a `CapsuleArray`.
+ * Intermediate struct used to perform batch note validation by PXE. The `utilityValidateAndStoreEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `EphemeralArray`.
  */
 export declare class NoteValidationRequest {
     contractAddress: AztecAddress;
+    owner: AztecAddress;
     storageSlot: Fr;
+    randomness: Fr;
     noteNonce: Fr;
     content: Fr[];
     noteHash: Fr;
     nullifier: Fr;
     txHash: TxHash;
-    recipient: AztecAddress;
-    constructor(contractAddress: AztecAddress, storageSlot: Fr, noteNonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: TxHash, recipient: AztecAddress);
+    constructor(contractAddress: AztecAddress, owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteNonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: TxHash);
     static fromFields(fields: Fr[] | FieldReader): NoteValidationRequest;
 }
-//# sourceMappingURL=note_validation_request.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV92YWxpZGF0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdF9mdW5jdGlvbl9zaW11bGF0b3Ivbm9pci1zdHJ1Y3RzL25vdGVfdmFsaWRhdGlvbl9yZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxxQkFBYSxxQkFBcUI7SUFFdkIsZUFBZSxFQUFFLFlBQVk7SUFDN0IsS0FBSyxFQUFFLFlBQVk7SUFDbkIsV0FBVyxFQUFFLEVBQUU7SUFDZixVQUFVLEVBQUUsRUFBRTtJQUNkLFNBQVMsRUFBRSxFQUFFO0lBQ2IsT0FBTyxFQUFFLEVBQUUsRUFBRTtJQUNiLFFBQVEsRUFBRSxFQUFFO0lBQ1osU0FBUyxFQUFFLEVBQUU7SUFDYixNQUFNLEVBQUUsTUFBTTtJQVR2QixZQUNTLGVBQWUsRUFBRSxZQUFZLEVBQzdCLEtBQUssRUFBRSxZQUFZLEVBQ25CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsVUFBVSxFQUFFLEVBQUUsRUFDZCxTQUFTLEVBQUUsRUFBRSxFQUNiLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFDYixRQUFRLEVBQUUsRUFBRSxFQUNaLFNBQVMsRUFBRSxFQUFFLEVBQ2IsTUFBTSxFQUFFLE1BQU0sRUFDbkI7SUFFSixNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBbUNuRTtDQUNGIn0=

package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_validation_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/note_validation_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;GAGG;AACH,qBAAa,qBAAqB;IAEvB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,EAAE;IACb,OAAO,EAAE,EAAE,EAAE;IACb,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,YAAY;gBAPvB,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,SAAS,EAAE,EAAE,EACb,OAAO,EAAE,EAAE,EAAE,EACb,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAGhC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB;CA2BrE"}
+{"version":3,"file":"note_validation_request.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/note_validation_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,qBAAqB;IAEvB,eAAe,EAAE,YAAY;IAC7B,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,EAAE;IACf,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;IACb,OAAO,EAAE,EAAE,EAAE;IACb,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,MAAM;IATvB,YACS,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,EAAE,EACb,OAAO,EAAE,EAAE,EAAE,EACb,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,EACnB;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CAmCnE;CACF"}

package/dest/contract_function_simulator/noir-structs/note_validation_request.js

@@ -1,42 +1,47 @@
 import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { TxHash } from '@aztec/stdlib/tx';
-// TODO(#14617): should we compute this from constants? This value is aztec-nr specific.
-export const MAX_NOTE_PACKED_LEN = 12;
 /**
- * Intermediate struct used to perform batch note validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
- * expects for values of this type to be stored in a `CapsuleArray`.
+ * Intermediate struct used to perform batch note validation by PXE. The `utilityValidateAndStoreEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `EphemeralArray`.
  */ export class NoteValidationRequest {
     contractAddress;
+    owner;
     storageSlot;
+    randomness;
     noteNonce;
     content;
     noteHash;
     nullifier;
     txHash;
-    recipient;
-    constructor(contractAddress, storageSlot, noteNonce, content, noteHash, nullifier, txHash, recipient){
+    constructor(contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, nullifier, txHash){
         this.contractAddress = contractAddress;
+        this.owner = owner;
         this.storageSlot = storageSlot;
+        this.randomness = randomness;
         this.noteNonce = noteNonce;
         this.content = content;
         this.noteHash = noteHash;
         this.nullifier = nullifier;
         this.txHash = txHash;
-        this.recipient = recipient;
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
         const contractAddress = AztecAddress.fromField(reader.readField());
+        const owner = AztecAddress.fromField(reader.readField());
         const storageSlot = reader.readField();
+        const randomness = reader.readField();
         const noteNonce = reader.readField();
-        const contentStorage = reader.readFieldArray(MAX_NOTE_PACKED_LEN);
+        const maxNotePackedLen = reader.readField().toNumber();
+        const contentStorage = reader.readFieldArray(maxNotePackedLen);
         const contentLen = reader.readField().toNumber();
         const content = contentStorage.slice(0, contentLen);
         const noteHash = reader.readField();
         const nullifier = reader.readField();
         const txHash = TxHash.fromField(reader.readField());
-        const recipient = AztecAddress.fromField(reader.readField());
-        return new NoteValidationRequest(contractAddress, storageSlot, noteNonce, content, noteHash, nullifier, txHash, recipient);
+        if (reader.remainingFields() !== 0) {
+            throw new Error(`Error converting array of fields to NoteValidationRequest: expected ${reader.cursor} fields but received ${reader.cursor + reader.remainingFields()} (maxNotePackedLen=${maxNotePackedLen}).`);
+        }
+        return new NoteValidationRequest(contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, nullifier, txHash);
     }
 }

package/dest/contract_function_simulator/noir-structs/option.d.ts

@@ -0,0 +1,61 @@
+/**
+ * TypeScript counterpart of Noir's `Option<T>`.
+ *
+ * Wraps a value that may or may not be present. Use {@link Option.some} to wrap a present value and
+ * {@link Option.none} for an absent one. The type guards {@link isSome} and {@link isNone} narrow
+ * `value` in conditional branches.
+ */
+export declare class Option<T> {
+    readonly value: T | undefined;
+    readonly template: T | undefined;
+    private constructor();
+    /**
+     * Wrap a present value.
+     *
+     * @example
+     * ```ts
+     * return Option.some(values);
+     * ```
+     */
+    static some<T>(value: T): Option<T>;
+    /**
+     * Construct an absent Option.
+     *
+     * When serialized back to ACVM, the `None` case must produce the same number of fields as `Some`.
+     * For types whose wire size varies per call site (`BoundedVec`, `FixedArray`), pass a `template` so the
+     * serializer knows how many zero fields to emit. Omit the template when the Option will not be
+     * re-serialized (e.g. deserialized input params).
+     *
+     * @param template - A representative empty `T` whose serialization determines the zero-filled wire format.
+     *
+     * @example None for a fixed-size type:
+     * ```ts
+     * return Option.none(AztecAddress.ZERO);
+     * ```
+     *
+     * @example None for a dynamic-size type:
+     * ```ts
+     * return Option.none(BoundedVec.empty<number>({ maxLength: ciphertext.maxLength }));
+     * ```
+     */
+    static none<T>(template?: T): Option<T>;
+    /**
+     * Type guard: narrows `value` to `T` in the truthy branch.
+     *
+     * @example
+     * ```ts
+     * const opt = await handler.getSenderForTags();
+     * if (opt.isSome()) {
+     *   console.log(opt.value); // narrowed to T
+     * }
+     * ```
+     */
+    isSome(): this is Option<T> & {
+        value: T;
+    };
+    /** Type guard: narrows `value` to `undefined` in the truthy branch. */
+    isNone(): this is Option<T> & {
+        value: undefined;
+    };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9vcHRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gscUJBQWEsTUFBTSxDQUFDLENBQUM7YUFFRCxLQUFLLEVBQUUsQ0FBQyxHQUFHLFNBQVM7YUFDcEIsUUFBUSxFQUFFLENBQUMsR0FBRyxTQUFTO0lBRnpDLE9BQU8sZUFHSDtJQUVKOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FFbEM7SUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQW1CRztJQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBRXRDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILE1BQU0sSUFBSSxJQUFJLElBQUksTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHO1FBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtLQUFFLENBRXpDO0lBRUQsdUVBQXVFO0lBQ3ZFLE1BQU0sSUFBSSxJQUFJLElBQUksTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHO1FBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQTtLQUFFLENBRWpEO0NBQ0YifQ==

package/dest/contract_function_simulator/noir-structs/option.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"option.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/option.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,qBAAa,MAAM,CAAC,CAAC;aAED,KAAK,EAAE,CAAC,GAAG,SAAS;aACpB,QAAQ,EAAE,CAAC,GAAG,SAAS;IAFzC,OAAO,eAGH;IAEJ;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAElC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAEtC;IAED;;;;;;;;;;OAUG;IACH,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG;QAAE,KAAK,EAAE,CAAC,CAAA;KAAE,CAEzC;IAED,uEAAuE;IACvE,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG;QAAE,KAAK,EAAE,SAAS,CAAA;KAAE,CAEjD;CACF"}

package/dest/contract_function_simulator/noir-structs/option.js

@@ -0,0 +1,62 @@
+/**
+ * TypeScript counterpart of Noir's `Option<T>`.
+ *
+ * Wraps a value that may or may not be present. Use {@link Option.some} to wrap a present value and
+ * {@link Option.none} for an absent one. The type guards {@link isSome} and {@link isNone} narrow
+ * `value` in conditional branches.
+ */ export class Option {
+    value;
+    template;
+    constructor(value, template){
+        this.value = value;
+        this.template = template;
+    }
+    /**
+   * Wrap a present value.
+   *
+   * @example
+   * ```ts
+   * return Option.some(values);
+   * ```
+   */ static some(value) {
+        return new Option(value, undefined);
+    }
+    /**
+   * Construct an absent Option.
+   *
+   * When serialized back to ACVM, the `None` case must produce the same number of fields as `Some`.
+   * For types whose wire size varies per call site (`BoundedVec`, `FixedArray`), pass a `template` so the
+   * serializer knows how many zero fields to emit. Omit the template when the Option will not be
+   * re-serialized (e.g. deserialized input params).
+   *
+   * @param template - A representative empty `T` whose serialization determines the zero-filled wire format.
+   *
+   * @example None for a fixed-size type:
+   * ```ts
+   * return Option.none(AztecAddress.ZERO);
+   * ```
+   *
+   * @example None for a dynamic-size type:
+   * ```ts
+   * return Option.none(BoundedVec.empty<number>({ maxLength: ciphertext.maxLength }));
+   * ```
+   */ static none(template) {
+        return new Option(undefined, template);
+    }
+    /**
+   * Type guard: narrows `value` to `T` in the truthy branch.
+   *
+   * @example
+   * ```ts
+   * const opt = await handler.getSenderForTags();
+   * if (opt.isSome()) {
+   *   console.log(opt.value); // narrowed to T
+   * }
+   * ```
+   */ isSome() {
+        return this.value !== undefined;
+    }
+    /** Type guard: narrows `value` to `undefined` in the truthy branch. */ isNone() {
+        return this.value === undefined;
+    }
+}

package/dest/contract_function_simulator/noir-structs/provided_secret.d.ts

@@ -0,0 +1,11 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { FieldReader } from '@aztec/foundation/serialize';
+import { AppTaggingSecretKind } from '@aztec/stdlib/logs';
+/** A tagging secret an app supplies explicitly to `getPendingTaggedLogs` when PXE cannot derive it internally. */
+export declare class ProvidedSecret {
+    secret: Fr;
+    mode: AppTaggingSecretKind;
+    constructor(secret: Fr, mode: AppTaggingSecretKind);
+    static fromFields(fields: Fr[] | FieldReader): ProvidedSecret;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZWRfc2VjcmV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9wcm92aWRlZF9zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxrSEFBa0g7QUFDbEgscUJBQWEsY0FBYztJQUVoQixNQUFNLEVBQUUsRUFBRTtJQUNWLElBQUksRUFBRSxvQkFBb0I7SUFGbkMsWUFDUyxNQUFNLEVBQUUsRUFBRSxFQUNWLElBQUksRUFBRSxvQkFBb0IsRUFDL0I7SUFFSixNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsY0FBYyxDQUc1RDtDQUNGIn0=

package/dest/contract_function_simulator/noir-structs/provided_secret.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provided_secret.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/provided_secret.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,kHAAkH;AAClH,qBAAa,cAAc;IAEhB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,oBAAoB;IAFnC,YACS,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,oBAAoB,EAC/B;IAEJ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc,CAG5D;CACF"}