@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.0208eb9

package/dest/tx/private_execution_result.js

@@ -1,37 +1,41 @@
 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 { Note } from '../note/note.js';
 import { mapSchema, schemas } from '../schemas/index.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
 /**
  * The contents of a new note.
  */ 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 {
@@ -54,47 +58,35 @@ export class CountedContractClassLog {
         return this.log.isEmpty() && !this.counter;
     }
 }
-export class CountedPublicExecutionRequest {
-    request;
-    counter;
-    constructor(request, counter){
-        this.request = request;
-        this.counter = counter;
-    }
-    static get schema() {
-        return z.object({
-            request: PublicExecutionRequest.schema,
-            counter: schemas.Integer
-        }).transform(CountedPublicExecutionRequest.from);
-    }
-    static from(fields) {
-        return new CountedPublicExecutionRequest(fields.request, fields.counter);
-    }
-    isEmpty() {
-        return this.request.isEmpty() && !this.counter;
-    }
-    static async random() {
-        return new CountedPublicExecutionRequest(await PublicExecutionRequest.random(), 0);
-    }
-}
 export class PrivateExecutionResult {
     entrypoint;
     firstNullifier;
-    constructor(entrypoint, /** The first non revertible nullifier, or zero if there was none. */ firstNullifier){
+    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;
     }
     static get schema() {
         return z.object({
             entrypoint: PrivateCallExecutionResult.schema,
-            firstNullifier: schemas.Fr
+            firstNullifier: schemas.Fr,
+            publicFunctionCalldata: z.array(HashedValues.schema)
         }).transform(PrivateExecutionResult.from);
     }
     static from(fields) {
-        return new PrivateExecutionResult(fields.entrypoint, fields.firstNullifier);
+        return new PrivateExecutionResult(fields.entrypoint, fields.firstNullifier, fields.publicFunctionCalldata);
     }
     static async random(nested = 1) {
-        return new PrivateExecutionResult(await PrivateCallExecutionResult.random(nested), Fr.random());
+        return new PrivateExecutionResult(await PrivateCallExecutionResult.random(nested), Fr.random(), [
+            HashedValues.random(),
+            HashedValues.random()
+        ]);
+    }
+    /**
+   * The anchor block number that this execution was simulated with.
+   */ getSimulationAnchorBlockNumber() {
+        return this.entrypoint.publicInputs.anchorBlockHeader.globalVariables.blockNumber;
     }
 }
 /**
@@ -104,32 +96,33 @@ export class PrivateExecutionResult {
     vk;
     partialWitness;
     publicInputs;
-    noteHashLeafIndexMap;
     newNotes;
     noteHashNullifierCounterMap;
     returnValues;
-    nestedExecutions;
-    enqueuedPublicFunctionCalls;
-    publicTeardownFunctionCall;
+    offchainEffects;
+    preTags;
+    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 nested executions. */ nestedExecutions, /** Enqueued public function execution requests to be picked up by the sequencer. */ enqueuedPublicFunctionCalls, /** Public function execution requested for teardown */ publicTeardownFunctionCall, /**
+    /** 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 pre-tags used in this tx to compute tags for private logs */ preTags, /** The nested executions. */ nestedExecutionResults, /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
-     */ contractClassLogs){
+     * 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).
+     */ contractClassLogs, profileResult){
         this.acir = acir;
         this.vk = vk;
         this.partialWitness = partialWitness;
         this.publicInputs = publicInputs;
-        this.noteHashLeafIndexMap = noteHashLeafIndexMap;
         this.newNotes = newNotes;
         this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
         this.returnValues = returnValues;
-        this.nestedExecutions = nestedExecutions;
-        this.enqueuedPublicFunctionCalls = enqueuedPublicFunctionCalls;
-        this.publicTeardownFunctionCall = publicTeardownFunctionCall;
+        this.offchainEffects = offchainEffects;
+        this.preTags = preTags;
+        this.nestedExecutionResults = nestedExecutionResults;
         this.contractClassLogs = contractClassLogs;
+        this.profileResult = profileResult;
     }
     static get schema() {
         return z.object({
@@ -137,18 +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),
-            nestedExecutions: z.array(z.lazy(()=>PrivateCallExecutionResult.schema)),
-            enqueuedPublicFunctionCalls: z.array(CountedPublicExecutionRequest.schema),
-            publicTeardownFunctionCall: PublicExecutionRequest.schema,
+            offchainEffects: z.array(z.object({
+                data: z.array(schemas.Fr)
+            })),
+            preTags: z.array(PreTagSchema),
+            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.nestedExecutions, fields.enqueuedPublicFunctionCalls, fields.publicTeardownFunctionCall, fields.contractClassLogs);
+        return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.preTags, fields.nestedExecutionResults, fields.contractClassLogs);
     }
     static async random(nested = 1) {
         return new PrivateCallExecutionResult(randomBytes(4), randomBytes(4), new Map([
@@ -156,12 +150,7 @@ export class PrivateExecutionResult {
                 1,
                 'one'
             ]
-        ]), PrivateCircuitPublicInputs.empty(), new Map([
-            [
-                1n,
-                1n
-            ]
-        ]), [
+        ]), PrivateCircuitPublicInputs.empty(), [
             NoteAndSlot.random()
         ], new Map([
             [
@@ -170,27 +159,22 @@ export class PrivateExecutionResult {
             ]
         ]), [
             Fr.random()
-        ], await timesParallel(nested, ()=>PrivateCallExecutionResult.random(0)), [
-            await CountedPublicExecutionRequest.random()
-        ], await PublicExecutionRequest.random(), [
+        ], [
+            {
+                data: [
+                    Fr.random()
+                ]
+            }
+        ], [], await timesParallel(nested, ()=>PrivateCallExecutionResult.random(0)), [
             new CountedContractClassLog(await ContractClassLog.random(), randomInt(10))
         ]);
     }
 }
-export function collectNoteHashLeafIndexMap(execResult) {
-    const accum = new Map();
-    const collectNoteHashLeafIndexMapRecursive = (callResult, accum)=>{
-        callResult.noteHashLeafIndexMap.forEach((value, key)=>accum.set(key, value));
-        callResult.nestedExecutions.forEach((nested)=>collectNoteHashLeafIndexMapRecursive(nested, accum));
-    };
-    collectNoteHashLeafIndexMapRecursive(execResult.entrypoint, accum);
-    return accum;
-}
 export function collectNoteHashNullifierCounterMap(execResult) {
     const accum = new Map();
     const collectNoteHashNullifierCounterMapRecursive = (callResult, accum)=>{
         callResult.noteHashNullifierCounterMap.forEach((value, key)=>accum.set(key, value));
-        callResult.nestedExecutions.forEach((nested)=>collectNoteHashNullifierCounterMapRecursive(nested, accum));
+        callResult.nestedExecutionResults.forEach((nested)=>collectNoteHashNullifierCounterMapRecursive(nested, accum));
     };
     collectNoteHashNullifierCounterMapRecursive(execResult.entrypoint, accum);
     return accum;
@@ -202,7 +186,7 @@ export function collectNoteHashNullifierCounterMap(execResult) {
  */ function collectContractClassLogs(execResult) {
     return [
         execResult.contractClassLogs,
-        ...execResult.nestedExecutions.flatMap(collectContractClassLogs)
+        ...execResult.nestedExecutionResults.flatMap(collectContractClassLogs)
     ].flat();
 }
 /**
@@ -212,43 +196,27 @@ export function collectNoteHashNullifierCounterMap(execResult) {
  */ export function collectSortedContractClassLogs(execResult) {
     const allLogs = collectContractClassLogs(execResult.entrypoint);
     const sortedLogs = sortByCounter(allLogs);
-    return sortedLogs.map((l)=>l.log);
-}
-function collectEnqueuedCountedPublicExecutionRequests(execResult) {
-    return [
-        ...execResult.enqueuedPublicFunctionCalls,
-        ...execResult.nestedExecutions.flatMap(collectEnqueuedCountedPublicExecutionRequests)
-    ];
+    return sortedLogs.map((l)=>l.log.fields);
 }
 /**
- * Collect all enqueued public function calls across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All enqueued public function calls.
- */ export function collectEnqueuedPublicFunctionCalls(execResult) {
-    const countedRequests = collectEnqueuedCountedPublicExecutionRequests(execResult.entrypoint);
-    // without the reverse sort, the logs will be in a queue like fashion which is wrong
-    // as the kernel processes it like a stack, popping items off and pushing them to output
-    return sortByCounter(countedRequests, false).map((r)=>r.request);
-}
-export function collectPublicTeardownFunctionCall(execResult) {
-    const collectPublicTeardownFunctionCallRecursive = (callResult)=>{
+ * Collect all offchain effects emitted across all nested executions.
+ * @param execResult - The execution result to collect offchain effects from.
+ * @returns Array of offchain effects.
+ */ export function collectOffchainEffects(execResult) {
+    const collectEffectsRecursive = (callResult)=>{
         return [
-            callResult.publicTeardownFunctionCall,
-            ...callResult.nestedExecutions.flatMap(collectPublicTeardownFunctionCallRecursive)
-        ].filter((call)=>!call.isEmpty());
+            ...callResult.offchainEffects.map((msg)=>({
+                    ...msg,
+                    contractAddress: callResult.publicInputs.callContext.contractAddress
+                })),
+            ...callResult.nestedExecutionResults.flatMap((nested)=>collectEffectsRecursive(nested))
+        ];
     };
-    const teardownCalls = collectPublicTeardownFunctionCallRecursive(execResult.entrypoint);
-    if (teardownCalls.length === 1) {
-        return teardownCalls[0];
-    }
-    if (teardownCalls.length > 1) {
-        throw new Error('Multiple public teardown calls detected');
-    }
-    return PublicExecutionRequest.empty();
+    return collectEffectsRecursive(execResult.entrypoint);
 }
 export function getFinalMinRevertibleSideEffectCounter(execResult) {
     const collectFinalMinRevertibleSideEffectCounterRecursive = (callResult)=>{
-        return callResult.nestedExecutions.reduce((counter, exec)=>{
+        return callResult.nestedExecutionResults.reduce((counter, exec)=>{
             const nestedCounter = collectFinalMinRevertibleSideEffectCounterRecursive(exec);
             return nestedCounter ? nestedCounter : counter;
         }, callResult.publicInputs.minRevertibleSideEffectCounter.toNumber());
@@ -257,5 +225,11 @@ export function getFinalMinRevertibleSideEffectCounter(execResult) {
 }
 export function collectNested(executionStack, extractExecutionItems) {
     const thisExecutionReads = executionStack.flatMap(extractExecutionItems);
-    return thisExecutionReads.concat(executionStack.flatMap(({ nestedExecutions })=>collectNested(nestedExecutions, extractExecutionItems)));
+    return thisExecutionReads.concat(executionStack.flatMap(({ nestedExecutionResults })=>collectNested(nestedExecutionResults, extractExecutionItems)));
+}
+export class PrivateExecutionProfileResult {
+    timings;
+    constructor(timings){
+        this.timings = timings;
+    }
 }

package/dest/tx/private_tx_constant_data.d.ts

@@ -0,0 +1,60 @@
+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';
+import { ProtocolContracts } from './protocol_contracts.js';
+import { TxContext } from './tx_context.js';
+/**
+ * Data that is constant/not modified by neither of the kernels.
+ */
+export declare class PrivateTxConstantData {
+    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
+    anchorBlockHeader: BlockHeader;
+    /**
+     * Context of the transaction.
+     *
+     * Note: `chainId` and `version` in txContext are not redundant to the values in
+     * self.anchor_block_header.global_variables because they can be different in case of a protocol upgrade. In such
+     * 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: TxContext;
+    /**
+     * Root of the vk tree for the protocol circuits.
+     */
+    vkTreeRoot: Fr;
+    /**
+     * List of protocol contracts.
+     */
+    protocolContracts: ProtocolContracts;
+    constructor(
+    /** Header of a block whose state is used during execution (not the block the transaction is included in). */
+    anchorBlockHeader: BlockHeader, 
+    /**
+     * Context of the transaction.
+     *
+     * Note: `chainId` and `version` in txContext are not redundant to the values in
+     * self.anchor_block_header.global_variables because they can be different in case of a protocol upgrade. In such
+     * 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: TxContext, 
+    /**
+     * Root of the vk tree for the protocol circuits.
+     */
+    vkTreeRoot: Fr, 
+    /**
+     * List of protocol contracts.
+     */
+    protocolContracts: ProtocolContracts);
+    static from(fields: FieldsOf<PrivateTxConstantData>): PrivateTxConstantData;
+    static getFields(fields: FieldsOf<PrivateTxConstantData>): readonly [BlockHeader, TxContext, Fr, ProtocolContracts];
+    static fromFields(fields: Fr[] | FieldReader): PrivateTxConstantData;
+    toFields(): Fr[];
+    static fromBuffer(buffer: Buffer | BufferReader): PrivateTxConstantData;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static empty(): PrivateTxConstantData;
+    getSize(): number;
+    clone(): PrivateTxConstantData;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV90eF9jb25zdGFudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RyxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRTlCLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCO0lBbkI3QztJQUNFLDZHQUE2RztJQUN0RyxpQkFBaUIsRUFBRSxXQUFXO0lBQ3JDOzs7Ozs7O09BT0c7SUFDSSxTQUFTLEVBQUUsU0FBUztJQUMzQjs7T0FFRztJQUNJLFVBQVUsRUFBRSxFQUFFO0lBQ3JCOztPQUVHO0lBQ0ksaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3pDO0lBRUosTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLHFCQUFxQixDQUFDLHlCQUVsRDtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyw0REFFdkQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcscUJBQXFCLENBUW5FO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQVFmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxxQkFBcUIsQ0FRdEU7SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLEtBQUssMEJBRVg7SUFFRCxPQUFPLFdBT047SUFFRCxLQUFLLElBQUkscUJBQXFCLENBRTdCO0NBQ0YifQ==

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

@@ -0,0 +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,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

@@ -0,0 +1,69 @@
+import { TX_CONSTANT_DATA_LENGTH } from '@aztec/constants';
+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';
+import { TxContext } from './tx_context.js';
+/**
+ * Data that is constant/not modified by neither of the kernels.
+ */ export class PrivateTxConstantData {
+    anchorBlockHeader;
+    txContext;
+    vkTreeRoot;
+    protocolContracts;
+    constructor(/** Header of a block whose state is used during execution (not the block the transaction is included in). */ anchorBlockHeader, /**
+     * Context of the transaction.
+     *
+     * Note: `chainId` and `version` in txContext are not redundant to the values in
+     * self.anchor_block_header.global_variables because they can be different in case of a protocol upgrade. In such
+     * 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, /**
+     * Root of the vk tree for the protocol circuits.
+     */ vkTreeRoot, /**
+     * List of protocol contracts.
+     */ protocolContracts){
+        this.anchorBlockHeader = anchorBlockHeader;
+        this.txContext = txContext;
+        this.vkTreeRoot = vkTreeRoot;
+        this.protocolContracts = protocolContracts;
+    }
+    static from(fields) {
+        return new PrivateTxConstantData(...PrivateTxConstantData.getFields(fields));
+    }
+    static getFields(fields) {
+        return [
+            fields.anchorBlockHeader,
+            fields.txContext,
+            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));
+    }
+    toFields() {
+        const fields = serializeToFields(...PrivateTxConstantData.getFields(this));
+        if (fields.length !== TX_CONSTANT_DATA_LENGTH) {
+            throw new Error(`Invalid number of fields for PrivateTxConstantData. Expected ${TX_CONSTANT_DATA_LENGTH}, got ${fields.length}`);
+        }
+        return fields;
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PrivateTxConstantData(reader.readObject(BlockHeader), reader.readObject(TxContext), 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());
+    }
+    getSize() {
+        return this.anchorBlockHeader.getSize() + this.txContext.getSize() + this.vkTreeRoot.size + this.protocolContracts.getSize();
+    }
+    clone() {
+        return PrivateTxConstantData.fromBuffer(this.toBuffer());
+    }
+}

package/dest/tx/processed_tx.d.ts

@@ -1,12 +1,12 @@
-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 { CombinedConstantData } from '../kernel/combined_constant_data.js';
 import type { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import type { ClientIvcProof } from '../proofs/client_ivc_proof.js';
+import type { ChonkProof } from '../proofs/chonk_proof.js';
 import type { GlobalVariables } from './global_variables.js';
 import type { Tx } from './tx.js';
 import { TxEffect } from './tx_effect.js';
@@ -32,15 +32,15 @@ export type ProcessedTx = {
     /**
      * Proof for the private execution.
      */
-    clientIvcProof: ClientIvcProof;
+    chonkProof: ChonkProof;
     /**
      * The request for AVM proving.
      */
     avmProvingRequest: AvmProvingRequest | undefined;
     /**
-     * Combining `TxConstantData` specified by the user, and `GlobalVariables` injected by the sequencer.
+     * `GlobalVariables` injected by the sequencer. It's the same for all the txs in a block.
      */
-    constants: CombinedConstantData;
+    globalVariables: GlobalVariables;
     /**
      * Output data of the tx.
      */
@@ -68,7 +68,6 @@ export type FailedTx = {
      */
     error: Error;
 };
-export declare function makeProcessedTxFromPrivateOnlyTx(tx: Tx, transactionFee: Fr, feePaymentPublicDataWrite: PublicDataWrite, globalVariables: GlobalVariables): Promise<ProcessedTx>;
-export declare function toNumBlobFields(txs: ProcessedTx[]): number;
-export declare function makeProcessedTxFromTxWithPublicCalls(tx: Tx, avmProvingRequest: AvmProvingRequest, gasUsed: GasUsed, revertCode: RevertCode, revertReason: SimulationError | undefined): Promise<ProcessedTx>;
-//# sourceMappingURL=processed_tx.d.ts.map
+export declare function makeProcessedTxFromPrivateOnlyTx(tx: Tx, transactionFee: Fr, feePaymentPublicDataWrite: PublicDataWrite, globalVariables: GlobalVariables): ProcessedTx;
+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,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AACnH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,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,cAAc,EAAE,cAAc,CAAC;IAC/B;;OAEG;IACH,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD;;OAEG;IACH,SAAS,EAAE,oBAAoB,CAAC;IAChC;;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,wBAAsB,gCAAgC,CACpD,EAAE,EAAE,EAAE,EACN,cAAc,EAAE,EAAE,EAClB,yBAAyB,EAAE,eAAe,EAC1C,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,WAAW,CAAC,CAsCtB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,MAAM,CAI1D;AAED,wBAAsB,oCAAoC,CACxD,EAAE,EAAE,EAAE,EACN,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,eAAe,GAAG,SAAS,GACxC,OAAO,CAAC,WAAW,CAAC,CA2CtB"}
+{"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,7 +1,7 @@
 import { RevertCode } from '../avm/revert_code.js';
+import { SimulationError } from '../errors/simulation_error.js';
 import { Gas } from '../gas/gas.js';
-import { siloL2ToL1Message } from '../hash/hash.js';
-import { CombinedConstantData } from '../kernel/combined_constant_data.js';
+import { computeL2ToL1MessageHash } from '../hash/hash.js';
 import { TxEffect } from './tx_effect.js';
 export var TxExecutionPhase = /*#__PURE__*/ function(TxExecutionPhase) {
     TxExecutionPhase[TxExecutionPhase["SETUP"] = 0] = "SETUP";
@@ -9,12 +9,17 @@ export var TxExecutionPhase = /*#__PURE__*/ function(TxExecutionPhase) {
     TxExecutionPhase[TxExecutionPhase["TEARDOWN"] = 2] = "TEARDOWN";
     return TxExecutionPhase;
 }({});
-export async function makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, globalVariables) {
-    const constants = CombinedConstantData.combine(tx.data.constants, globalVariables);
+export function makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, globalVariables) {
     const data = tx.data.forRollup;
-    const txEffect = new TxEffect(RevertCode.OK, await tx.getTxHash(), transactionFee, data.end.noteHashes.filter((h)=>!h.isZero()), data.end.nullifiers.filter((h)=>!h.isZero()), data.end.l2ToL1Msgs.map((message)=>siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId)).filter((h)=>!h.isZero()), [
+    const txEffect = new TxEffect(RevertCode.OK, tx.getTxHash(), transactionFee, data.end.noteHashes.filter((h)=>!h.isZero()), data.end.nullifiers.filter((h)=>!h.isZero()), data.end.l2ToL1Msgs.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
+        })), [
         feePaymentPublicDataWrite
-    ], data.end.privateLogs.filter((l)=>!l.isEmpty()), [], await tx.filterContractClassLogs(tx.data.getNonEmptyContractClassLogsHashes(), true));
+    ], data.end.privateLogs.filter((l)=>!l.isEmpty()), [], tx.getContractClassLogs());
     const gasUsed = {
         // Billed gas is the same as total gas since there is no teardown execution
         totalGas: tx.data.gasUsed,
@@ -25,42 +30,40 @@ export async function makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePa
     return {
         hash: txEffect.txHash,
         data: tx.data,
-        clientIvcProof: tx.clientIvcProof,
+        chonkProof: tx.chonkProof,
         avmProvingRequest: undefined,
-        constants,
+        globalVariables,
         txEffect,
         gasUsed,
         revertCode: RevertCode.OK,
         revertReason: undefined
     };
 }
-export function toNumBlobFields(txs) {
-    return txs.reduce((acc, tx)=>{
-        return acc + tx.txEffect.toBlobFields().length;
-    }, 0);
-}
-export async function makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason) {
-    const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
-    const constants = CombinedConstantData.combine(tx.data.constants, 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 = [
-        ...await tx.getSplitContractClassLogs(false, true),
-        ...revertCode.isOK() ? await tx.getSplitContractClassLogs(true, true) : []
-    ].filter((l)=>!l.isEmpty());
-    const txEffect = new TxEffect(revertCode, await tx.getTxHash(), avmPublicInputs.transactionFee, avmPublicInputs.accumulatedData.noteHashes.filter((h)=>!h.isZero()), avmPublicInputs.accumulatedData.nullifiers.filter((h)=>!h.isZero()), avmPublicInputs.accumulatedData.l2ToL1Msgs.map((message)=>siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId)).filter((h)=>!h.isZero()), publicDataWrites, privateLogs, avmPublicInputs.accumulatedData.publicLogs.filter((l)=>!l.isEmpty()), contractClassLogs);
+    const contractClassLogs = revertCode.isOK() ? tx.getContractClassLogs() : tx.getSplitContractClassLogs(false);
+    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
+        })), 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,
-        clientIvcProof: tx.clientIvcProof,
+        chonkProof: tx.chonkProof,
         avmProvingRequest,
-        constants,
+        globalVariables,
         txEffect,
         gasUsed,
         revertCode,
-        revertReason
+        revertReason: finalRevertReason
     };
 }