@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

package/dest/tx/private_execution_result.d.ts

@@ -1,14 +1,14 @@
-import { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { NoteSelector } from '../abi/note_selector.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import type { IsEmpty } from '../kernel/utils/interfaces.js';
 import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
-import { type PreTag } from '../logs/pre_tag.js';
+import { type TaggingIndexRange } from '../logs/tagging_index_range.js';
 import { Note } from '../note/note.js';
 import { type ZodFor } from '../schemas/index.js';
-import type { UInt32 } from '../types/index.js';
 import { HashedValues } from './hashed_values.js';
 import type { OffchainEffect } from './offchain_effect.js';
 /**
@@ -19,6 +19,8 @@ export declare class NoteAndSlot {
     note: Note;
     /** The storage slot of the note. */
     storageSlot: Fr;
+    /** The randomness injected to the note. */
+    randomness: Fr;
     /** The note type identifier. */
     noteTypeId: NoteSelector;
     constructor(
@@ -26,45 +28,30 @@ export declare class NoteAndSlot {
     note: Note, 
     /** The storage slot of the note. */
     storageSlot: Fr, 
+    /** The randomness injected to the note. */
+    randomness: Fr, 
     /** The note type identifier. */
     noteTypeId: NoteSelector);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        note: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, string>, z.ZodEffects<z.ZodObject<{
-            type: z.ZodLiteral<"Buffer">;
-            data: z.ZodArray<z.ZodNumber, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
-        }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer<ArrayBuffer>, {
-            type: "Buffer";
-            data: number[];
-        }>]>, Note, string | {
-            type: "Buffer";
-            data: number[];
-        }>;
+        note: z.ZodEffects<ZodFor<Buffer<ArrayBufferLike>>, Note, any>;
         storageSlot: ZodFor<Fr>;
+        randomness: ZodFor<Fr>;
         noteTypeId: z.ZodType<NoteSelector, any, string>;
     }, "strip", z.ZodTypeAny, {
-        storageSlot: Fr;
         note: Note;
+        storageSlot: Fr;
+        randomness: Fr;
         noteTypeId: NoteSelector;
     }, {
-        note: string | {
-            type: "Buffer";
-            data: number[];
-        };
-        noteTypeId: string;
+        note?: any;
         storageSlot?: any;
-    }>, NoteAndSlot, {
-        note: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        randomness?: any;
         noteTypeId: string;
+    }>, NoteAndSlot, {
+        note?: any;
         storageSlot?: any;
+        randomness?: any;
+        noteTypeId: string;
     }>;
     static from(fields: FieldsOf<NoteAndSlot>): NoteAndSlot;
     static random(): NoteAndSlot;
@@ -82,12 +69,12 @@ export declare class CountedContractClassLog implements IsEmpty {
 }
 export declare class PrivateExecutionResult {
     entrypoint: PrivateCallExecutionResult;
-    /** The first non revertible nullifier, or zero if there was none. */
+    /** The first non-revertible nullifier emitted by any private call, or the protocol nullifier if there was none. */
     firstNullifier: Fr;
     /** An array of calldata for the enqueued public function calls and the teardown function call. */
     publicFunctionCalldata: HashedValues[];
     constructor(entrypoint: PrivateCallExecutionResult, 
-    /** The first non revertible nullifier, or zero if there was none. */
+    /** The first non-revertible nullifier emitted by any private call, or the protocol nullifier if there was none. */
     firstNullifier: Fr, 
     /** An array of calldata for the enqueued public function calls and the teardown function call. */
     publicFunctionCalldata: HashedValues[]);
@@ -97,7 +84,7 @@ export declare class PrivateExecutionResult {
     /**
      * The anchor block number that this execution was simulated with.
      */
-    getSimulationAnchorBlockNumber(): UInt32;
+    getSimulationAnchorBlockNumber(): BlockNumber;
 }
 /**
  * The result of executing a call to a private function.
@@ -111,8 +98,6 @@ export declare class PrivateCallExecutionResult {
     partialWitness: Map<number, string>;
     /** The call stack item. */
     publicInputs: PrivateCircuitPublicInputs;
-    /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */
-    noteHashLeafIndexMap: Map<bigint, bigint>;
     /** The notes created in the executed function. */
     newNotes: NoteAndSlot[];
     /** Mapping of note hash counter to the counter of its nullifier. */
@@ -123,8 +108,8 @@ export declare class PrivateCallExecutionResult {
     offchainEffects: {
         data: Fr[];
     }[];
-    /** The pre tags used in this tx to compute tags for private logs */
-    preTags: PreTag[];
+    /** The tagging index ranges used in this tx to compute tags for private logs */
+    taggingIndexRanges: TaggingIndexRange[];
     /** The nested executions. */
     nestedExecutionResults: PrivateCallExecutionResult[];
     /**
@@ -143,8 +128,6 @@ export declare class PrivateCallExecutionResult {
     partialWitness: Map<number, string>, 
     /** The call stack item. */
     publicInputs: PrivateCircuitPublicInputs, 
-    /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */
-    noteHashLeafIndexMap: Map<bigint, bigint>, 
     /** The notes created in the executed function. */
     newNotes: NoteAndSlot[], 
     /** Mapping of note hash counter to the counter of its nullifier. */
@@ -155,8 +138,8 @@ export declare class PrivateCallExecutionResult {
     offchainEffects: {
         data: Fr[];
     }[], 
-    /** The pre tags used in this tx to compute tags for private logs */
-    preTags: PreTag[], 
+    /** The tagging index ranges used in this tx to compute tags for private logs */
+    taggingIndexRanges: TaggingIndexRange[], 
     /** The nested executions. */
     nestedExecutionResults: PrivateCallExecutionResult[], 
     /**
@@ -169,7 +152,6 @@ export declare class PrivateCallExecutionResult {
     static from(fields: FieldsOf<PrivateCallExecutionResult>): PrivateCallExecutionResult;
     static random(nested?: number): Promise<PrivateCallExecutionResult>;
 }
-export declare function collectNoteHashLeafIndexMap(execResult: PrivateExecutionResult): Map<bigint, bigint>;
 export declare function collectNoteHashNullifierCounterMap(execResult: PrivateExecutionResult): Map<number, number>;
 /**
  * Collect all contract class logs across all nested executions and sorts by counter.
@@ -199,4 +181,4 @@ export declare class PrivateExecutionProfileResult {
         }>;
     });
 }
-//# sourceMappingURL=private_execution_result.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR25FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN4RixPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU3RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RixPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNqRyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHFCQUFxQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRDs7R0FFRztBQUNILHFCQUFhLFdBQVc7SUFFcEIsZ0JBQWdCO0lBQ1QsSUFBSSxFQUFFLElBQUk7SUFDakIsb0NBQW9DO0lBQzdCLFdBQVcsRUFBRSxFQUFFO0lBQ3RCLDJDQUEyQztJQUNwQyxVQUFVLEVBQUUsRUFBRTtJQUNyQixnQ0FBZ0M7SUFDekIs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

package/dest/tx/private_execution_result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"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"}

package/dest/tx/private_execution_result.js

@@ -1,12 +1,12 @@
 import { timesParallel } from '@aztec/foundation/collection';
-import { randomBytes, randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomBytes, randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
 import { NoteSelector } from '../abi/note_selector.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import { sortByCounter } from '../kernel/utils/order_and_comparison.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
-import { PreTagSchema } from '../logs/pre_tag.js';
+import { TaggingIndexRangeSchema } from '../logs/tagging_index_range.js';
 import { Note } from '../note/note.js';
 import { mapSchema, schemas } from '../schemas/index.js';
 import { HashedValues } from './hashed_values.js';
@@ -15,24 +15,27 @@ import { HashedValues } from './hashed_values.js';
  */ export class NoteAndSlot {
     note;
     storageSlot;
+    randomness;
     noteTypeId;
-    constructor(/** The note. */ note, /** The storage slot of the note. */ storageSlot, /** The note type identifier. */ noteTypeId){
+    constructor(/** The note. */ note, /** The storage slot of the note. */ storageSlot, /** The randomness injected to the note. */ randomness, /** The note type identifier. */ noteTypeId){
         this.note = note;
         this.storageSlot = storageSlot;
+        this.randomness = randomness;
         this.noteTypeId = noteTypeId;
     }
     static get schema() {
         return z.object({
             note: Note.schema,
             storageSlot: schemas.Fr,
+            randomness: schemas.Fr,
             noteTypeId: schemas.NoteSelector
         }).transform(NoteAndSlot.from);
     }
     static from(fields) {
-        return new NoteAndSlot(fields.note, fields.storageSlot, fields.noteTypeId);
+        return new NoteAndSlot(fields.note, fields.storageSlot, fields.randomness, fields.noteTypeId);
     }
     static random() {
-        return new NoteAndSlot(Note.random(), Fr.random(), NoteSelector.random());
+        return new NoteAndSlot(Note.random(), Fr.random(), Fr.random(), NoteSelector.random());
     }
 }
 export class CountedContractClassLog {
@@ -59,7 +62,7 @@ export class PrivateExecutionResult {
     entrypoint;
     firstNullifier;
     publicFunctionCalldata;
-    constructor(entrypoint, /** The first non revertible nullifier, or zero if there was none. */ firstNullifier, /** An array of calldata for the enqueued public function calls and the teardown function call. */ publicFunctionCalldata){
+    constructor(entrypoint, /** The first non-revertible nullifier emitted by any private call, or the protocol nullifier if there was none. */ firstNullifier, /** An array of calldata for the enqueued public function calls and the teardown function call. */ publicFunctionCalldata){
         this.entrypoint = entrypoint;
         this.firstNullifier = firstNullifier;
         this.publicFunctionCalldata = publicFunctionCalldata;
@@ -93,18 +96,17 @@ export class PrivateExecutionResult {
     vk;
     partialWitness;
     publicInputs;
-    noteHashLeafIndexMap;
     newNotes;
     noteHashNullifierCounterMap;
     returnValues;
     offchainEffects;
-    preTags;
+    taggingIndexRanges;
     nestedExecutionResults;
     contractClassLogs;
     profileResult;
     constructor(// Needed for prover
     /** The ACIR bytecode. */ acir, /** The verification key. */ vk, /** The partial witness. */ partialWitness, // Needed for the verifier (kernel)
-    /** The call stack item. */ publicInputs, /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */ noteHashLeafIndexMap, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */ offchainEffects, /** The pre tags used in this tx to compute tags for private logs */ preTags, /** The nested executions. */ nestedExecutionResults, /**
+    /** The call stack item. */ publicInputs, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */ offchainEffects, /** The tagging index ranges used in this tx to compute tags for private logs */ taggingIndexRanges, /** The nested executions. */ nestedExecutionResults, /**
      * Contract class logs emitted during execution of this function call.
      * Note: We only need to collect the ContractClassLogFields as preimages for the tx.
      * But keep them as ContractClassLog so that we can verify the log hashes before submitting the tx (TODO).
@@ -113,12 +115,11 @@ export class PrivateExecutionResult {
         this.vk = vk;
         this.partialWitness = partialWitness;
         this.publicInputs = publicInputs;
-        this.noteHashLeafIndexMap = noteHashLeafIndexMap;
         this.newNotes = newNotes;
         this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
         this.returnValues = returnValues;
         this.offchainEffects = offchainEffects;
-        this.preTags = preTags;
+        this.taggingIndexRanges = taggingIndexRanges;
         this.nestedExecutionResults = nestedExecutionResults;
         this.contractClassLogs = contractClassLogs;
         this.profileResult = profileResult;
@@ -129,20 +130,19 @@ export class PrivateExecutionResult {
             vk: schemas.Buffer,
             partialWitness: mapSchema(z.coerce.number(), z.string()),
             publicInputs: PrivateCircuitPublicInputs.schema,
-            noteHashLeafIndexMap: mapSchema(schemas.BigInt, schemas.BigInt),
             newNotes: z.array(NoteAndSlot.schema),
             noteHashNullifierCounterMap: mapSchema(z.coerce.number(), z.number()),
             returnValues: z.array(schemas.Fr),
             offchainEffects: z.array(z.object({
                 data: z.array(schemas.Fr)
             })),
-            preTags: z.array(PreTagSchema),
+            taggingIndexRanges: z.array(TaggingIndexRangeSchema),
             nestedExecutionResults: z.array(z.lazy(()=>PrivateCallExecutionResult.schema)),
             contractClassLogs: z.array(CountedContractClassLog.schema)
         }).transform(PrivateCallExecutionResult.from);
     }
     static from(fields) {
-        return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.noteHashLeafIndexMap, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.preTags, fields.nestedExecutionResults, fields.contractClassLogs);
+        return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.taggingIndexRanges, fields.nestedExecutionResults, fields.contractClassLogs);
     }
     static async random(nested = 1) {
         return new PrivateCallExecutionResult(randomBytes(4), randomBytes(4), new Map([
@@ -150,12 +150,7 @@ export class PrivateExecutionResult {
                 1,
                 'one'
             ]
-        ]), PrivateCircuitPublicInputs.empty(), new Map([
-            [
-                1n,
-                1n
-            ]
-        ]), [
+        ]), PrivateCircuitPublicInputs.empty(), [
             NoteAndSlot.random()
         ], new Map([
             [
@@ -175,15 +170,6 @@ export class PrivateExecutionResult {
         ]);
     }
 }
-export function collectNoteHashLeafIndexMap(execResult) {
-    const accum = new Map();
-    const collectNoteHashLeafIndexMapRecursive = (callResult, accum)=>{
-        callResult.noteHashLeafIndexMap.forEach((value, key)=>accum.set(key, value));
-        callResult.nestedExecutionResults.forEach((nested)=>collectNoteHashLeafIndexMapRecursive(nested, accum));
-    };
-    collectNoteHashLeafIndexMapRecursive(execResult.entrypoint, accum);
-    return accum;
-}
 export function collectNoteHashNullifierCounterMap(execResult) {
     const accum = new Map();
     const collectNoteHashNullifierCounterMapRecursive = (callResult, accum)=>{

package/dest/tx/private_tx_constant_data.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { BlockHeader } from './block_header.js';
@@ -57,4 +57,4 @@ export declare class PrivateTxConstantData {
     getSize(): number;
     clone(): PrivateTxConstantData;
 }
-//# sourceMappingURL=private_tx_constant_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCO0lBbkI3QztJQUNFLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3pDO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLHlCQUVsRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyw0REFFdkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBUW5FO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FRdEU7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssMEJBRVg7SUFFRCxPQUFPLFdBT047SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0NBQ0YifQ==

package/dest/tx/private_tx_constant_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/private_tx_constant_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;;IAlB3C,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;IAG7C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC;IAInD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC;IAIxD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB;IAUpE,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB;IAUvE,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO;IASP,KAAK,IAAI,qBAAqB;CAG/B"}
+{"version":3,"file":"private_tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/private_tx_constant_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,qBAAqB;IAE9B,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;IAnB7C;IACE,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB,EACzC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,yBAElD;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,4DAEvD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CAQnE;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAQtE;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,0BAEX;IAED,OAAO,WAON;IAED,KAAK,IAAI,qBAAqB,CAE7B;CACF"}

package/dest/tx/private_tx_constant_data.js

@@ -1,5 +1,5 @@
 import { TX_CONSTANT_DATA_LENGTH } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { BlockHeader } from './block_header.js';
 import { ProtocolContracts } from './protocol_contracts.js';

package/dest/tx/processed_tx.d.ts

@@ -1,8 +1,9 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { PublicTxEffect } from '../avm/avm.js';
 import type { AvmProvingRequest } from '../avm/avm_proving_request.js';
 import type { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
-import type { SimulationError } from '../errors/simulation_error.js';
+import { SimulationError } from '../errors/simulation_error.js';
 import type { GasUsed } from '../gas/gas_used.js';
 import type { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import type { ChonkProof } from '../proofs/chonk_proof.js';
@@ -68,5 +69,5 @@ export type FailedTx = {
     error: Error;
 };
 export declare function makeProcessedTxFromPrivateOnlyTx(tx: Tx, transactionFee: Fr, feePaymentPublicDataWrite: PublicDataWrite, globalVariables: GlobalVariables): ProcessedTx;
-export declare function makeProcessedTxFromTxWithPublicCalls(tx: Tx, avmProvingRequest: AvmProvingRequest, gasUsed: GasUsed, revertCode: RevertCode, revertReason: SimulationError | undefined): ProcessedTx;
-//# sourceMappingURL=processed_tx.d.ts.map
+export declare function makeProcessedTxFromTxWithPublicCalls(tx: Tx, globalVariables: GlobalVariables, avmProvingRequest: AvmProvingRequest | undefined, publicTxEffect: PublicTxEffect, gasUsed: GasUsed, revertCode: RevertCode, revertReason: SimulationError | undefined): ProcessedTx;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvY2Vzc2VkX3R4LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJvY2Vzc2VkX3R4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxELE9BQU8sS0FBSyxFQUFFLG9DQUFvQyxFQUFFLE1BQU0sd0RBQXdELENBQUM7QUFDbkgsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ2xDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMxQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFM0Msb0JBQVksZ0JBQWdCO0lBQzFCLEtBQUssSUFBQTtJQUNMLFNBQVMsSUFBQTtJQUNULFFBQVEsSUFBQTtDQUNUO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLFdBQVcsR0FBRztJQUN4Qjs7T0FFRztJQUNILElBQUksRUFBRSxNQUFNLENBQUM7SUFDYjs7T0FFRztJQUNILElBQUksRUFBRSxvQ0FBb0MsQ0FBQztJQUMzQzs7T0FFRztJQUNILFVBQVUsRUFBRSxVQUFVLENBQUM7SUFDdkI7O09BRUc7SUFDSCxpQkFBaUIsRUFBRSxpQkFBaUIsR0FBRyxTQUFTLENBQUM7SUFDakQ7O09BRUc7SUFDSCxlQUFlLEVBQUUsZUFBZSxDQUFDO0lBQ2pDOztPQUVHO0lBQ0gsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUluQixPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2Qjs7T0FFRztJQUNILFlBQVksRUFBRSxlQUFlLEdBQUcsU0FBUyxDQUFDO0NBQzNDLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sTUFBTSxRQUFRLEdBQUc7SUFDckI7O09BRUc7SUFDSCxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ1A7O09BRUc7SUFDSCxLQUFLLEVBQUUsS0FBSyxDQUFDO0NBQ2QsQ0FBQztBQUVGLHdCQUFnQixnQ0FBZ0MsQ0FDOUMsRUFBRSxFQUFFLEVBQUUsRUFDTixjQUFjLEVBQUUsRUFBRSxFQUNsQix5QkFBeUIsRUFBRSxlQUFlLEVBQzFDLGVBQWUsRUFBRSxlQUFlLEdBQy9CLFdBQVcsQ0E0Q2I7QUFFRCx3QkFBZ0Isb0NBQW9DLENBQ2xELEVBQUUsRUFBRSxFQUFFLEVBQ04sZUFBZSxFQUFFLGVBQWUsRUFDaEMsaUJBQWlCLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxFQUNoRCxjQUFjLEVBQUUsY0FBYyxFQUM5QixPQUFPLEVBQUUsT0FBTyxFQUNoQixVQUFVLEVBQUUsVUFBVSxFQUN0QixZQUFZLEVBQUUsZUFBZSxHQUFHLFNBQVMsR0FDeEMsV0FBVyxDQWtEYiJ9

package/dest/tx/processed_tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processed_tx.d.ts","sourceRoot":"","sources":["../../src/tx/processed_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AACnH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,oBAAY,gBAAgB;IAC1B,KAAK,IAAA;IACL,SAAS,IAAA;IACT,QAAQ,IAAA;CACT;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,oCAAoC,CAAC;IAC3C;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD;;OAEG;IACH,eAAe,EAAE,eAAe,CAAC;IACjC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAInB,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB;;OAEG;IACH,EAAE,EAAE,EAAE,CAAC;IACP;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,wBAAgB,gCAAgC,CAC9C,EAAE,EAAE,EAAE,EACN,cAAc,EAAE,EAAE,EAClB,yBAAyB,EAAE,eAAe,EAC1C,eAAe,EAAE,eAAe,GAC/B,WAAW,CA4Cb;AAED,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,EAAE,EACN,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,eAAe,GAAG,SAAS,GACxC,WAAW,CAkDb"}
+{"version":3,"file":"processed_tx.d.ts","sourceRoot":"","sources":["../../src/tx/processed_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AACnH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,oBAAY,gBAAgB;IAC1B,KAAK,IAAA;IACL,SAAS,IAAA;IACT,QAAQ,IAAA;CACT;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,oCAAoC,CAAC;IAC3C;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD;;OAEG;IACH,eAAe,EAAE,eAAe,CAAC;IACjC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAInB,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB;;OAEG;IACH,EAAE,EAAE,EAAE,CAAC;IACP;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,wBAAgB,gCAAgC,CAC9C,EAAE,EAAE,EAAE,EACN,cAAc,EAAE,EAAE,EAClB,yBAAyB,EAAE,eAAe,EAC1C,eAAe,EAAE,eAAe,GAC/B,WAAW,CA4Cb;AAED,wBAAgB,oCAAoC,CAClD,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,EAChD,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,eAAe,GAAG,SAAS,GACxC,WAAW,CAkDb"}

package/dest/tx/processed_tx.js

@@ -1,4 +1,5 @@
 import { RevertCode } from '../avm/revert_code.js';
+import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
 import { computeL2ToL1MessageHash } from '../hash/hash.js';
 import { TxEffect } from './tx_effect.js';
@@ -38,22 +39,22 @@ export function makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentP
         revertReason: undefined
     };
 }
-export function makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason) {
-    const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
-    const globalVariables = avmPublicInputs.globalVariables;
-    const publicDataWrites = avmPublicInputs.accumulatedData.publicDataWrites.filter((w)=>!w.isEmpty());
+export function makeProcessedTxFromTxWithPublicCalls(tx, globalVariables, avmProvingRequest, publicTxEffect, gasUsed, revertCode, revertReason) {
     const privateLogs = [
         ...tx.data.forPublic.nonRevertibleAccumulatedData.privateLogs,
         ...revertCode.isOK() ? tx.data.forPublic.revertibleAccumulatedData.privateLogs : []
     ].filter((l)=>!l.isEmpty());
     const contractClassLogs = revertCode.isOK() ? tx.getContractClassLogs() : tx.getSplitContractClassLogs(false);
-    const txEffect = new TxEffect(revertCode, tx.getTxHash(), avmPublicInputs.transactionFee, avmPublicInputs.accumulatedData.noteHashes.filter((h)=>!h.isZero()), avmPublicInputs.accumulatedData.nullifiers.filter((h)=>!h.isZero()), avmPublicInputs.accumulatedData.l2ToL1Msgs.filter((msg)=>!msg.contractAddress.isZero()).map((msg)=>computeL2ToL1MessageHash({
+    const txEffect = new TxEffect(revertCode, tx.getTxHash(), publicTxEffect.transactionFee, publicTxEffect.noteHashes, publicTxEffect.nullifiers, publicTxEffect.l2ToL1Msgs // convert messages to hashes.
+    .filter((msg)=>!msg.contractAddress.isZero()).map((msg)=>computeL2ToL1MessageHash({
             l2Sender: msg.contractAddress,
             l1Recipient: msg.message.recipient,
             content: msg.message.content,
             rollupVersion: globalVariables.version,
             chainId: globalVariables.chainId
-        })), publicDataWrites, privateLogs, avmPublicInputs.accumulatedData.publicLogs.toLogs(), contractClassLogs);
+        })), publicTxEffect.publicDataWrites, privateLogs, publicTxEffect.publicLogs, contractClassLogs);
+    // Some callers expect a revert reason if the tx reverted.
+    const finalRevertReason = revertReason === undefined && !revertCode.isOK() ? new SimulationError('TX reverted', /*functionErrorStack=*/ [], /*revertData=*/ []) : revertReason;
     return {
         hash: txEffect.txHash,
         data: tx.data,
@@ -63,6 +64,6 @@ export function makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasU
         txEffect,
         gasUsed,
         revertCode,
-        revertReason
+        revertReason: finalRevertReason
     };
 }