@aztec/simulator 0.31.0 → 0.32.0

package/src/client/execution_result.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, Note } from '@aztec/circuit-types';
+import { EncryptedFunctionL2Logs, Note, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
 import { DecodedReturn } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
@@ -46,12 +46,12 @@ export interface ExecutionResult {
    * Encrypted logs emitted during execution of this function call.
    * Note: These are preimages to `encryptedLogsHash`.
    */
-  encryptedLogs: FunctionL2Logs;
+  encryptedLogs: EncryptedFunctionL2Logs;
   /**
    * Unencrypted logs emitted during execution of this function call.
    * Note: These are preimages to `unencryptedLogsHash`.
    */
-  unencryptedLogs: FunctionL2Logs;
+  unencryptedLogs: UnencryptedFunctionL2Logs;
 }
 
 /**
@@ -59,7 +59,7 @@ export interface ExecutionResult {
  * @param execResult - The topmost execution result.
  * @returns All encrypted logs.
  */
-export function collectEncryptedLogs(execResult: ExecutionResult): FunctionL2Logs[] {
+export function collectEncryptedLogs(execResult: ExecutionResult): EncryptedFunctionL2Logs[] {
   // without the .reverse(), the logs will be in a queue like fashion which is wrong as the kernel processes it like a stack.
   return [execResult.encryptedLogs, ...[...execResult.nestedExecutions].reverse().flatMap(collectEncryptedLogs)];
 }
@@ -69,7 +69,7 @@ export function collectEncryptedLogs(execResult: ExecutionResult): FunctionL2Log
  * @param execResult - The topmost execution result.
  * @returns All unencrypted logs.
  */
-export function collectUnencryptedLogs(execResult: ExecutionResult): FunctionL2Logs[] {
+export function collectUnencryptedLogs(execResult: ExecutionResult): UnencryptedFunctionL2Logs[] {
   // without the .reverse(), the logs will be in a queue like fashion which is wrong as the kernel processes it like a stack.
   return [execResult.unencryptedLogs, ...[...execResult.nestedExecutions].reverse().flatMap(collectUnencryptedLogs)];
 }

package/src/public/execution.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, SimulationError } from '@aztec/circuit-types';
+import { SimulationError, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   AztecAddress,
   ContractStorageRead,
@@ -46,7 +46,7 @@ export interface PublicExecutionResult {
    * Unencrypted logs emitted during execution of this function call.
    * Note: These are preimages to `unencryptedLogsHash`.
    */
-  unencryptedLogs: FunctionL2Logs;
+  unencryptedLogs: UnencryptedFunctionL2Logs;
   /**
    * Whether the execution reverted.
    */
@@ -154,7 +154,7 @@ export function checkValidStaticCall(
   newNullifiers: SideEffectLinkedToNoteHash[],
   contractStorageUpdateRequests: ContractStorageUpdateRequest[],
   newL2ToL1Messages: L2ToL1Message[],
-  unencryptedLogs: FunctionL2Logs,
+  unencryptedLogs: UnencryptedFunctionL2Logs,
 ) {
   if (
     contractStorageUpdateRequests.length > 0 ||

package/src/public/executor.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs } from '@aztec/circuit-types';
+import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 
@@ -92,7 +92,7 @@ export async function executePublicFunction(
       contractStorageReads: [],
       contractStorageUpdateRequests: [],
       nestedExecutions: [],
-      unencryptedLogs: FunctionL2Logs.empty(),
+      unencryptedLogs: UnencryptedFunctionL2Logs.empty(),
       reverted,
       revertReason,
     };

package/src/public/public_execution_context.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, NullifierMembershipWitness, UnencryptedL2Log } from '@aztec/circuit-types';
+import { NullifierMembershipWitness, UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
 import { CallContext, FunctionData, FunctionSelector, GlobalVariables, Header } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -72,7 +72,7 @@ export class PublicExecutionContext extends TypedOracle {
    * Return the encrypted logs emitted during this execution.
    */
   public getUnencryptedLogs() {
-    return new FunctionL2Logs(this.unencryptedLogs.map(log => log.toBuffer()));
+    return new UnencryptedFunctionL2Logs(this.unencryptedLogs);
   }
 
   /**

package/src/test/utils.ts

@@ -20,8 +20,7 @@ export const buildL1ToL2Message = (
   // Write the selector into a buffer.
   const selectorBuf = Buffer.from(selector, 'hex');
 
-  const contentBuf = Buffer.concat([selectorBuf, ...contentPreimage.map(field => field.toBuffer())]);
-  const content = sha256ToField(contentBuf);
+  const content = sha256ToField([selectorBuf, ...contentPreimage]);
   const secretHash = computeMessageSecretHash(secret);
 
   // Eventually the kernel will need to prove the kernel portal pair exists within the contract tree,

package/src/utils.ts

@@ -14,5 +14,5 @@ export function computeSlotForMapping(
     toField: () => Fr;
   },
 ) {
-  return pedersenHash([mappingSlot, key.toField()].map(field => field.toBuffer()));
+  return pedersenHash([mappingSlot, key.toField()]);
 }