@aztec/simulator 0.33.0 → 0.34.0

package/dest/avm/temporary_executor_migration.js

@@ -1,94 +0,0 @@
-// All code in this file needs to die once the public executor is phased out.
-import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { ContractStorageRead, ContractStorageUpdateRequest, L2ToL1Message, SideEffect, SideEffectLinkedToNoteHash, } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-import { createSimulationError } from '../common/errors.js';
-import { AvmExecutionEnvironment } from './avm_execution_environment.js';
-import { Mov } from './opcodes/memory.js';
-/** Temporary Method
- *
- * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
- *
- * @param current
- * @param globalVariables
- * @returns
- */
-export function temporaryCreateAvmExecutionEnvironment(current, globalVariables) {
-    // Function selector is included temporarily until noir codegens public contract bytecode in a single blob
-    return new AvmExecutionEnvironment(current.contractAddress, current.callContext.storageContractAddress, current.callContext.msgSender, // TODO: origin is not available
-    current.callContext.msgSender, current.callContext.portalContractAddress, 
-    /*feePerL1Gas=*/ Fr.zero(), 
-    /*feePerL2Gas=*/ Fr.zero(), 
-    /*feePerDaGas=*/ Fr.zero(), 
-    /*contractCallDepth=*/ Fr.zero(), globalVariables, current.callContext.isStaticCall, current.callContext.isDelegateCall, current.args, current.functionData.selector);
-}
-/** Temporary Method
- *
- * Convert the result of an AVM contract call to a PublicExecutionResult for the public kernel
- *
- * @param execution
- * @param newWorldState
- * @param result
- * @returns
- */
-export function temporaryConvertAvmResults(execution, newWorldState, result) {
-    const newNoteHashes = newWorldState.newNoteHashes.map(noteHash => new SideEffect(noteHash, Fr.zero()));
-    const contractStorageReads = [];
-    const reduceStorageReadRequests = (contractAddress, storageReads) => {
-        return storageReads.forEach((innerArray, key) => {
-            innerArray.forEach(value => {
-                contractStorageReads.push(new ContractStorageRead(new Fr(key), new Fr(value), 0));
-            });
-        });
-    };
-    newWorldState.storageReads.forEach((storageMap, address) => reduceStorageReadRequests(address, storageMap));
-    const contractStorageUpdateRequests = [];
-    const reduceStorageUpdateRequests = (contractAddress, storageUpdateRequests) => {
-        return storageUpdateRequests.forEach((innerArray, key) => {
-            innerArray.forEach(value => {
-                contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(new Fr(key), new Fr(value), 0));
-            });
-        });
-    };
-    newWorldState.storageWrites.forEach((storageMap, address) => reduceStorageUpdateRequests(address, storageMap));
-    const returnValues = result.output;
-    // TODO(follow up in pr tree): NOT SUPPORTED YET, make sure hashing and log resolution is done correctly
-    // Disabled.
-    const nestedExecutions = [];
-    const nullifierReadRequests = [];
-    const nullifierNonExistentReadRequests = [];
-    const newNullifiers = newWorldState.newNullifiers.map((nullifier, i) => new SideEffectLinkedToNoteHash(nullifier.toField(), Fr.zero(), new Fr(i + 1)));
-    const unencryptedLogs = UnencryptedFunctionL2Logs.empty();
-    const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
-    // TODO keep track of side effect counters
-    const startSideEffectCounter = Fr.ZERO;
-    const endSideEffectCounter = Fr.ZERO;
-    return {
-        execution,
-        nullifierReadRequests,
-        nullifierNonExistentReadRequests,
-        newNoteHashes,
-        newL2ToL1Messages,
-        startSideEffectCounter,
-        endSideEffectCounter,
-        newNullifiers,
-        contractStorageReads,
-        contractStorageUpdateRequests,
-        returnValues,
-        nestedExecutions,
-        unencryptedLogs,
-        reverted: result.reverted,
-        revertReason: result.revertReason ? createSimulationError(result.revertReason) : undefined,
-    };
-}
-export function isAvmBytecode(bytecode) {
-    const magicBuf = Buffer.from([
-        Mov.opcode, // opcode
-        0x00, // indirect
-        ...Buffer.from('000018ca', 'hex'), // srcOffset
-        ...Buffer.from('000018ca', 'hex'), // dstOffset
-    ]);
-    const magicSize = magicBuf.length;
-    return bytecode.subarray(-magicSize).equals(magicBuf);
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcG9yYXJ5X2V4ZWN1dG9yX21pZ3JhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdm0vdGVtcG9yYXJ5X2V4ZWN1dG9yX21pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw2RUFBNkU7QUFDN0UsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxFQUNMLG1CQUFtQixFQUNuQiw0QkFBNEIsRUFFNUIsYUFBYSxFQUViLFVBQVUsRUFDViwwQkFBMEIsR0FDM0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFNUQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHekUsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTFDOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsc0NBQXNDLENBQ3BELE9BQXdCLEVBQ3hCLGVBQWdDO0lBRWhDLDBHQUEwRztJQUMxRyxPQUFPLElBQUksdUJBQXVCLENBQ2hDLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxXQUFXLENBQUMsc0JBQXNCLEVBQzFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUFFLGdDQUFnQztJQUMvRCxPQUFPLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFDN0IsT0FBTyxDQUFDLFdBQVcsQ0FBQyxxQkFBcUI7SUFDekMsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRTtJQUMxQixnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFO0lBQzFCLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUU7SUFDMUIsc0JBQXNCLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxFQUNoQyxlQUFl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

package/src/avm/temporary_executor_migration.ts

@@ -1,136 +0,0 @@
-// All code in this file needs to die once the public executor is phased out.
-import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import {
-  ContractStorageRead,
-  ContractStorageUpdateRequest,
-  type GlobalVariables,
-  L2ToL1Message,
-  type ReadRequest,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
-} from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-
-import { createSimulationError } from '../common/errors.js';
-import { type PublicExecution, type PublicExecutionResult } from '../public/execution.js';
-import { AvmExecutionEnvironment } from './avm_execution_environment.js';
-import { type AvmContractCallResults } from './avm_message_call_result.js';
-import { type JournalData } from './journal/journal.js';
-import { Mov } from './opcodes/memory.js';
-
-/** Temporary Method
- *
- * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
- *
- * @param current
- * @param globalVariables
- * @returns
- */
-export function temporaryCreateAvmExecutionEnvironment(
-  current: PublicExecution,
-  globalVariables: GlobalVariables,
-): AvmExecutionEnvironment {
-  // Function selector is included temporarily until noir codegens public contract bytecode in a single blob
-  return new AvmExecutionEnvironment(
-    current.contractAddress,
-    current.callContext.storageContractAddress,
-    current.callContext.msgSender, // TODO: origin is not available
-    current.callContext.msgSender,
-    current.callContext.portalContractAddress,
-    /*feePerL1Gas=*/ Fr.zero(),
-    /*feePerL2Gas=*/ Fr.zero(),
-    /*feePerDaGas=*/ Fr.zero(),
-    /*contractCallDepth=*/ Fr.zero(),
-    globalVariables,
-    current.callContext.isStaticCall,
-    current.callContext.isDelegateCall,
-    current.args,
-    current.functionData.selector,
-  );
-}
-
-/** Temporary Method
- *
- * Convert the result of an AVM contract call to a PublicExecutionResult for the public kernel
- *
- * @param execution
- * @param newWorldState
- * @param result
- * @returns
- */
-export function temporaryConvertAvmResults(
-  execution: PublicExecution,
-  newWorldState: JournalData,
-  result: AvmContractCallResults,
-): PublicExecutionResult {
-  const newNoteHashes = newWorldState.newNoteHashes.map(noteHash => new SideEffect(noteHash, Fr.zero()));
-
-  const contractStorageReads: ContractStorageRead[] = [];
-  const reduceStorageReadRequests = (contractAddress: bigint, storageReads: Map<bigint, Fr[]>) => {
-    return storageReads.forEach((innerArray, key) => {
-      innerArray.forEach(value => {
-        contractStorageReads.push(new ContractStorageRead(new Fr(key), new Fr(value), 0));
-      });
-    });
-  };
-  newWorldState.storageReads.forEach((storageMap: Map<bigint, Fr[]>, address: bigint) =>
-    reduceStorageReadRequests(address, storageMap),
-  );
-
-  const contractStorageUpdateRequests: ContractStorageUpdateRequest[] = [];
-  const reduceStorageUpdateRequests = (contractAddress: bigint, storageUpdateRequests: Map<bigint, Fr[]>) => {
-    return storageUpdateRequests.forEach((innerArray, key) => {
-      innerArray.forEach(value => {
-        contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(new Fr(key), new Fr(value), 0));
-      });
-    });
-  };
-  newWorldState.storageWrites.forEach((storageMap: Map<bigint, Fr[]>, address: bigint) =>
-    reduceStorageUpdateRequests(address, storageMap),
-  );
-
-  const returnValues = result.output;
-
-  // TODO(follow up in pr tree): NOT SUPPORTED YET, make sure hashing and log resolution is done correctly
-  // Disabled.
-  const nestedExecutions: PublicExecutionResult[] = [];
-  const nullifierReadRequests: ReadRequest[] = [];
-  const nullifierNonExistentReadRequests: ReadRequest[] = [];
-  const newNullifiers: SideEffectLinkedToNoteHash[] = newWorldState.newNullifiers.map(
-    (nullifier, i) => new SideEffectLinkedToNoteHash(nullifier.toField(), Fr.zero(), new Fr(i + 1)),
-  );
-  const unencryptedLogs = UnencryptedFunctionL2Logs.empty();
-  const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
-  // TODO keep track of side effect counters
-  const startSideEffectCounter = Fr.ZERO;
-  const endSideEffectCounter = Fr.ZERO;
-
-  return {
-    execution,
-    nullifierReadRequests,
-    nullifierNonExistentReadRequests,
-    newNoteHashes,
-    newL2ToL1Messages,
-    startSideEffectCounter,
-    endSideEffectCounter,
-    newNullifiers,
-    contractStorageReads,
-    contractStorageUpdateRequests,
-    returnValues,
-    nestedExecutions,
-    unencryptedLogs,
-    reverted: result.reverted,
-    revertReason: result.revertReason ? createSimulationError(result.revertReason) : undefined,
-  };
-}
-
-export function isAvmBytecode(bytecode: Buffer): boolean {
-  const magicBuf = Buffer.from([
-    Mov.opcode, // opcode
-    0x00, // indirect
-    ...Buffer.from('000018ca', 'hex'), // srcOffset
-    ...Buffer.from('000018ca', 'hex'), // dstOffset
-  ]);
-  const magicSize = magicBuf.length;
-  return bytecode.subarray(-magicSize).equals(magicBuf);
-}