@aztec/simulator 0.55.1 → 0.57.0

package/dest/public/tail_phase_manager.js

@@ -1,50 +0,0 @@
-import { PublicKernelType } from '@aztec/circuit-types';
-import { MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicKernelTailCircuitPrivateInputs, mergeAccumulatedData, } from '@aztec/circuits.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-export class TailPhaseManager extends AbstractPhaseManager {
-    constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, publicContractsDB, publicStateDB, phase = PublicKernelType.TAIL) {
-        super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
-        this.publicContractsDB = publicContractsDB;
-        this.publicStateDB = publicStateDB;
-    }
-    async handle(tx, previousPublicKernelOutput, previousKernelArtifact) {
-        this.log.verbose(`Processing tx ${tx.getTxHash()}`);
-        const [inputs, finalKernelOutput] = await this.simulate(previousPublicKernelOutput, previousKernelArtifact).catch(
-        // the abstract phase manager throws if simulation gives error in non-revertible phase
-        async (err) => {
-            await this.publicStateDB.rollbackToCommit();
-            throw err;
-        });
-        // Return a tail proving request
-        const kernelRequest = {
-            type: PublicKernelType.TAIL,
-            inputs: inputs,
-        };
-        return {
-            publicProvingRequests: [kernelRequest],
-            publicKernelOutput: previousPublicKernelOutput,
-            lastKernelArtifact: 'PublicKernelTailArtifact',
-            finalKernelOutput,
-            returnValues: [],
-        };
-    }
-    async simulate(previousOutput, previousKernelArtifact) {
-        const inputs = await this.buildPrivateInputs(previousOutput, previousKernelArtifact);
-        // We take a deep copy (clone) of these to pass to the prover
-        return [inputs.clone(), await this.publicKernel.publicKernelCircuitTail(inputs)];
-    }
-    async buildPrivateInputs(previousOutput, previousKernelArtifact) {
-        const previousKernel = this.getPreviousKernelData(previousOutput, previousKernelArtifact);
-        const { validationRequests, endNonRevertibleData: nonRevertibleData, end: revertibleData } = previousOutput;
-        const noteHashReadRequestHints = await this.hintsBuilder.getNoteHashReadRequestsHints(validationRequests.noteHashReadRequests);
-        const pendingNullifiers = mergeAccumulatedData(nonRevertibleData.nullifiers, revertibleData.nullifiers, MAX_NULLIFIERS_PER_TX);
-        const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(validationRequests.nullifierReadRequests, pendingNullifiers);
-        const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(validationRequests.nullifierNonExistentReadRequests, pendingNullifiers);
-        const l1ToL2MsgReadRequestHints = await this.hintsBuilder.getL1ToL2MsgReadRequestsHints(validationRequests.l1ToL2MsgReadRequests);
-        const pendingPublicDataWrites = mergeAccumulatedData(nonRevertibleData.publicDataUpdateRequests, revertibleData.publicDataUpdateRequests, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
-        const publicDataHints = await this.hintsBuilder.getPublicDataHints(validationRequests.publicDataReads, pendingPublicDataWrites);
-        const currentState = await this.db.getStateReference();
-        return new PublicKernelTailCircuitPrivateInputs(previousKernel, noteHashReadRequestHints, nullifierReadRequestHints, nullifierNonExistentReadRequestHints, l1ToL2MsgReadRequestHints, publicDataHints, currentState.partial);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFpbF9waGFzZV9tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90YWlsX3BoYXNlX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUE0QixnQkFBZ0IsRUFBVyxNQUFNLHNCQUFzQixDQUFDO0FBQzNGLE9BQU8sRUFJTCxxQkFBcUIsRUFDckIsc0NBQXNDLEVBRXRDLG9DQUFvQyxFQUNwQyxvQkFBb0IsR0FDckIsTUFBTSxvQkFBb0IsQ0FBQztBQUs1QixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUluRSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQ3hELFlBQ0UsRUFBd0IsRUFDeEIsY0FBOEIsRUFDOUIsWUFBMEMsRUFDMUMsZUFBZ0MsRUFDaEMsZ0JBQXdCLEVBQ2QsaUJBQThDLEVBQzlDLGFBQTRCLEVBQ3RDLFFBQTBCLGdCQUFnQixDQUFDLElBQUk7UUFFL0MsS0FBSyxDQUFDLEVBQUUsRUFBRSxjQUFjLEVBQUUsWUFBWSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUp4RSxzQkFBaUIsR0FBakIsaUJBQWlCLENBQTZCO1FBQzlDLGtCQUFhLEdBQWIsYUFBYSxDQUFlO0lBSXhDLENBQUM7SUFFUSxLQUFLLENBQUMsTUFBTSxDQUNuQixFQUFNLEVBQ04sMEJBQTJELEVBQzNELHNCQUF3QztRQUV4QyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwRCxNQUFNLENBQUMsTUFBTSxFQUFFLGlCQUFpQixDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLDBCQUEwQixFQUFFLHNCQUFzQixDQUFDLENBQUMsS0FBSztRQUMvRyxzRkFBc0Y7UUFDdEYsS0FBSyxFQUFDLEdBQUcsRUFBQyxFQUFFO1lB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

package/dest/public/teardown_phase_manager.d.ts

@@ -1,27 +0,0 @@
-import { PublicKernelType, type PublicProvingRequest, type Tx } from '@aztec/circuit-types';
-import { type Fr, type Gas, type GlobalVariables, type Header, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
-import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
-import { type MerkleTreeOperations } from '@aztec/world-state';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { type ContractsDataSourcePublicDB } from './public_db_sources.js';
-import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export declare class TeardownPhaseManager extends AbstractPhaseManager {
-    protected publicContractsDB: ContractsDataSourcePublicDB;
-    protected publicStateDB: PublicStateDB;
-    constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header, publicContractsDB: ContractsDataSourcePublicDB, publicStateDB: PublicStateDB, phase?: PublicKernelType);
-    handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, previousKernelArtifact: ProtocolArtifact): Promise<{
-        publicProvingRequests: PublicProvingRequest[];
-        publicKernelOutput: PublicKernelCircuitPublicInputs;
-        lastKernelArtifact: ProtocolArtifact;
-        revertReason: import("@aztec/circuit-types").SimulationError | undefined;
-        returnValues: never[];
-        gasUsed: Gas | undefined;
-    }>;
-    protected getTransactionFee(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs): Fr;
-    protected getAvailableGas(tx: Tx, _previousPublicKernelOutput: PublicKernelCircuitPublicInputs): Gas;
-}
-//# sourceMappingURL=teardown_phase_manager.d.ts.map

package/dest/public/teardown_phase_manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"teardown_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/teardown_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,EAAE,EACP,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,+BAA+B,EACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAI/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB;IAO1D,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;gBANtC,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACd,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EACtC,KAAK,GAAE,gBAA4C;IAKtC,MAAM,CACnB,EAAE,EAAE,EAAE,EACN,0BAA0B,EAAE,+BAA+B,EAC3D,sBAAsB,EAAE,gBAAgB;;;;;;;;cAkCvB,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,+BAA+B,GAAG,EAAE;cAU1F,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,2BAA2B,EAAE,+BAA+B,GAAG,GAAG;CAG9G"}

package/dest/public/teardown_phase_manager.js

@@ -1,56 +0,0 @@
-import { PublicKernelType } from '@aztec/circuit-types';
-import { inspect } from 'util';
-import { AbstractPhaseManager, makeAvmProvingRequest } from './abstract_phase_manager.js';
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class TeardownPhaseManager extends AbstractPhaseManager {
-    constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, publicContractsDB, publicStateDB, phase = PublicKernelType.TEARDOWN) {
-        super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
-        this.publicContractsDB = publicContractsDB;
-        this.publicStateDB = publicStateDB;
-    }
-    async handle(tx, previousPublicKernelOutput, previousKernelArtifact) {
-        this.log.verbose(`Processing tx ${tx.getTxHash()}`);
-        const { publicProvingInformation, kernelOutput, lastKernelArtifact, newUnencryptedLogs, revertReason, gasUsed } = await this.processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousKernelArtifact).catch(
-        // the abstract phase manager throws if simulation gives error in a non-revertible phase
-        async (err) => {
-            await this.publicStateDB.rollbackToCommit();
-            throw err;
-        });
-        if (revertReason) {
-            await this.publicStateDB.rollbackToCheckpoint();
-            tx.filterRevertedLogs(kernelOutput);
-        }
-        else {
-            // TODO(#6464): Should we allow emitting contracts in the public teardown phase?
-            // if so, we should insert them here
-            tx.unencryptedLogs.addFunctionLogs(newUnencryptedLogs);
-        }
-        // Return a list of teardown proving requests
-        const publicProvingRequests = publicProvingInformation.map(info => {
-            return makeAvmProvingRequest(info, PublicKernelType.TEARDOWN);
-        });
-        return {
-            publicProvingRequests,
-            publicKernelOutput: kernelOutput,
-            lastKernelArtifact,
-            revertReason,
-            returnValues: [],
-            gasUsed,
-        };
-    }
-    getTransactionFee(tx, previousPublicKernelOutput) {
-        const gasSettings = tx.data.constants.txContext.gasSettings;
-        const gasFees = this.globalVariables.gasFees;
-        // No need to add teardown limits since they are already included in end.gasUsed
-        const gasUsed = previousPublicKernelOutput.end.gasUsed.add(previousPublicKernelOutput.endNonRevertibleData.gasUsed);
-        const txFee = gasSettings.inclusionFee.add(gasUsed.computeFee(gasFees));
-        this.log.debug(`Computed tx fee`, { txFee, gasUsed: inspect(gasUsed), gasFees: inspect(gasFees) });
-        return txFee;
-    }
-    getAvailableGas(tx, _previousPublicKernelOutput) {
-        return tx.data.constants.txContext.gasSettings.getTeardownLimits();
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVhcmRvd25fcGhhc2VfbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvdGVhcmRvd25fcGhhc2VfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQXNDLE1BQU0sc0JBQXNCLENBQUM7QUFZNUYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUUvQixPQUFPLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUkxRjs7R0FFRztBQUNILE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxvQkFBb0I7SUFDNUQsWUFDRSxFQUF3QixFQUN4QixjQUE4QixFQUM5QixZQUEwQyxFQUMxQyxlQUFnQyxFQUNoQyxnQkFBd0IsRUFDZCxpQkFBOEMsRUFDOUMsYUFBNEIsRUFDdEMsUUFBMEIsZ0JBQWdCLENBQUMsUUFBUTtRQUVuRCxLQUFLLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBSnhFLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBNkI7UUFDOUMsa0JBQWEsR0FBYixhQUFhLENBQWU7SUFJeEMsQ0FBQztJQUVRLEtBQUssQ0FBQyxNQUFNLENBQ25CLEVBQU0sRUFDTiwwQkFBMkQsRUFDM0Qsc0JBQXdDO1FBRXhDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLGlCQUFpQixFQUFFLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxHQUM3RyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLEVBQUUsMEJBQTBCLEVBQUUsc0JBQXNCLENBQUMsQ0FBQyxLQUFLO1FBQ2pHLHdGQUF3RjtRQUN4RixLQUFLLEVBQUMsR0FBRyxFQUFDLEVBQUU7WUFDVixNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUM1QyxNQUFNLEdBQUcsQ0FBQztRQUNaLENBQUMsQ0FDRixDQUFDO1FBQ0osSUFBSSxZQUFZLEVBQUUsQ0FBQztZQUNqQixNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztZQUNoRCxFQUFFLENBQUMsa0JBQWtCLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEMsQ0FBQzthQUFNLENBQUM7WUFDTixnRkFBZ0Y7WUFDaEYsb0NBQW9DO1lBQ3BDLEVBQUUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDekQsQ0FBQztRQUVELDZDQUE2QztRQUM3QyxNQUFNLHFCQUFxQixHQUEyQix3QkFBd0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDeEYsT0FBTyxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDaEUsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPO1lBQ0wscUJBQXFCO1lBQ3JCLGtCQUFrQixFQUFFLFlBQVk7WUFDaEMsa0JBQWtCO1lBQ2xCLFlBQVk7WUFDWixZQUFZLEVBQUUsRUFBRTtZQUNoQixPQUFPO1NBQ1IsQ0FBQztJQUNKLENBQUM7SUFFa0IsaUJBQWlCLENBQUMsRUFBTSxFQUFFLDBCQUEyRDtRQUN0RyxNQUFNLFdBQVcsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDO1FBQzVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDO1FBQzdDLGdGQUFnRjtRQUNoRixNQUFNLE9BQU8sR0FBRywwQkFBMEIsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQyxvQkFBb0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNwSCxNQUFNLEtBQUssR0FBRyxXQUFXLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDeEUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNuRyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFa0IsZUFBZSxDQUFDLEVBQU0sRUFBRSwyQkFBNEQ7UUFDckcsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDckUsQ0FBQztDQUNGIn0=

package/src/avm/journal/host_storage.ts

@@ -1,14 +0,0 @@
-import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../public/db_interfaces.js';
-
-/**
- * Host storage
- *
- * A wrapper around the node dbs
- */
-export class HostStorage {
-  constructor(
-    public readonly publicStateDb: PublicStateDB,
-    public readonly contractsDb: PublicContractsDB,
-    public readonly commitmentsDb: CommitmentsDB,
-  ) {}
-}

package/src/avm/opcodes/context_getters.ts

@@ -1,23 +0,0 @@
-import type { AvmContext } from '../avm_context.js';
-import { Field, type MemoryValue } from '../avm_memory_types.js';
-import { Opcode } from '../serialization/instruction_serialization.js';
-import { GetterInstruction } from './instruction_impl.js';
-
-export class L2GasLeft extends GetterInstruction {
-  static type: string = 'L2GASLEFT';
-  static readonly opcode: Opcode = Opcode.L2GASLEFT;
-
-  // TODO(@spalladino) Protocol specs specifies that the value should be an Uint32, not a Field.
-  protected getValue(context: AvmContext): MemoryValue {
-    return new Field(context.machineState.l2GasLeft);
-  }
-}
-
-export class DAGasLeft extends GetterInstruction {
-  static type: string = 'DAGASLEFT';
-  static readonly opcode: Opcode = Opcode.DAGASLEFT;
-
-  protected getValue(context: AvmContext): MemoryValue {
-    return new Field(context.machineState.daGasLeft);
-  }
-}

package/src/client/execution_result.ts

@@ -1,228 +0,0 @@
-import {
-  EncryptedFunctionL2Logs,
-  type EncryptedL2Log,
-  type EncryptedL2NoteLog,
-  EncryptedNoteFunctionL2Logs,
-  type Note,
-  PublicExecutionRequest,
-  UnencryptedFunctionL2Logs,
-  type UnencryptedL2Log,
-} from '@aztec/circuit-types';
-import { type IsEmpty, type PrivateCallStackItem, sortByCounter } from '@aztec/circuits.js';
-import { type NoteSelector } from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
-
-import { type ACVMField } from '../acvm/index.js';
-
-/**
- * The contents of a new note.
- */
-export interface NoteAndSlot {
-  /** The note. */
-  note: Note;
-  /** The storage slot of the note. */
-  storageSlot: Fr;
-  /** The note type identifier. */
-  noteTypeId: NoteSelector;
-}
-
-export class CountedLog<TLog extends UnencryptedL2Log | EncryptedL2NoteLog | EncryptedL2Log> implements IsEmpty {
-  constructor(public log: TLog, public counter: number) {}
-
-  isEmpty(): boolean {
-    return !this.log.data.length && !this.counter;
-  }
-}
-
-export class CountedNoteLog extends CountedLog<EncryptedL2NoteLog> {
-  constructor(log: EncryptedL2NoteLog, counter: number, public noteHashCounter: number) {
-    super(log, counter);
-  }
-}
-
-export class CountedPublicExecutionRequest {
-  constructor(public request: PublicExecutionRequest, public counter: number) {}
-
-  isEmpty(): boolean {
-    return this.request.isEmpty() && !this.counter;
-  }
-}
-
-/**
- * The result of executing a private function.
- */
-export interface ExecutionResult {
-  // Needed for prover
-  /** The ACIR bytecode. */
-  acir: Buffer;
-  /** The verification key. */
-  vk: Buffer;
-  /** The partial witness. */
-  partialWitness: Map<number, ACVMField>;
-  // Needed for the verifier (kernel)
-  /** The call stack item. */
-  callStackItem: PrivateCallStackItem;
-  /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */
-  noteHashLeafIndexMap: Map<bigint, bigint>;
-  /** The notes created in the executed function. */
-  newNotes: NoteAndSlot[];
-  /** Mapping of note hash counter to the counter of its nullifier. */
-  noteHashNullifierCounterMap: Map<number, number>;
-  /** The raw return values of the executed function. */
-  returnValues: Fr[];
-  /** The nested executions. */
-  nestedExecutions: this[];
-  /** Enqueued public function execution requests to be picked up by the sequencer. */
-  enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[];
-  /** Public function execution requested for teardown */
-  publicTeardownFunctionCall: PublicExecutionRequest;
-  /**
-   * Encrypted note logs emitted during execution of this function call.
-   * Note: These are preimages to `noteEncryptedLogsHashes`.
-   */
-  noteEncryptedLogs: CountedNoteLog[];
-  /**
-   * Encrypted logs emitted during execution of this function call.
-   * Note: These are preimages to `encryptedLogsHashes`.
-   */
-  encryptedLogs: CountedLog<EncryptedL2Log>[];
-  /**
-   * Unencrypted logs emitted during execution of this function call.
-   * Note: These are preimages to `unencryptedLogsHashes`.
-   */
-  unencryptedLogs: CountedLog<UnencryptedL2Log>[];
-}
-
-export function collectNoteHashLeafIndexMap(execResult: ExecutionResult, accum: Map<bigint, bigint> = new Map()) {
-  execResult.noteHashLeafIndexMap.forEach((value, key) => accum.set(key, value));
-  execResult.nestedExecutions.forEach(nested => collectNoteHashLeafIndexMap(nested, accum));
-  return accum;
-}
-
-export function collectNoteHashNullifierCounterMap(
-  execResult: ExecutionResult,
-  accum: Map<number, number> = new Map(),
-) {
-  execResult.noteHashNullifierCounterMap.forEach((value, key) => accum.set(key, value));
-  execResult.nestedExecutions.forEach(nested => collectNoteHashNullifierCounterMap(nested, accum));
-  return accum;
-}
-
-/**
- * Collect all encrypted logs across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All encrypted logs.
- */
-function collectNoteEncryptedLogs(
-  execResult: ExecutionResult,
-  noteHashNullifierCounterMap: Map<number, number>,
-  minRevertibleSideEffectCounter: number,
-): CountedLog<EncryptedL2NoteLog>[] {
-  return [
-    execResult.noteEncryptedLogs.filter(noteLog => {
-      const nullifierCounter = noteHashNullifierCounterMap.get(noteLog.noteHashCounter);
-      return (
-        nullifierCounter === undefined ||
-        (noteLog.noteHashCounter < minRevertibleSideEffectCounter && nullifierCounter >= minRevertibleSideEffectCounter)
-      );
-    }),
-    ...execResult.nestedExecutions.flatMap(res =>
-      collectNoteEncryptedLogs(res, noteHashNullifierCounterMap, minRevertibleSideEffectCounter),
-    ),
-  ].flat();
-}
-
-/**
- * Collect all encrypted logs across all nested executions and sorts by counter.
- * @param execResult - The topmost execution result.
- * @returns All encrypted logs.
- */
-export function collectSortedNoteEncryptedLogs(execResult: ExecutionResult): EncryptedNoteFunctionL2Logs {
-  const noteHashNullifierCounterMap = collectNoteHashNullifierCounterMap(execResult);
-  const minRevertibleSideEffectCounter = getFinalMinRevertibleSideEffectCounter(execResult);
-  const allLogs = collectNoteEncryptedLogs(execResult, noteHashNullifierCounterMap, minRevertibleSideEffectCounter);
-  const sortedLogs = sortByCounter(allLogs);
-  return new EncryptedNoteFunctionL2Logs(sortedLogs.map(l => l.log));
-}
-/**
- * Collect all encrypted logs across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All encrypted logs.
- */
-function collectEncryptedLogs(execResult: ExecutionResult): CountedLog<EncryptedL2Log>[] {
-  return [execResult.encryptedLogs, ...execResult.nestedExecutions.flatMap(collectEncryptedLogs)].flat();
-}
-
-/**
- * Collect all encrypted logs across all nested executions and sorts by counter.
- * @param execResult - The topmost execution result.
- * @returns All encrypted logs.
- */
-export function collectSortedEncryptedLogs(execResult: ExecutionResult): EncryptedFunctionL2Logs {
-  const allLogs = collectEncryptedLogs(execResult);
-  const sortedLogs = sortByCounter(allLogs);
-  return new EncryptedFunctionL2Logs(sortedLogs.map(l => l.log));
-}
-
-/**
- * Collect all unencrypted logs across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All unencrypted logs.
- */
-function collectUnencryptedLogs(execResult: ExecutionResult): CountedLog<UnencryptedL2Log>[] {
-  return [execResult.unencryptedLogs, ...execResult.nestedExecutions.flatMap(collectUnencryptedLogs)].flat();
-}
-
-/**
- * Collect all unencrypted logs across all nested executions and sorts by counter.
- * @param execResult - The topmost execution result.
- * @returns All unencrypted logs.
- */
-export function collectSortedUnencryptedLogs(execResult: ExecutionResult): UnencryptedFunctionL2Logs {
-  const allLogs = collectUnencryptedLogs(execResult);
-  const sortedLogs = sortByCounter(allLogs);
-  return new UnencryptedFunctionL2Logs(sortedLogs.map(l => l.log));
-}
-
-function collectEnqueuedCountedPublicExecutionRequests(execResult: ExecutionResult): CountedPublicExecutionRequest[] {
-  return [
-    ...execResult.enqueuedPublicFunctionCalls,
-    ...execResult.nestedExecutions.flatMap(collectEnqueuedCountedPublicExecutionRequests),
-  ];
-}
-
-/**
- * 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: ExecutionResult): PublicExecutionRequest[] {
-  const countedRequests = collectEnqueuedCountedPublicExecutionRequests(execResult);
-  // 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: ExecutionResult): PublicExecutionRequest {
-  const teardownCalls = [
-    execResult.publicTeardownFunctionCall,
-    ...execResult.nestedExecutions.flatMap(collectPublicTeardownFunctionCall),
-  ].filter(call => !call.isEmpty());
-
-  if (teardownCalls.length === 1) {
-    return teardownCalls[0];
-  }
-
-  if (teardownCalls.length > 1) {
-    throw new Error('Multiple public teardown calls detected');
-  }
-
-  return PublicExecutionRequest.empty();
-}
-
-export function getFinalMinRevertibleSideEffectCounter(execResult: ExecutionResult): number {
-  return execResult.nestedExecutions.reduce((counter, exec) => {
-    const nestedCounter = getFinalMinRevertibleSideEffectCounter(exec);
-    return nestedCounter ? nestedCounter : counter;
-  }, execResult.callStackItem.publicInputs.minRevertibleSideEffectCounter.toNumber());
-}

package/src/common/return_values.ts

@@ -1,18 +0,0 @@
-import { NestedProcessReturnValues } from '@aztec/circuit-types';
-
-import type { ExecutionResult } from '../client/execution_result.js';
-import type { PublicExecutionResult } from '../public/execution.js';
-
-/**
- * Recursively accummulate the return values of a call result and its nested executions,
- * so they can be retrieved in order.
- * @param executionResult
- * @returns
- */
-export function accumulateReturnValues(
-  executionResult: PublicExecutionResult | ExecutionResult,
-): NestedProcessReturnValues {
-  const acc = new NestedProcessReturnValues(executionResult.returnValues);
-  acc.nested = executionResult.nestedExecutions.map(nestedExecution => accumulateReturnValues(nestedExecution));
-  return acc;
-}