@aztec/simulator 0.32.1 → 0.34.0

package/src/acvm/oracle/debug.ts

@@ -1,109 +0,0 @@
-import { type ForeignCallInput } from '@noir-lang/acvm_js';
-
-import { type ACVMField } from '../acvm_types.js';
-
-/**
- * Convert an array of ACVMFields to a string.
- *
- * @param msg - array of ACVMFields where each represents a single ascii character
- * @returns string representation of the message
- */
-export function acvmFieldMessageToString(msg: ACVMField[]): string {
-  let msgStr = '';
-  for (const msgChar of msg) {
-    const asciiCode = Number(msgChar);
-    const asciiChar = String.fromCharCode(asciiCode);
-    msgStr = msgStr.concat(asciiChar);
-  }
-  // cut off string in case of preemptive null termination
-  const nullCharIndex = msgStr.indexOf('\\0');
-  if (nullCharIndex >= 0) {
-    msgStr = msgStr.substring(0, nullCharIndex);
-  }
-  return msgStr.replaceAll('\\n', '\n').replaceAll('\\t', '\t');
-}
-
-/**
- * Format a debug string for Aztec.nr filling in `'{0}'` entries with their
- * corresponding values from the args array.
- *
- * @param formatStr - str of form `'this is a string with some entries like {0} and {1}'`
- * @param args - array of fields to fill in the string format entries with
- * @returns formatted string
- */
-function applyStringFormatting(formatStr: string, args: ACVMField[]): string {
-  const matches = formatStr.match(/{\d+}/g);
-  if (matches == null) {
-    return formatStr;
-  }
-  // Get the numeric values within the curly braces, convert them to numbers,
-  // and find the maximum value.
-  const maxIndex = Math.max(...matches.map(match => Number(match.slice(1, -1))));
-  const argsPadded = args.concat(Array.from({ length: Math.max(0, maxIndex - args.length) }, () => '0xBAD'));
-
-  return formatStr.replace(/{(\d+)}/g, function (match, index) {
-    return typeof args[index] != 'undefined' ? argsPadded[index] : match;
-  });
-}
-
-/**
- * Convert an array of ACVMFields from ACVM to a formatted string.
- *
- * @param parameters - either one parameter representing a simple field or array, or two parameters when
- * It's a message without args or three parameters when it's a message with arguments.
- *
- * @returns formatted string
- */
-export function oracleDebugCallToFormattedStr(parameters: ForeignCallInput[]): string {
-  if (parameters.length === 1) {
-    return processFieldOrArray(parameters[0]);
-  }
-
-  let formatArgs: string[] = [];
-
-  if (parameters.length > 2) {
-    formatArgs = parameters[1];
-  }
-
-  const formattedMsg = applyStringFormatting(acvmFieldMessageToString(parameters[0]), formatArgs);
-
-  return formattedMsg;
-}
-
-/**
- * Processes a field or an array and returns a string representation.
- * @param fieldOrArray - The field or array to be processed.
- * @returns Returns the processed string representation of the field or array.
- */
-function processFieldOrArray(fieldOrArray: string[]) {
-  if (fieldOrArray.length === 1) {
-    return `${fieldOrArray[0]}`;
-  }
-
-  // Check if all the elements start with 63 zero bytes
-  // --> if yes, we have an array of bytes and we print as hex
-  if (onlyBytes(fieldOrArray)) {
-    const decimalArray = fieldOrArray.map(element => parseInt(element, 16));
-    return '0x' + Buffer.from(decimalArray).toString('hex');
-  }
-
-  return '[' + fieldOrArray.join(', ') + ']';
-}
-
-/**
- * Checks if all elements in the array are valid byte representations.
- * @param array - The array to be checked.
- * @returns Returns `true` if all elements are valid byte representations, `false` otherwise.
- * @throws Throws an error if any element has an invalid length.
- */
-function onlyBytes(array: string[]): boolean {
-  for (const element of array) {
-    if (element.length != 66) {
-      throw new Error('Invalid element length. Expected 66 chars, got ' + element.length + ' chars.');
-    }
-    if (!element.startsWith('0x00000000000000000000000000000000000000000000000000000000000000')) {
-      return false;
-    }
-  }
-  return true;
-}

package/src/avm/temporary_executor_migration.ts

@@ -1,122 +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,
-  type 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';
-
-/** 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[] = [];
-  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,
-  };
-}