@aztec/simulator 0.43.0 → 0.45.0

package/dest/avm/journal/trace_types.d.ts

@@ -1,55 +0,0 @@
-import { type Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
-export type TracedPublicStorageRead = {
-    storageAddress: Fr;
-    exists: boolean;
-    cached: boolean;
-    slot: Fr;
-    value: Fr;
-    counter: Fr;
-};
-export type TracedPublicStorageWrite = {
-    storageAddress: Fr;
-    slot: Fr;
-    value: Fr;
-    counter: Fr;
-};
-export type TracedNoteHashCheck = {
-    storageAddress: Fr;
-    leafIndex: Fr;
-    noteHash: Fr;
-    exists: boolean;
-    counter: Fr;
-};
-export type TracedNoteHash = {
-    storageAddress: Fr;
-    noteHash: Fr;
-    counter: Fr;
-};
-export type TracedNullifierCheck = {
-    storageAddress: Fr;
-    nullifier: Fr;
-    exists: boolean;
-    counter: Fr;
-    isPending: boolean;
-    leafIndex: Fr;
-};
-export type TracedNullifier = {
-    storageAddress: Fr;
-    nullifier: Fr;
-    counter: Fr;
-};
-export type TracedL1toL2MessageCheck = {
-    leafIndex: Fr;
-    msgHash: Fr;
-    exists: boolean;
-    counter: Fr;
-};
-export type TracedUnencryptedL2Log = {
-    logHash: Fr;
-    counter: Fr;
-};
-export type TracedContractInstance = {
-    exists: boolean;
-} & ContractInstanceWithAddress;
-//# sourceMappingURL=trace_types.d.ts.map

package/dest/avm/journal/trace_types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trace_types.d.ts","sourceRoot":"","sources":["../../../src/avm/journal/trace_types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAS1E,MAAM,MAAM,uBAAuB,GAAG;IAEpC,cAAc,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IAErC,cAAc,EAAE,EAAE,CAAC;IACnB,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,EAAE,CAAC;IACV,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,QAAQ,EAAE,EAAE,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,cAAc,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,EAAE,CAAC;IACb,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;IAIZ,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAE5B,cAAc,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,EAAE,CAAC;IACd,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IAErC,SAAS,EAAE,EAAE,CAAC;IACd,OAAO,EAAE,EAAE,CAAC;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IAEnC,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;CAEb,CAAC;AAOF,MAAM,MAAM,sBAAsB,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,2BAA2B,CAAC"}

package/dest/avm/journal/trace_types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhY2VfdHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL2pvdXJuYWwvdHJhY2VfdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/public/transitional_adaptors.d.ts

@@ -1,21 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Gas, type GasSettings, type GlobalVariables, type Header } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-import { type AvmContext } from '../avm/avm_context.js';
-import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type AvmContractCallResults } from '../avm/avm_message_call_result.js';
-import { type PublicExecution, type PublicExecutionResult } from './execution.js';
-/**
- * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
- *
- * @param current
- * @param globalVariables
- * @returns
- */
-export declare function createAvmExecutionEnvironment(current: PublicExecution, header: Header, globalVariables: GlobalVariables, gasSettings: GasSettings, transactionFee: Fr): AvmExecutionEnvironment;
-export declare function createPublicExecution(startSideEffectCounter: number, avmEnvironment: AvmExecutionEnvironment, calldata: Fr[]): PublicExecution;
-export declare function convertAvmResultsToPxResult(avmResult: AvmContractCallResults, startSideEffectCounter: number, fromPx: PublicExecution, startGas: Gas, endAvmContext: AvmContext, bytecode: Buffer | undefined): PublicExecutionResult;
-export declare function markBytecodeAsAvm(bytecode: Buffer): Buffer;
-export declare function decompressBytecodeIfCompressed(bytecode: Buffer): Promise<Buffer>;
-export declare function isAvmBytecode(bytecode: Buffer): Promise<boolean>;
-//# sourceMappingURL=transitional_adaptors.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"transitional_adaptors.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adaptors.ts"],"names":[],"mappings":";AAEA,OAAO,EAML,GAAG,EACH,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,MAAM,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAKhF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAElF;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,EAAE,GACjB,uBAAuB,CAiBzB;AAED,wBAAgB,qBAAqB,CACnC,sBAAsB,EAAE,MAAM,EAC9B,cAAc,EAAE,uBAAuB,EACvC,QAAQ,EAAE,EAAE,EAAE,GACb,eAAe,CAgBjB;AA8BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,sBAAsB,EACjC,sBAAsB,EAAE,MAAM,EAC9B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,GAAG,EACb,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,qBAAqB,CAuBvB;AASD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAGD,wBAAsB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQtF;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAItE"}

package/dest/public/transitional_adaptors.js

@@ -1,90 +0,0 @@
-// All code in this file needs to die once the public executor is phased out in favor of the AVM.
-import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { AvmContractInstanceHint, AvmExecutionHints, AvmExternalCallHint, AvmKeyValueHint, CallContext, Gas, } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-import { promisify } from 'util';
-import { gunzip } from 'zlib';
-import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { Mov } from '../avm/opcodes/memory.js';
-import { createSimulationError } from '../common/errors.js';
-/**
- * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
- *
- * @param current
- * @param globalVariables
- * @returns
- */
-export function createAvmExecutionEnvironment(current, header, globalVariables, gasSettings, transactionFee) {
-    return new AvmExecutionEnvironment(current.contractAddress, current.callContext.storageContractAddress, current.callContext.msgSender, globalVariables.gasFees.feePerL2Gas, globalVariables.gasFees.feePerDaGas, 
-    /*contractCallDepth=*/ Fr.zero(), header, globalVariables, current.callContext.isStaticCall, current.callContext.isDelegateCall, current.args, gasSettings, transactionFee, current.functionSelector);
-}
-export function createPublicExecution(startSideEffectCounter, avmEnvironment, calldata) {
-    const callContext = CallContext.from({
-        msgSender: avmEnvironment.sender,
-        storageContractAddress: avmEnvironment.storageAddress,
-        functionSelector: avmEnvironment.temporaryFunctionSelector,
-        isDelegateCall: avmEnvironment.isDelegateCall,
-        isStaticCall: avmEnvironment.isStaticCall,
-        sideEffectCounter: startSideEffectCounter,
-    });
-    const execution = {
-        contractAddress: avmEnvironment.address,
-        callContext,
-        args: calldata,
-        functionSelector: avmEnvironment.temporaryFunctionSelector,
-    };
-    return execution;
-}
-function computeHints(trace, executionResult) {
-    return new AvmExecutionHints(trace.publicStorageReads.map(read => new AvmKeyValueHint(read.counter, read.value)), trace.noteHashChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))), trace.nullifierChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))), trace.l1ToL2MessageChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))), executionResult.nestedExecutions.map(nested => {
-        const gasUsed = new Gas(nested.startGasLeft.daGas - nested.endGasLeft.daGas, nested.startGasLeft.l2Gas - nested.endGasLeft.l2Gas);
-        return new AvmExternalCallHint(/*success=*/ new Fr(nested.reverted ? 0 : 1), nested.returnValues, gasUsed);
-    }), trace.gotContractInstances.map(instance => new AvmContractInstanceHint(instance.address, new Fr(instance.exists ? 1 : 0), instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeysHash)));
-}
-export function convertAvmResultsToPxResult(avmResult, startSideEffectCounter, fromPx, startGas, endAvmContext, bytecode) {
-    const endPersistableState = endAvmContext.persistableState;
-    const endMachineState = endAvmContext.machineState;
-    return {
-        ...endPersistableState.transitionalExecutionResult, // includes nestedExecutions
-        execution: fromPx,
-        returnValues: avmResult.output,
-        startSideEffectCounter: new Fr(startSideEffectCounter),
-        endSideEffectCounter: new Fr(endPersistableState.trace.accessCounter),
-        unencryptedLogs: new UnencryptedFunctionL2Logs(endPersistableState.transitionalExecutionResult.unencryptedLogs),
-        allUnencryptedLogs: new UnencryptedFunctionL2Logs(endPersistableState.transitionalExecutionResult.allUnencryptedLogs),
-        reverted: avmResult.reverted,
-        revertReason: avmResult.revertReason ? createSimulationError(avmResult.revertReason) : undefined,
-        startGasLeft: startGas,
-        endGasLeft: endMachineState.gasLeft,
-        transactionFee: endAvmContext.environment.transactionFee,
-        bytecode: bytecode,
-        calldata: endAvmContext.environment.calldata,
-        avmHints: computeHints(endPersistableState.trace, endPersistableState.transitionalExecutionResult),
-    };
-}
-const AVM_MAGIC_SUFFIX = Buffer.from([
-    Mov.opcode, // opcode
-    0x00, // indirect
-    ...Buffer.from('000018ca', 'hex'), // srcOffset
-    ...Buffer.from('000018ca', 'hex'), // dstOffset
-]);
-export function markBytecodeAsAvm(bytecode) {
-    return Buffer.concat([bytecode, AVM_MAGIC_SUFFIX]);
-}
-// This is just a helper function for the AVM circuit.
-export async function decompressBytecodeIfCompressed(bytecode) {
-    try {
-        return await promisify(gunzip)(bytecode);
-    }
-    catch {
-        // If the bytecode is not compressed, the gunzip call will throw an error
-        // In this case, we assume the bytecode is not compressed and continue.
-        return Promise.resolve(bytecode);
-    }
-}
-export async function isAvmBytecode(bytecode) {
-    const decompressedBytecode = await decompressBytecodeIfCompressed(bytecode);
-    const magicSize = AVM_MAGIC_SUFFIX.length;
-    return decompressedBytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0b3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUdBQWlHO0FBQ2pHLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pFLE9BQU8sRUFDTCx1QkFBdUIsRUFDdkIsaUJBQWlCLEVBQ2pCLG1CQUFtQixFQUNuQixlQUFlLEVBQ2YsV0FBVyxFQUNYLEdBQUcsR0FJSixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFHOUIsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFJOUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSw2QkFBNkIsQ0FDM0MsT0FBd0IsRUFDeEIsTUFBYyxFQUNkLGVBQWdDLEVBQ2hDLFdBQXdCLEVBQ3hCLGNBQWtCO0lBRWxCLE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsT0FBTyxDQUFDLGVBQWUsRUFDdkIsT0FBTyxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsRUFDMUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQzdCLGVBQWUsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUNuQyxlQUFlLENBQUMsT0FBTyxDQUFDLFdBQVc7SUFDbkMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxFQUNoQyxNQUFNLEVBQ04sZUFBZSxFQUNmLE9BQU8sQ0FBQyxX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

package/src/avm/journal/trace.ts

@@ -1,181 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-
-import {
-  type TracedContractInstance,
-  type TracedL1toL2MessageCheck,
-  type TracedNoteHash,
-  type TracedNoteHashCheck,
-  type TracedNullifier,
-  type TracedNullifierCheck,
-  type TracedPublicStorageRead,
-  type TracedPublicStorageWrite,
-  type TracedUnencryptedL2Log,
-} from './trace_types.js';
-
-export class WorldStateAccessTrace {
-  public accessCounter: number;
-
-  public publicStorageReads: TracedPublicStorageRead[] = [];
-  public publicStorageWrites: TracedPublicStorageWrite[] = [];
-
-  public noteHashChecks: TracedNoteHashCheck[] = [];
-  public newNoteHashes: TracedNoteHash[] = [];
-  public nullifierChecks: TracedNullifierCheck[] = [];
-  public newNullifiers: TracedNullifier[] = [];
-  public l1ToL2MessageChecks: TracedL1toL2MessageCheck[] = [];
-  public newLogsHashes: TracedUnencryptedL2Log[] = [];
-  public gotContractInstances: TracedContractInstance[] = [];
-
-  //public contractCalls: TracedContractCall[] = [];
-  //public archiveChecks: TracedArchiveLeafCheck[] = [];
-
-  constructor(parentTrace?: WorldStateAccessTrace) {
-    this.accessCounter = parentTrace ? parentTrace.accessCounter : 0;
-    // TODO(4805): consider tracking the parent's trace vector lengths so we can enforce limits
-  }
-
-  public getAccessCounter() {
-    return this.accessCounter;
-  }
-
-  public tracePublicStorageRead(storageAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
-    // TODO(4805): check if some threshold is reached for max storage reads
-    // (need access to parent length, or trace needs to be initialized with parent's contents)
-    const traced: TracedPublicStorageRead = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      slot,
-      value,
-      exists,
-      cached,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.publicStorageReads.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public tracePublicStorageWrite(storageAddress: Fr, slot: Fr, value: Fr) {
-    // TODO(4805): check if some threshold is reached for max storage writes
-    // (need access to parent length, or trace needs to be initialized with parent's contents)
-    const traced: TracedPublicStorageWrite = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      slot,
-      value,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.publicStorageWrites.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNoteHashCheck(storageAddress: Fr, noteHash: Fr, exists: boolean, leafIndex: Fr) {
-    const traced: TracedNoteHashCheck = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      noteHash,
-      exists,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-      leafIndex,
-    };
-    this.noteHashChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewNoteHash(storageAddress: Fr, noteHash: Fr) {
-    // TODO(4805): check if some threshold is reached for max new note hash
-    const traced: TracedNoteHash = {
-      //  callPointer: Fr.ZERO,
-      storageAddress,
-      noteHash,
-      counter: new Fr(this.accessCounter),
-      //  endLifetime: Fr.ZERO,
-    };
-    this.newNoteHashes.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNullifierCheck(storageAddress: Fr, nullifier: Fr, exists: boolean, isPending: boolean, leafIndex: Fr) {
-    // TODO(4805): check if some threshold is reached for max new nullifier
-    const traced: TracedNullifierCheck = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      nullifier,
-      exists,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-      isPending,
-      leafIndex,
-    };
-    this.nullifierChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewNullifier(storageAddress: Fr, nullifier: Fr) {
-    // TODO(4805): check if some threshold is reached for max new nullifier
-    const tracedNullifier: TracedNullifier = {
-      // callPointer: Fr.ZERO,
-      storageAddress,
-      nullifier,
-      counter: new Fr(this.accessCounter),
-      // endLifetime: Fr.ZERO,
-    };
-    this.newNullifiers.push(tracedNullifier);
-    this.incrementAccessCounter();
-  }
-
-  public traceL1ToL2MessageCheck(msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
-    // TODO(4805): check if some threshold is reached for max message reads
-    const traced: TracedL1toL2MessageCheck = {
-      //callPointer: Fr.ZERO, // FIXME
-      leafIndex: msgLeafIndex,
-      msgHash: msgHash,
-      exists: exists,
-      counter: new Fr(this.accessCounter),
-      //endLifetime: Fr.ZERO, // FIXME
-    };
-    this.l1ToL2MessageChecks.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceNewLog(logHash: Fr) {
-    const traced: TracedUnencryptedL2Log = {
-      logHash,
-      counter: new Fr(this.accessCounter),
-    };
-    this.newLogsHashes.push(traced);
-    this.incrementAccessCounter();
-  }
-
-  public traceGetContractInstance(instance: TracedContractInstance) {
-    this.gotContractInstances.push(instance);
-    this.incrementAccessCounter();
-  }
-
-  private incrementAccessCounter() {
-    this.accessCounter++;
-  }
-
-  /**
-   * Merges another trace into this one
-   *
-   * @param incomingTrace - the incoming trace to merge into this instance
-   */
-  public acceptAndMerge(incomingTrace: WorldStateAccessTrace) {
-    // Merge storage read and write journals
-    this.publicStorageReads.push(...incomingTrace.publicStorageReads);
-    this.publicStorageWrites.push(...incomingTrace.publicStorageWrites);
-    // Merge new note hashes and nullifiers
-    this.noteHashChecks.push(...incomingTrace.noteHashChecks);
-    this.newNoteHashes.push(...incomingTrace.newNoteHashes);
-    this.nullifierChecks.push(...incomingTrace.nullifierChecks);
-    this.newNullifiers.push(...incomingTrace.newNullifiers);
-    this.l1ToL2MessageChecks.push(...incomingTrace.l1ToL2MessageChecks);
-    this.newLogsHashes.push(...incomingTrace.newLogsHashes);
-    this.gotContractInstances.push(...incomingTrace.gotContractInstances);
-    // it is assumed that the incoming trace was initialized with this as parent, so accept counter
-    this.accessCounter = incomingTrace.accessCounter;
-  }
-}

package/src/avm/journal/trace_types.ts

@@ -1,91 +0,0 @@
-import { type Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
-
-//export type TracedContractCall = {
-//  callPointer: Fr;
-//  address: Fr;
-//  storageAddress: Fr;
-//  endLifetime: Fr;
-//};
-
-export type TracedPublicStorageRead = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  exists: boolean;
-  cached: boolean;
-  slot: Fr;
-  value: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedPublicStorageWrite = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  slot: Fr;
-  value: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedNoteHashCheck = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  leafIndex: Fr;
-  noteHash: Fr;
-  exists: boolean;
-  counter: Fr;
-  // endLifetime: Fr;
-};
-
-export type TracedNoteHash = {
-  //  callPointer: Fr;
-  storageAddress: Fr;
-  noteHash: Fr;
-  counter: Fr;
-  //  endLifetime: Fr;
-};
-
-export type TracedNullifierCheck = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  nullifier: Fr;
-  exists: boolean;
-  counter: Fr;
-  // endLifetime: Fr;
-  // the fields below are relevant only to the public kernel
-  // and are therefore omitted from VM inputs
-  isPending: boolean;
-  leafIndex: Fr;
-};
-
-export type TracedNullifier = {
-  // callPointer: Fr;
-  storageAddress: Fr;
-  nullifier: Fr;
-  counter: Fr;
-  // endLifetime: Fr;
-};
-
-export type TracedL1toL2MessageCheck = {
-  //callPointer: Fr;
-  leafIndex: Fr;
-  msgHash: Fr;
-  exists: boolean;
-  counter: Fr;
-  //endLifetime: Fr;
-};
-
-export type TracedUnencryptedL2Log = {
-  //callPointer: Fr;
-  logHash: Fr;
-  counter: Fr;
-  //endLifetime: Fr;
-};
-
-//export type TracedArchiveLeafCheck = {
-//  leafIndex: Fr;
-//  leaf: Fr;
-//};
-
-export type TracedContractInstance = { exists: boolean } & ContractInstanceWithAddress;

package/src/public/transitional_adaptors.ts

@@ -1,168 +0,0 @@
-// All code in this file needs to die once the public executor is phased out in favor of the AVM.
-import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import {
-  AvmContractInstanceHint,
-  AvmExecutionHints,
-  AvmExternalCallHint,
-  AvmKeyValueHint,
-  CallContext,
-  Gas,
-  type GasSettings,
-  type GlobalVariables,
-  type Header,
-} from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-
-import { promisify } from 'util';
-import { gunzip } from 'zlib';
-
-import { type AvmContext } from '../avm/avm_context.js';
-import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type AvmContractCallResults } from '../avm/avm_message_call_result.js';
-import { type PartialPublicExecutionResult } from '../avm/journal/journal.js';
-import { type WorldStateAccessTrace } from '../avm/journal/trace.js';
-import { Mov } from '../avm/opcodes/memory.js';
-import { createSimulationError } from '../common/errors.js';
-import { type PublicExecution, type PublicExecutionResult } from './execution.js';
-
-/**
- * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
- *
- * @param current
- * @param globalVariables
- * @returns
- */
-export function createAvmExecutionEnvironment(
-  current: PublicExecution,
-  header: Header,
-  globalVariables: GlobalVariables,
-  gasSettings: GasSettings,
-  transactionFee: Fr,
-): AvmExecutionEnvironment {
-  return new AvmExecutionEnvironment(
-    current.contractAddress,
-    current.callContext.storageContractAddress,
-    current.callContext.msgSender,
-    globalVariables.gasFees.feePerL2Gas,
-    globalVariables.gasFees.feePerDaGas,
-    /*contractCallDepth=*/ Fr.zero(),
-    header,
-    globalVariables,
-    current.callContext.isStaticCall,
-    current.callContext.isDelegateCall,
-    current.args,
-    gasSettings,
-    transactionFee,
-    current.functionSelector,
-  );
-}
-
-export function createPublicExecution(
-  startSideEffectCounter: number,
-  avmEnvironment: AvmExecutionEnvironment,
-  calldata: Fr[],
-): PublicExecution {
-  const callContext = CallContext.from({
-    msgSender: avmEnvironment.sender,
-    storageContractAddress: avmEnvironment.storageAddress,
-    functionSelector: avmEnvironment.temporaryFunctionSelector,
-    isDelegateCall: avmEnvironment.isDelegateCall,
-    isStaticCall: avmEnvironment.isStaticCall,
-    sideEffectCounter: startSideEffectCounter,
-  });
-  const execution: PublicExecution = {
-    contractAddress: avmEnvironment.address,
-    callContext,
-    args: calldata,
-    functionSelector: avmEnvironment.temporaryFunctionSelector,
-  };
-  return execution;
-}
-
-function computeHints(trace: WorldStateAccessTrace, executionResult: PartialPublicExecutionResult): AvmExecutionHints {
-  return new AvmExecutionHints(
-    trace.publicStorageReads.map(read => new AvmKeyValueHint(read.counter, read.value)),
-    trace.noteHashChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))),
-    trace.nullifierChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))),
-    trace.l1ToL2MessageChecks.map(check => new AvmKeyValueHint(check.counter, new Fr(check.exists ? 1 : 0))),
-    executionResult.nestedExecutions.map(nested => {
-      const gasUsed = new Gas(
-        nested.startGasLeft.daGas - nested.endGasLeft.daGas,
-        nested.startGasLeft.l2Gas - nested.endGasLeft.l2Gas,
-      );
-      return new AvmExternalCallHint(/*success=*/ new Fr(nested.reverted ? 0 : 1), nested.returnValues, gasUsed);
-    }),
-    trace.gotContractInstances.map(
-      instance =>
-        new AvmContractInstanceHint(
-          instance.address,
-          new Fr(instance.exists ? 1 : 0),
-          instance.salt,
-          instance.deployer,
-          instance.contractClassId,
-          instance.initializationHash,
-          instance.publicKeysHash,
-        ),
-    ),
-  );
-}
-
-export function convertAvmResultsToPxResult(
-  avmResult: AvmContractCallResults,
-  startSideEffectCounter: number,
-  fromPx: PublicExecution,
-  startGas: Gas,
-  endAvmContext: AvmContext,
-  bytecode: Buffer | undefined,
-): PublicExecutionResult {
-  const endPersistableState = endAvmContext.persistableState;
-  const endMachineState = endAvmContext.machineState;
-
-  return {
-    ...endPersistableState.transitionalExecutionResult, // includes nestedExecutions
-    execution: fromPx,
-    returnValues: avmResult.output,
-    startSideEffectCounter: new Fr(startSideEffectCounter),
-    endSideEffectCounter: new Fr(endPersistableState.trace.accessCounter),
-    unencryptedLogs: new UnencryptedFunctionL2Logs(endPersistableState.transitionalExecutionResult.unencryptedLogs),
-    allUnencryptedLogs: new UnencryptedFunctionL2Logs(
-      endPersistableState.transitionalExecutionResult.allUnencryptedLogs,
-    ),
-    reverted: avmResult.reverted,
-    revertReason: avmResult.revertReason ? createSimulationError(avmResult.revertReason) : undefined,
-    startGasLeft: startGas,
-    endGasLeft: endMachineState.gasLeft,
-    transactionFee: endAvmContext.environment.transactionFee,
-    bytecode: bytecode,
-    calldata: endAvmContext.environment.calldata,
-    avmHints: computeHints(endPersistableState.trace, endPersistableState.transitionalExecutionResult),
-  };
-}
-
-const AVM_MAGIC_SUFFIX = Buffer.from([
-  Mov.opcode, // opcode
-  0x00, // indirect
-  ...Buffer.from('000018ca', 'hex'), // srcOffset
-  ...Buffer.from('000018ca', 'hex'), // dstOffset
-]);
-
-export function markBytecodeAsAvm(bytecode: Buffer): Buffer {
-  return Buffer.concat([bytecode, AVM_MAGIC_SUFFIX]);
-}
-
-// This is just a helper function for the AVM circuit.
-export async function decompressBytecodeIfCompressed(bytecode: Buffer): Promise<Buffer> {
-  try {
-    return await promisify(gunzip)(bytecode);
-  } catch {
-    // If the bytecode is not compressed, the gunzip call will throw an error
-    // In this case, we assume the bytecode is not compressed and continue.
-    return Promise.resolve(bytecode);
-  }
-}
-
-export async function isAvmBytecode(bytecode: Buffer): Promise<boolean> {
-  const decompressedBytecode = await decompressBytecodeIfCompressed(bytecode);
-  const magicSize = AVM_MAGIC_SUFFIX.length;
-  return decompressedBytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
-}