@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/tx/partial_state_reference.js

@@ -34,8 +34,28 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
         const publicDataTree = AppendOnlyTreeSnapshot.fromFields(reader);
         return new PartialStateReference(noteHashTree, nullifierTree, publicDataTree);
     }
+    static fromViem(stateReference) {
+        return new PartialStateReference(AppendOnlyTreeSnapshot.fromViem(stateReference.noteHashTree), AppendOnlyTreeSnapshot.fromViem(stateReference.nullifierTree), AppendOnlyTreeSnapshot.fromViem(stateReference.publicDataTree));
+    }
+    static random() {
+        return new PartialStateReference(AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random());
+    }
+    toViem() {
+        return {
+            noteHashTree: this.noteHashTree.toViem(),
+            nullifierTree: this.nullifierTree.toViem(),
+            publicDataTree: this.publicDataTree.toViem()
+        };
+    }
+    toAbi() {
+        return [
+            this.noteHashTree.toAbi(),
+            this.nullifierTree.toAbi(),
+            this.publicDataTree.toAbi()
+        ];
+    }
     static empty() {
-        return new PartialStateReference(AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero());
+        return new PartialStateReference(AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty(), AppendOnlyTreeSnapshot.empty());
     }
     toBuffer() {
         return serializeToBuffer(this.noteHashTree, this.nullifierTree, this.publicDataTree);
@@ -52,7 +72,7 @@ import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
         return fields;
     }
     isEmpty() {
-        return this.noteHashTree.isZero() && this.nullifierTree.isZero() && this.publicDataTree.isZero();
+        return this.noteHashTree.isEmpty() && this.nullifierTree.isEmpty() && this.publicDataTree.isEmpty();
     }
     equals(other) {
         return this.noteHashTree.equals(other.noteHashTree) && this.nullifierTree.equals(other.nullifierTree) && this.publicDataTree.equals(other.publicDataTree);

package/dest/tx/private_execution_result.d.ts

@@ -1,15 +1,15 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 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 } from '../logs/contract_class_log.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Note } from '../note/note.js';
 import { type ZodFor } from '../schemas/index.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import type { UInt32 } from '../types/index.js';
+import { HashedValues } from './hashed_values.js';
+import type { OffchainEffect } from './offchain_effect.js';
 /**
  * The contents of a new note.
  */
@@ -28,7 +28,7 @@ export declare class NoteAndSlot {
     /** 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, string>, 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, {
@@ -37,7 +37,7 @@ export declare class NoteAndSlot {
         }, {
             type: "Buffer";
             data: number[];
-        }>, Buffer, {
+        }>, Buffer<ArrayBuffer>, {
             type: "Buffer";
             data: number[];
         }>]>, Note, string | {
@@ -79,25 +79,24 @@ export declare class CountedContractClassLog implements IsEmpty {
     }): CountedContractClassLog;
     isEmpty(): boolean;
 }
-export declare class CountedPublicExecutionRequest {
-    request: PublicExecutionRequest;
-    counter: number;
-    constructor(request: PublicExecutionRequest, counter: number);
-    static get schema(): ZodFor<CountedPublicExecutionRequest>;
-    static from(fields: FieldsOf<CountedPublicExecutionRequest>): CountedPublicExecutionRequest;
-    isEmpty(): boolean;
-    static random(): Promise<CountedPublicExecutionRequest>;
-}
 export declare class PrivateExecutionResult {
     entrypoint: PrivateCallExecutionResult;
     /** The first non revertible nullifier, or zero 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. */
-    firstNullifier: Fr);
+    firstNullifier: Fr, 
+    /** An array of calldata for the enqueued public function calls and the teardown function call. */
+    publicFunctionCalldata: HashedValues[]);
     static get schema(): ZodFor<PrivateExecutionResult>;
     static from(fields: FieldsOf<PrivateExecutionResult>): PrivateExecutionResult;
     static random(nested?: number): Promise<PrivateExecutionResult>;
+    /**
+     * The block number that this execution was simulated with.
+     */
+    getSimulationBlockNumber(): UInt32;
 }
 /**
  * The result of executing a call to a private function.
@@ -119,17 +118,19 @@ export declare class PrivateCallExecutionResult {
     noteHashNullifierCounterMap: Map<number, number>;
     /** The raw return values of the executed function. */
     returnValues: Fr[];
+    /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */
+    offchainEffects: {
+        data: Fr[];
+    }[];
     /** The nested executions. */
-    nestedExecutions: PrivateCallExecutionResult[];
-    /** Enqueued public function execution requests to be picked up by the sequencer. */
-    enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[];
-    /** Public function execution requested for teardown */
-    publicTeardownFunctionCall: PublicExecutionRequest;
+    nestedExecutionResults: PrivateCallExecutionResult[];
     /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
+     * 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: CountedContractClassLog[];
+    profileResult?: PrivateExecutionProfileResult | undefined;
     constructor(
     /** The ACIR bytecode. */
     acir: Buffer, 
@@ -147,17 +148,18 @@ export declare class PrivateCallExecutionResult {
     noteHashNullifierCounterMap: Map<number, number>, 
     /** The raw return values of the executed function. */
     returnValues: Fr[], 
+    /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */
+    offchainEffects: {
+        data: Fr[];
+    }[], 
     /** The nested executions. */
-    nestedExecutions: PrivateCallExecutionResult[], 
-    /** Enqueued public function execution requests to be picked up by the sequencer. */
-    enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[], 
-    /** Public function execution requested for teardown */
-    publicTeardownFunctionCall: PublicExecutionRequest, 
+    nestedExecutionResults: PrivateCallExecutionResult[], 
     /**
      * Contract class logs emitted during execution of this function call.
-     * Note: These are preimages to `contractClassLogsHashes`.
+     * 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: CountedContractClassLog[]);
+    contractClassLogs: CountedContractClassLog[], profileResult?: PrivateExecutionProfileResult | undefined);
     static get schema(): ZodFor<PrivateCallExecutionResult>;
     static from(fields: FieldsOf<PrivateCallExecutionResult>): PrivateCallExecutionResult;
     static random(nested?: number): Promise<PrivateCallExecutionResult>;
@@ -169,14 +171,27 @@ export declare function collectNoteHashNullifierCounterMap(execResult: PrivateEx
  * @param execResult - The topmost execution result.
  * @returns All contract class logs.
  */
-export declare function collectSortedContractClassLogs(execResult: PrivateExecutionResult): ContractClassLog[];
+export declare function collectSortedContractClassLogs(execResult: PrivateExecutionResult): ContractClassLogFields[];
 /**
- * Collect all enqueued public function calls across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All enqueued public function calls.
+ * 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 declare function collectEnqueuedPublicFunctionCalls(execResult: PrivateExecutionResult): PublicExecutionRequest[];
-export declare function collectPublicTeardownFunctionCall(execResult: PrivateExecutionResult): PublicExecutionRequest;
+export declare function collectOffchainEffects(execResult: PrivateExecutionResult): OffchainEffect[];
 export declare function getFinalMinRevertibleSideEffectCounter(execResult: PrivateExecutionResult): number;
 export declare function collectNested<T>(executionStack: PrivateCallExecutionResult[], extractExecutionItems: (execution: PrivateCallExecutionResult) => T[]): T[];
+export declare class PrivateExecutionProfileResult {
+    timings: {
+        witgen: number;
+        oracles?: Record<string, {
+            times: number[];
+        }>;
+    };
+    constructor(timings: {
+        witgen: number;
+        oracles?: Record<string, {
+            times: number[];
+        }>;
+    });
+}
 //# sourceMappingURL=private_execution_result.d.ts.map

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

@@ -8,7 +8,7 @@ import { sortByCounter } from '../kernel/utils/order_and_comparison.js';
 import { ContractClassLog } from '../logs/contract_class_log.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 {
@@ -54,47 +54,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, or zero 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 block number that this execution was simulated with.
+   */ getSimulationBlockNumber() {
+        return this.entrypoint.publicInputs.historicalHeader.globalVariables.blockNumber;
     }
 }
 /**
@@ -108,16 +96,17 @@ export class PrivateExecutionResult {
     newNotes;
     noteHashNullifierCounterMap;
     returnValues;
-    nestedExecutions;
-    enqueuedPublicFunctionCalls;
-    publicTeardownFunctionCall;
+    offchainEffects;
+    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, /** 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 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;
@@ -126,10 +115,10 @@ export class PrivateExecutionResult {
         this.newNotes = newNotes;
         this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
         this.returnValues = returnValues;
-        this.nestedExecutions = nestedExecutions;
-        this.enqueuedPublicFunctionCalls = enqueuedPublicFunctionCalls;
-        this.publicTeardownFunctionCall = publicTeardownFunctionCall;
+        this.offchainEffects = offchainEffects;
+        this.nestedExecutionResults = nestedExecutionResults;
         this.contractClassLogs = contractClassLogs;
+        this.profileResult = profileResult;
     }
     static get schema() {
         return z.object({
@@ -141,14 +130,15 @@ export class PrivateExecutionResult {
             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)
+            })),
+            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.noteHashLeafIndexMap, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.nestedExecutionResults, fields.contractClassLogs);
     }
     static async random(nested = 1) {
         return new PrivateCallExecutionResult(randomBytes(4), randomBytes(4), new Map([
@@ -170,9 +160,13 @@ export class PrivateExecutionResult {
             ]
         ]), [
             Fr.random()
+        ], [
+            {
+                data: [
+                    Fr.random()
+                ]
+            }
         ], await timesParallel(nested, ()=>PrivateCallExecutionResult.random(0)), [
-            await CountedPublicExecutionRequest.random()
-        ], await PublicExecutionRequest.random(), [
             new CountedContractClassLog(await ContractClassLog.random(), randomInt(10))
         ]);
     }
@@ -181,7 +175,7 @@ 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));
+        callResult.nestedExecutionResults.forEach((nested)=>collectNoteHashLeafIndexMapRecursive(nested, accum));
     };
     collectNoteHashLeafIndexMapRecursive(execResult.entrypoint, accum);
     return accum;
@@ -190,7 +184,7 @@ 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 +196,7 @@ export function collectNoteHashNullifierCounterMap(execResult) {
  */ function collectContractClassLogs(execResult) {
     return [
         execResult.contractClassLogs,
-        ...execResult.nestedExecutions.flatMap(collectContractClassLogs)
+        ...execResult.nestedExecutionResults.flatMap(collectContractClassLogs)
     ].flat();
 }
 /**
@@ -212,43 +206,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 +235,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/processed_tx.d.ts

@@ -4,7 +4,6 @@ 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 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 { GlobalVariables } from './global_variables.js';
@@ -38,9 +37,9 @@ export type ProcessedTx = {
      */
     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 +67,7 @@ export type FailedTx = {
      */
     error: Error;
 };
-export declare function makeProcessedTxFromPrivateOnlyTx(tx: Tx, transactionFee: Fr, feePaymentPublicDataWrite: PublicDataWrite, globalVariables: GlobalVariables): Promise<ProcessedTx>;
+export declare function makeProcessedTxFromPrivateOnlyTx(tx: Tx, transactionFee: Fr, feePaymentPublicDataWrite: PublicDataWrite, globalVariables: GlobalVariables): 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>;
+export declare function makeProcessedTxFromTxWithPublicCalls(tx: Tx, avmProvingRequest: AvmProvingRequest, gasUsed: GasUsed, revertCode: RevertCode, revertReason: SimulationError | undefined): ProcessedTx;
 //# sourceMappingURL=processed_tx.d.ts.map

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,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,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,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,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,MAAM,CAI1D;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"}

package/dest/tx/processed_tx.js

@@ -1,7 +1,6 @@
 import { RevertCode } from '../avm/revert_code.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 +8,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,
@@ -27,7 +31,7 @@ export async function makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePa
         data: tx.data,
         clientIvcProof: tx.clientIvcProof,
         avmProvingRequest: undefined,
-        constants,
+        globalVariables,
         txEffect,
         gasUsed,
         revertCode: RevertCode.OK,
@@ -39,25 +43,28 @@ export function toNumBlobFields(txs) {
         return acc + tx.txEffect.toBlobFields().length;
     }, 0);
 }
-export async function makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason) {
+export function makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason) {
     const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
-    const constants = CombinedConstantData.combine(tx.data.constants, avmPublicInputs.globalVariables);
+    const globalVariables = avmPublicInputs.globalVariables;
     const publicDataWrites = avmPublicInputs.accumulatedData.publicDataWrites.filter((w)=>!w.isEmpty());
     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(), 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({
+            l2Sender: msg.contractAddress,
+            l1Recipient: msg.message.recipient,
+            content: msg.message.content,
+            rollupVersion: globalVariables.version,
+            chainId: globalVariables.chainId
+        })), publicDataWrites, privateLogs, avmPublicInputs.accumulatedData.publicLogs.filter((l)=>!l.isEmpty()), contractClassLogs);
     return {
         hash: txEffect.txHash,
         data: tx.data,
         clientIvcProof: tx.clientIvcProof,
         avmProvingRequest,
-        constants,
+        globalVariables,
         txEffect,
         gasUsed,
         revertCode,