@aztec/simulator 0.24.0 → 0.26.2

package/src/public/public_execution_context.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
+import { FunctionL2Logs, NullifierMembershipWitness, 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';
@@ -8,7 +8,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { TypedOracle, toACVMWitness } from '../acvm/index.js';
 import { PackedArgsCache, SideEffectCounter } from '../common/index.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult } from './execution.js';
+import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { executePublicFunction } from './executor.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
 
@@ -35,7 +35,7 @@ export class PublicExecutionContext extends TypedOracle {
     private log = createDebugLogger('aztec:simulator:public_execution_context'),
   ) {
     super();
-    this.storageActions = new ContractStorageActionsCollector(stateDb, execution.contractAddress);
+    this.storageActions = new ContractStorageActionsCollector(stateDb, execution.callContext.storageContractAddress);
   }
 
   /**
@@ -86,11 +86,11 @@ export class PublicExecutionContext extends TypedOracle {
 
   /**
    * Fetches the a message from the db, given its key.
-   * @param msgKey - A buffer representing the message key.
+   * @param entryKey - A buffer representing the entry key.
    * @returns The l1 to l2 message data
    */
-  public async getL1ToL2Message(msgKey: Fr) {
-    return await this.commitmentsDb.getL1ToL2Message(msgKey);
+  public async getL1ToL2MembershipWitness(entryKey: Fr) {
+    return await this.commitmentsDb.getL1ToL2MembershipWitness(entryKey);
   }
 
   /**
@@ -138,11 +138,11 @@ export class PublicExecutionContext extends TypedOracle {
   public async storageWrite(startStorageSlot: Fr, values: Fr[]) {
     const newValues = [];
     for (let i = 0; i < values.length; i++) {
-      const storageSlot = new Fr(startStorageSlot.value + BigInt(i));
+      const storageSlot = new Fr(startStorageSlot.toBigInt() + BigInt(i));
       const newValue = values[i];
       const sideEffectCounter = this.sideEffectCounter.count();
       this.storageActions.write(storageSlot, newValue, sideEffectCounter);
-      await this.stateDb.storageWrite(this.execution.contractAddress, storageSlot, newValue);
+      await this.stateDb.storageWrite(this.execution.callContext.storageContractAddress, storageSlot, newValue);
       this.log(`Oracle storage write: slot=${storageSlot.toString()} value=${newValue.toString()}`);
       newValues.push(newValue);
     }
@@ -160,7 +160,11 @@ export class PublicExecutionContext extends TypedOracle {
     targetContractAddress: AztecAddress,
     functionSelector: FunctionSelector,
     argsHash: Fr,
+    isStaticCall: boolean,
+    isDelegateCall: boolean,
   ) {
+    isStaticCall = isStaticCall || this.execution.callContext.isStaticCall;
+
     const args = this.packedArgsCache.unpack(argsHash);
     this.log(`Public function call: addr=${targetContractAddress} selector=${functionSelector} args=${args.join(',')}`);
 
@@ -178,13 +182,13 @@ export class PublicExecutionContext extends TypedOracle {
     const functionData = new FunctionData(functionSelector, isInternal, false, false);
 
     const callContext = CallContext.from({
-      msgSender: this.execution.contractAddress,
+      msgSender: isDelegateCall ? this.execution.callContext.msgSender : this.execution.contractAddress,
+      storageContractAddress: isDelegateCall ? this.execution.contractAddress : targetContractAddress,
       portalContractAddress: portalAddress,
-      storageContractAddress: targetContractAddress,
       functionSelector,
       isContractDeployment: false,
-      isDelegateCall: false,
-      isStaticCall: false,
+      isDelegateCall,
+      isStaticCall,
       startSideEffectCounter: 0, // TODO use counters in public execution
     });
 
@@ -209,9 +213,29 @@ export class PublicExecutionContext extends TypedOracle {
 
     const childExecutionResult = await executePublicFunction(context, acir);
 
+    if (isStaticCall) {
+      checkValidStaticCall(
+        childExecutionResult.newNoteHashes,
+        childExecutionResult.newNullifiers,
+        childExecutionResult.contractStorageUpdateRequests,
+        childExecutionResult.newL2ToL1Messages,
+        childExecutionResult.unencryptedLogs,
+      );
+    }
+
     this.nestedExecutions.push(childExecutionResult);
     this.log(`Returning from nested call: ret=${childExecutionResult.returnValues.join(', ')}`);
 
     return childExecutionResult.returnValues;
   }
+
+  public async getNullifierMembershipWitness(
+    blockNumber: number,
+    nullifier: Fr,
+  ): Promise<NullifierMembershipWitness | undefined> {
+    if (!this.header.globalVariables.blockNumber.equals(new Fr(blockNumber))) {
+      throw new Error(`Public execution oracle can only access nullifier membership witnesses for the current block`);
+    }
+    return await this.commitmentsDb.getNullifierMembershipWitnessAtLatestBlock(nullifier);
+  }
 }

package/src/public/state_actions.ts

@@ -58,7 +58,7 @@ export class ContractStorageActionsCollector {
    * @param sideEffectCounter - Side effect counter associated with this storage action.
    */
   public write(storageSlot: Fr, newValue: Fr, sideEffectCounter: number): void {
-    const slot = storageSlot.value;
+    const slot = storageSlot.toBigInt();
     const updateRequest = this.contractStorageUpdateRequests.get(slot);
     if (updateRequest) {
       this.contractStorageUpdateRequests.set(slot, { newValue, sideEffectCounter });

package/src/test/utils.ts

@@ -1,6 +1,6 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
-import { computeSecretMessageHash } from '@aztec/circuits.js/abis';
+import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { sha256 } from '@aztec/foundation/crypto';
 
 /**
@@ -23,7 +23,7 @@ export const buildL1ToL2Message = (
   const contentBuf = Buffer.concat([selectorBuf, ...contentPreimage.map(field => field.toBuffer())]);
   const content = Fr.fromBufferReduce(sha256(contentBuf));
 
-  const secretHash = computeSecretMessageHash(secret);
+  const secretHash = computeMessageSecretHash(secret);
 
   // Eventually the kernel will need to prove the kernel portal pair exists within the contract tree,
   // EthAddress.random() will need to be replaced when this happens
@@ -32,7 +32,7 @@ export const buildL1ToL2Message = (
     new L2Actor(targetContract, 1),
     content,
     secretHash,
-    0,
+    2 ** 32 - 1,
     0,
   );
 };

package/src/utils.ts

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