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

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';
@@ -19,6 +19,14 @@ export declare class PrivateTxConstantData {
      * protocol to execute and prove the transaction.
      */
     txContext: TxContext;
+    /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */
+    txRequestSalt: Fr;
     /**
      * Root of the vk tree for the protocol circuits.
      */
@@ -39,6 +47,14 @@ export declare class PrivateTxConstantData {
      * protocol to execute and prove the transaction.
      */
     txContext: TxContext, 
+    /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */
+    txRequestSalt: Fr, 
     /**
      * Root of the vk tree for the protocol circuits.
      */
@@ -48,7 +64,7 @@ export declare class PrivateTxConstantData {
      */
     protocolContracts: ProtocolContracts);
     static from(fields: FieldsOf<PrivateTxConstantData>): PrivateTxConstantData;
-    static getFields(fields: FieldsOf<PrivateTxConstantData>): readonly [BlockHeader, TxContext, Fr, ProtocolContracts];
+    static getFields(fields: FieldsOf<PrivateTxConstantData>): readonly [BlockHeader, TxContext, Fr, Fr, ProtocolContracts];
     static fromFields(fields: Fr[] | FieldReader): PrivateTxConstantData;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): PrivateTxConstantData;
@@ -57,4 +73,4 @@ export declare class PrivateTxConstantData {
     getSize(): number;
     clone(): PrivateTxConstantData;
 }
-//# sourceMappingURL=private_tx_constant_data.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7Ozs7O09BTUc7SUFDSSxhQUFhLEVBQUUsRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCO0lBM0I3QztJQUNFLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7Ozs7O09BTUc7SUFDSSxhQUFhLEVBQUUsRUFBRTtJQUN4Qjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3pDO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLHlCQUVsRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxnRUFRdkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBU25FO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FTdEU7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssMEJBUVg7SUFFRCxPQUFPLFdBUU47SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0NBQ0YifQ==

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;;;;;;OAMG;IACI,aAAa,EAAE,EAAE;IACxB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,iBAAiB,EAAE,iBAAiB;IA3B7C;IACE,6GAA6G;IACtG,iBAAiB,EAAE,WAAW;IACrC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;;;OAMG;IACI,aAAa,EAAE,EAAE;IACxB;;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,gEAQvD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,qBAAqB,CASnE;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,qBAAqB,CAStE;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,KAAK,0BAQX;IAED,OAAO,WAQN;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';
@@ -9,6 +9,7 @@ import { TxContext } from './tx_context.js';
  */ export class PrivateTxConstantData {
     anchorBlockHeader;
     txContext;
+    txRequestSalt;
     vkTreeRoot;
     protocolContracts;
     constructor(/** Header of a block whose state is used during execution (not the block the transaction is included in). */ anchorBlockHeader, /**
@@ -19,12 +20,19 @@ import { TxContext } from './tx_context.js';
      * a situation we could be using header from a block before the upgrade took place but be using the updated
      * protocol to execute and prove the transaction.
      */ txContext, /**
+     * Salt of the transaction request (`TxRequest.salt`).
+     *
+     * Bound to the user's `tx_request` by the Init circuit and kept constant by every subsequent kernel so that each
+     * app circuit's `txRequestSalt` public input can be checked against it. It is intentionally not carried into
+     * `TxConstantData`: it is dropped by the Tail circuits rather than being exposed by the final (hiding) kernel.
+     */ txRequestSalt, /**
      * Root of the vk tree for the protocol circuits.
      */ vkTreeRoot, /**
      * List of protocol contracts.
      */ protocolContracts){
         this.anchorBlockHeader = anchorBlockHeader;
         this.txContext = txContext;
+        this.txRequestSalt = txRequestSalt;
         this.vkTreeRoot = vkTreeRoot;
         this.protocolContracts = protocolContracts;
     }
@@ -35,13 +43,14 @@ import { TxContext } from './tx_context.js';
         return [
             fields.anchorBlockHeader,
             fields.txContext,
+            fields.txRequestSalt,
             fields.vkTreeRoot,
             fields.protocolContracts
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PrivateTxConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), reader.readField(), reader.readObject(ProtocolContracts));
+        return new PrivateTxConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), reader.readField(), reader.readField(), reader.readObject(ProtocolContracts));
     }
     toFields() {
         const fields = serializeToFields(...PrivateTxConstantData.getFields(this));
@@ -52,16 +61,16 @@ import { TxContext } from './tx_context.js';
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateTxConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), Fr.fromBuffer(reader), reader.readObject(ProtocolContracts));
+        return new PrivateTxConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readObject(ProtocolContracts));
     }
     toBuffer() {
         return serializeToBuffer(...PrivateTxConstantData.getFields(this));
     }
     static empty() {
-        return new PrivateTxConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, ProtocolContracts.empty());
+        return new PrivateTxConstantData(BlockHeader.empty(), TxContext.empty(), Fr.ZERO, Fr.ZERO, ProtocolContracts.empty());
     }
     getSize() {
-        return this.anchorBlockHeader.getSize() + this.txContext.getSize() + this.vkTreeRoot.size + this.protocolContracts.getSize();
+        return this.anchorBlockHeader.getSize() + this.txContext.getSize() + this.txRequestSalt.size + this.vkTreeRoot.size + this.protocolContracts.getSize();
     }
     clone() {
         return PrivateTxConstantData.fromBuffer(this.toBuffer());

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