@aztec/simulator 0.76.4 → 0.77.0-testnet-ignition.21

package/src/{acvm → private/acvm}/oracle/typed_oracle.ts

@@ -1,24 +1,15 @@
-import {
-  type CompleteAddress,
-  type MerkleTreeId,
-  type Note,
-  type NoteStatus,
-  type NullifierMembershipWitness,
-  type PublicDataWitness,
-  type UnencryptedL2Log,
-} from '@aztec/circuit-types';
-import {
-  type BlockHeader,
-  type ContractInstance,
-  type IndexedTaggingSecret,
-  type KeyValidationRequest,
-  type L1_TO_L2_MSG_TREE_HEIGHT,
-} from '@aztec/circuits.js';
-import { type FunctionSelector, type NoteSelector } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
+import type { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
+import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
+import type { ContractClassLog, IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs';
+import type { Note, NoteStatus } from '@aztec/stdlib/note';
+import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 
-import { type MessageLoadOracleInputs } from '../../common/message_load_oracle_inputs.js';
+import type { MessageLoadOracleInputs } from '../../../common/message_load_oracle_inputs.js';
 
 /**
  * Information about a note needed during execution.
@@ -57,66 +48,66 @@ export abstract class TypedOracle {
   }
 
   storeInExecutionCache(_values: Fr[]): Promise<Fr> {
-    throw new OracleMethodNotAvailableError('storeInExecutionCache');
+    return Promise.reject(new OracleMethodNotAvailableError('storeInExecutionCache'));
   }
 
   loadFromExecutionCache(_hash: Fr): Promise<Fr[]> {
-    throw new OracleMethodNotAvailableError('loadFromExecutionCache');
+    return Promise.reject(new OracleMethodNotAvailableError('loadFromExecutionCache'));
   }
 
   getBlockNumber(): Promise<number> {
-    throw new OracleMethodNotAvailableError('getBlockNumber');
+    return Promise.reject(new OracleMethodNotAvailableError('getBlockNumber'));
   }
 
   getContractAddress(): Promise<AztecAddress> {
-    throw new OracleMethodNotAvailableError('getContractAddress');
+    return Promise.reject(new OracleMethodNotAvailableError('getContractAddress'));
   }
 
   getChainId(): Promise<Fr> {
-    throw new OracleMethodNotAvailableError('getChainId');
+    return Promise.reject(new OracleMethodNotAvailableError('getChainId'));
   }
 
   getVersion(): Promise<Fr> {
-    throw new OracleMethodNotAvailableError('getVersion');
+    return Promise.reject(new OracleMethodNotAvailableError('getVersion'));
   }
 
   getKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
-    throw new OracleMethodNotAvailableError('getKeyValidationRequest');
+    return Promise.reject(new OracleMethodNotAvailableError('getKeyValidationRequest'));
   }
 
   getContractInstance(_address: AztecAddress): Promise<ContractInstance> {
-    throw new OracleMethodNotAvailableError('getContractInstance');
+    return Promise.reject(new OracleMethodNotAvailableError('getContractInstance'));
   }
 
   getMembershipWitness(_blockNumber: number, _treeId: MerkleTreeId, _leafValue: Fr): Promise<Fr[] | undefined> {
-    throw new OracleMethodNotAvailableError('getMembershipWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getMembershipWitness'));
   }
 
   getNullifierMembershipWitness(_blockNumber: number, _nullifier: Fr): Promise<NullifierMembershipWitness | undefined> {
-    throw new OracleMethodNotAvailableError('getNullifierMembershipWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getNullifierMembershipWitness'));
   }
 
   getPublicDataTreeWitness(_blockNumber: number, _leafSlot: Fr): Promise<PublicDataWitness | undefined> {
-    throw new OracleMethodNotAvailableError('getPublicDataTreeWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getPublicDataTreeWitness'));
   }
 
   getLowNullifierMembershipWitness(
     _blockNumber: number,
     _nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined> {
-    throw new OracleMethodNotAvailableError('getLowNullifierMembershipWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getLowNullifierMembershipWitness'));
   }
 
   getBlockHeader(_blockNumber: number): Promise<BlockHeader | undefined> {
-    throw new OracleMethodNotAvailableError('getBlockHeader');
+    return Promise.reject(new OracleMethodNotAvailableError('getBlockHeader'));
   }
 
   getCompleteAddress(_account: AztecAddress): Promise<CompleteAddress> {
-    throw new OracleMethodNotAvailableError('getCompleteAddress');
+    return Promise.reject(new OracleMethodNotAvailableError('getCompleteAddress'));
   }
 
   getAuthWitness(_messageHash: Fr): Promise<Fr[] | undefined> {
-    throw new OracleMethodNotAvailableError('getAuthWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getAuthWitness'));
   }
 
   getNotes(
@@ -135,7 +126,7 @@ export abstract class TypedOracle {
     _offset: number,
     _status: NoteStatus,
   ): Promise<NoteData[]> {
-    throw new OracleMethodNotAvailableError('getNotes');
+    return Promise.reject(new OracleMethodNotAvailableError('getNotes'));
   }
 
   notifyCreatedNote(_storageSlot: Fr, _noteTypeId: NoteSelector, _note: Fr[], _noteHash: Fr, _counter: number): void {
@@ -143,15 +134,15 @@ export abstract class TypedOracle {
   }
 
   notifyNullifiedNote(_innerNullifier: Fr, _noteHash: Fr, _counter: number): Promise<void> {
-    throw new OracleMethodNotAvailableError('notifyNullifiedNote');
+    return Promise.reject(new OracleMethodNotAvailableError('notifyNullifiedNote'));
   }
 
   notifyCreatedNullifier(_innerNullifier: Fr): Promise<void> {
-    throw new OracleMethodNotAvailableError('notifyCreatedNullifier');
+    return Promise.reject(new OracleMethodNotAvailableError('notifyCreatedNullifier'));
   }
 
   checkNullifierExists(_innerNullifier: Fr): Promise<boolean> {
-    throw new OracleMethodNotAvailableError('checkNullifierExists');
+    return Promise.reject(new OracleMethodNotAvailableError('checkNullifierExists'));
   }
 
   getL1ToL2MembershipWitness(
@@ -159,7 +150,7 @@ export abstract class TypedOracle {
     _messageHash: Fr,
     _secret: Fr,
   ): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    throw new OracleMethodNotAvailableError('getL1ToL2MembershipWitness');
+    return Promise.reject(new OracleMethodNotAvailableError('getL1ToL2MembershipWitness'));
   }
 
   storageRead(
@@ -168,15 +159,15 @@ export abstract class TypedOracle {
     _blockNumber: number,
     _numberOfElements: number,
   ): Promise<Fr[]> {
-    throw new OracleMethodNotAvailableError('storageRead');
+    return Promise.reject(new OracleMethodNotAvailableError('storageRead'));
   }
 
   storageWrite(_startStorageSlot: Fr, _values: Fr[]): Promise<Fr[]> {
-    throw new OracleMethodNotAvailableError('storageWrite');
+    return Promise.reject(new OracleMethodNotAvailableError('storageWrite'));
   }
 
-  emitContractClassLog(_log: UnencryptedL2Log, _counter: number): Fr {
-    throw new OracleMethodNotAvailableError('emitContractClassUnencryptedLog');
+  emitContractClassLog(_log: ContractClassLog, _counter: number): void {
+    throw new OracleMethodNotAvailableError('emitContractClassLog');
   }
 
   callPrivateFunction(
@@ -186,7 +177,7 @@ export abstract class TypedOracle {
     _sideEffectCounter: number,
     _isStaticCall: boolean,
   ): Promise<{ endSideEffectCounter: Fr; returnsHash: Fr }> {
-    throw new OracleMethodNotAvailableError('callPrivateFunction');
+    return Promise.reject(new OracleMethodNotAvailableError('callPrivateFunction'));
   }
 
   enqueuePublicFunctionCall(
@@ -196,7 +187,7 @@ export abstract class TypedOracle {
     _sideEffectCounter: number,
     _isStaticCall: boolean,
   ): Promise<Fr> {
-    throw new OracleMethodNotAvailableError('enqueuePublicFunctionCall');
+    return Promise.reject(new OracleMethodNotAvailableError('enqueuePublicFunctionCall'));
   }
 
   setPublicTeardownFunctionCall(
@@ -206,7 +197,7 @@ export abstract class TypedOracle {
     _sideEffectCounter: number,
     _isStaticCall: boolean,
   ): Promise<Fr> {
-    throw new OracleMethodNotAvailableError('setPublicTeardownFunctionCall');
+    return Promise.reject(new OracleMethodNotAvailableError('setPublicTeardownFunctionCall'));
   }
 
   notifySetMinRevertibleSideEffectCounter(_minRevertibleSideEffectCounter: number): void {
@@ -218,15 +209,15 @@ export abstract class TypedOracle {
   }
 
   getIndexedTaggingSecretAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<IndexedTaggingSecret> {
-    throw new OracleMethodNotAvailableError('getIndexedTaggingSecretAsSender');
+    return Promise.reject(new OracleMethodNotAvailableError('getIndexedTaggingSecretAsSender'));
   }
 
   incrementAppTaggingSecretIndexAsSender(_sender: AztecAddress, _recipient: AztecAddress): Promise<void> {
-    throw new OracleMethodNotAvailableError('incrementAppTaggingSecretIndexAsSender');
+    return Promise.reject(new OracleMethodNotAvailableError('incrementAppTaggingSecretIndexAsSender'));
   }
 
   syncNotes(): Promise<void> {
-    throw new OracleMethodNotAvailableError('syncNotes');
+    return Promise.reject(new OracleMethodNotAvailableError('syncNotes'));
   }
 
   deliverNote(
@@ -239,26 +230,30 @@ export abstract class TypedOracle {
     _txHash: Fr,
     _recipient: AztecAddress,
   ): Promise<void> {
-    throw new OracleMethodNotAvailableError('deliverNote');
+    return Promise.reject(new OracleMethodNotAvailableError('deliverNote'));
+  }
+
+  getLogByTag(_tag: Fr): Promise<LogWithTxData | null> {
+    throw new OracleMethodNotAvailableError('getLogByTag');
   }
 
   storeCapsule(_contractAddress: AztecAddress, _key: Fr, _capsule: Fr[]): Promise<void> {
-    throw new OracleMethodNotAvailableError('storeCapsule');
+    return Promise.reject(new OracleMethodNotAvailableError('storeCapsule'));
   }
 
   loadCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<Fr[] | null> {
-    throw new OracleMethodNotAvailableError('loadCapsule');
+    return Promise.reject(new OracleMethodNotAvailableError('loadCapsule'));
   }
 
   deleteCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<void> {
-    throw new OracleMethodNotAvailableError('deleteCapsule');
+    return Promise.reject(new OracleMethodNotAvailableError('deleteCapsule'));
   }
 
   copyCapsule(_contractAddress: AztecAddress, _srcKey: Fr, _dstKey: Fr, _numEntries: number): Promise<void> {
-    throw new OracleMethodNotAvailableError('copyCapsule');
+    return Promise.reject(new OracleMethodNotAvailableError('copyCapsule'));
   }
 
   aes128Decrypt(_ciphertext: Buffer, _iv: Buffer, _symKey: Buffer): Promise<Buffer> {
-    throw new OracleMethodNotAvailableError('aes128Decrypt');
+    return Promise.reject(new OracleMethodNotAvailableError('aes128Decrypt'));
   }
 }

package/src/{acvm → private/acvm}/serialize.ts

@@ -1,8 +1,8 @@
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { type EthAddress } from '@aztec/foundation/eth-address';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import { type ACVMField } from './acvm_types.js';
+import type { ACVMField } from './acvm_types.js';
 
 /**
  * Adapts the buffer to the field size.
@@ -39,6 +39,13 @@ export function toACVMField(
   return `0x${adaptBufferSize(buffer).toString('hex')}`;
 }
 
+/**
+ * Converts a single value or an array of single values into the equivalent ACVM field representation.
+ */
+export function toACVMFieldSingleOrArray(value: Fr | Fr[]) {
+  return Array.isArray(value) ? value.map(toACVMField) : toACVMField(value);
+}
+
 /**
  * Inserts a list of ACVM fields to a witness.
  * @param witnessStartIndex - The index where to start inserting the fields.

package/src/{client → private}/client_execution_context.ts

@@ -1,37 +1,39 @@
+import { PRIVATE_CONTEXT_INPUTS_LENGTH, PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
 import {
-  type AuthWitness,
-  type AztecNode,
+  type FunctionAbi,
+  type FunctionArtifact,
+  FunctionSelector,
+  type NoteSelector,
+  countArgumentsSize,
+} from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computeUniqueNoteHash, siloNoteHash } from '@aztec/stdlib/hash';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { PrivateContextInputs } from '@aztec/stdlib/kernel';
+import type { ContractClassLog } from '@aztec/stdlib/logs';
+import { Note, type NoteStatus } from '@aztec/stdlib/note';
+import {
+  type BlockHeader,
+  CallContext,
+  Capsule,
   CountedContractClassLog,
   CountedPublicExecutionRequest,
-  Note,
   NoteAndSlot,
-  type NoteStatus,
-  type PrivateCallExecutionResult,
+  PrivateCallExecutionResult,
   PublicExecutionRequest,
-  type UnencryptedL2Log,
-} from '@aztec/circuit-types';
-import {
-  type BlockHeader,
-  CallContext,
-  FunctionSelector,
-  PRIVATE_CONTEXT_INPUTS_LENGTH,
-  PUBLIC_DISPATCH_SELECTOR,
-  PrivateContextInputs,
   type TxContext,
-} from '@aztec/circuits.js';
-import { computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
-import { type FunctionAbi, type FunctionArtifact, type NoteSelector, countArgumentsSize } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
-import { createLogger } from '@aztec/foundation/log';
+} from '@aztec/stdlib/tx';
 
-import { type NoteData, toACVMWitness } from '../acvm/index.js';
-import { type HashedValuesCache } from '../common/hashed_values_cache.js';
-import { type SimulationProvider } from '../server.js';
-import { type DBOracle } from './db_oracle.js';
-import { type ExecutionNoteCache } from './execution_note_cache.js';
+import { type NoteData, toACVMWitness } from './acvm/index.js';
+import type { DBOracle } from './db_oracle.js';
+import type { ExecutionNoteCache } from './execution_note_cache.js';
+import type { HashedValuesCache } from './hashed_values_cache.js';
 import { pickNotes } from './pick_notes.js';
-import { executePrivateFunction } from './private_execution.js';
+import { executePrivateFunction, verifyCurrentClassId } from './private_execution.js';
+import type { SimulationProvider } from './providers/simulation_provider.js';
 import { ViewDataOracle } from './view_data_oracle.js';
 
 /**
@@ -70,6 +72,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     protected readonly historicalHeader: BlockHeader,
     /** List of transient auth witnesses to be used during this simulation */
     authWitnesses: AuthWitness[],
+    capsules: Capsule[],
     private readonly executionCache: HashedValuesCache,
     private readonly noteCache: ExecutionNoteCache,
     db: DBOracle,
@@ -79,7 +82,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     log = createLogger('simulator:client_execution_context'),
     scopes?: AztecAddress[],
   ) {
-    super(callContext.contractAddress, authWitnesses, db, node, log, scopes);
+    super(callContext.contractAddress, authWitnesses, capsules, db, node, log, scopes);
   }
 
   // We still need this function until we can get user-defined ordering of structs for fn arguments
@@ -278,6 +281,13 @@ export class ClientExecutionContext extends ViewDataOracle {
     noteHash: Fr,
     counter: number,
   ) {
+    this.log.debug(`Notified of new note with inner hash ${noteHash}`, {
+      contractAddress: this.callContext.contractAddress,
+      storageSlot,
+      noteTypeId,
+      counter,
+    });
+
     const note = new Note(noteItems);
     this.noteCache.addNewNote(
       {
@@ -321,20 +331,19 @@ export class ClientExecutionContext extends ViewDataOracle {
   }
 
   /**
-   * Emit a contract class unencrypted log.
-   * This fn exists because sha hashing the preimage
-   * is too large to compile (16,200 fields, 518,400 bytes) => the oracle hashes it.
-   * See private_context.nr
-   * TODO(#8945): Contract class logs are currently sha hashes. When these are fields, delete this.
-   * @param log - The unencrypted log to be emitted.
+   * Emit a contract class log.
+   * This fn exists because we only carry a poseidon hash through the kernels, and need to
+   * keep the preimage in ts for later.
+   * We could also return the hash here if we must save extra gates.
+   * @param log - The contract class log to be emitted.
+   * @param counter - The contract class log's counter.
    */
-  public override emitContractClassLog(log: UnencryptedL2Log, counter: number) {
+  public override emitContractClassLog(log: ContractClassLog, counter: number) {
     this.contractClassLogs.push(new CountedContractClassLog(log, counter));
-    const text = log.toHumanReadable();
+    const text = log.toBuffer().toString('hex');
     this.log.verbose(
       `Emitted log from ContractClassRegisterer: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`,
     );
-    return Fr.fromBuffer(log.hash());
   }
 
   #checkValidStaticCall(childExecutionResult: PrivateCallExecutionResult) {
@@ -366,11 +375,18 @@ export class ClientExecutionContext extends ViewDataOracle {
     isStaticCall: boolean,
   ) {
     this.log.debug(
-      `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.contractAddress}`,
+      `Calling private function ${targetContractAddress}:${functionSelector} from ${this.callContext.contractAddress}`,
     );
 
     isStaticCall = isStaticCall || this.callContext.isStaticCall;
 
+    await verifyCurrentClassId(
+      targetContractAddress,
+      await this.db.getContractInstance(targetContractAddress),
+      this.node,
+      this.historicalHeader.globalVariables.blockNumber.toNumber(),
+    );
+
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
 
     const derivedTxContext = this.txContext.clone();
@@ -383,6 +399,7 @@ export class ClientExecutionContext extends ViewDataOracle {
       derivedCallContext,
       this.historicalHeader,
       this.authWitnesses,
+      this.capsules,
       this.executionCache,
       this.noteCache,
       this.db,

package/src/{client → private}/db_oracle.ts

@@ -1,24 +1,16 @@
-import {
-  type L2Block,
-  type MerkleTreeId,
-  type NoteStatus,
-  type NullifierMembershipWitness,
-  type PublicDataWitness,
-  type TxScopedL2Log,
-} from '@aztec/circuit-types';
-import {
-  type BlockHeader,
-  type CompleteAddress,
-  type ContractInstance,
-  type IndexedTaggingSecret,
-  type KeyValidationRequest,
-} from '@aztec/circuits.js';
-import { type FunctionArtifact, type FunctionSelector } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { type Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/fields';
+import type { FunctionArtifact, FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
+import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
+import { IndexedTaggingSecret, LogWithTxData, TxScopedL2Log } from '@aztec/stdlib/logs';
+import type { NoteStatus } from '@aztec/stdlib/note';
+import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 
-import { type NoteData } from '../acvm/index.js';
-import { type CommitmentsDB } from '../public/db_interfaces.js';
+import type { CommitmentsDB } from '../common/db_interfaces.js';
+import type { NoteData } from './acvm/index.js';
 
 /**
  * Error thrown when a contract is not found in the database.
@@ -250,6 +242,14 @@ export interface DBOracle extends CommitmentsDB {
     recipient: AztecAddress,
   ): Promise<void>;
 
+  /**
+   * Searches for a log with the corresponding `tag` and returns it along with contextual transaction information.
+   * Returns null if no such log exists, and throws if more than one exists.
+   *
+   * @param tag - The log tag to search for.
+   */
+  getLogByTag(tag: Fr): Promise<LogWithTxData | null>;
+
   /**
    * Removes all of a contract's notes that have been nullified from the note database.
    */

package/src/{client → private}/execution_note_cache.ts

@@ -1,8 +1,8 @@
-import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 
-import { type NoteData } from '../acvm/index.js';
+import type { NoteData } from './acvm/index.js';
 
 interface PendingNote {
   note: NoteData;

package/src/{common → private}/hashed_values_cache.ts

@@ -1,5 +1,5 @@
-import { HashedValues } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
+import { HashedValues } from '@aztec/stdlib/tx';
 
 /**
  * A cache for hashed values (arguments, returns) during transaction execution.

package/src/private/index.ts

@@ -0,0 +1,12 @@
+export { AcirSimulator } from './simulator.js';
+export { ViewDataOracle } from './view_data_oracle.js';
+export { type DBOracle, ContractClassNotFoundError, ContractNotFoundError } from './db_oracle.js';
+export * from './pick_notes.js';
+export { ExecutionNoteCache } from './execution_note_cache.js';
+export { extractPrivateCircuitPublicInputs, readCurrentClassId } from './private_execution.js';
+export { witnessMapToFields } from './acvm/deserialize.js';
+export { toACVMWitness } from './acvm/serialize.js';
+export { extractCallStack } from './acvm/acvm.js';
+export { type NoteData, TypedOracle } from './acvm/oracle/typed_oracle.js';
+export { Oracle } from './acvm/oracle/oracle.js';
+export { HashedValuesCache } from './hashed_values_cache.js';

package/src/{client → private}/pick_notes.ts

@@ -1,5 +1,5 @@
-import { Comparator, type Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
+import { Comparator, type Note } from '@aztec/stdlib/note';
 
 export interface PropertySelector {
   index: number;

package/src/{client → private}/private_execution.ts

@@ -1,21 +1,22 @@
-import { PrivateCallExecutionResult } from '@aztec/circuit-types';
-import { type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
-import {
-  Fr,
-  PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,
-  PRIVATE_CONTEXT_INPUTS_LENGTH,
-  PrivateCircuitPublicInputs,
-} from '@aztec/circuits.js';
-import { type FunctionArtifact, type FunctionSelector, countArgumentsSize } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH, PRIVATE_CONTEXT_INPUTS_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { type FunctionArtifact, type FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstance } from '@aztec/stdlib/contract';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { PrivateCircuitPublicInputs } from '@aztec/stdlib/kernel';
+import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable';
+import type { CircuitWitnessGenerationStats } from '@aztec/stdlib/stats';
+import { PrivateCallExecutionResult } from '@aztec/stdlib/tx';
 
-import { fromACVMField, witnessMapToFields } from '../acvm/deserialize.js';
-import { type ACVMWitness, Oracle, extractCallStack } from '../acvm/index.js';
 import { ExecutionError, resolveAssertionMessageFromError } from '../common/errors.js';
-import { type SimulationProvider } from '../server.js';
-import { type ClientExecutionContext } from './client_execution_context.js';
+import { fromACVMField, witnessMapToFields } from './acvm/deserialize.js';
+import { type ACVMWitness, Oracle, extractCallStack } from './acvm/index.js';
+import type { ClientExecutionContext } from './client_execution_context.js';
+import type { SimulationProvider } from './providers/simulation_provider.js';
 
 /**
  * Execute a private function and return the execution result.
@@ -115,3 +116,34 @@ export function extractPrivateCircuitPublicInputs(
   }
   return PrivateCircuitPublicInputs.fromFields(returnData);
 }
+
+export async function readCurrentClassId(
+  contractAddress: AztecAddress,
+  instance: ContractInstance,
+  node: AztecNode,
+  blockNumber: number,
+) {
+  const { sharedMutableSlot } = await SharedMutableValuesWithHash.getContractUpdateSlots(contractAddress);
+  const sharedMutableValues = await SharedMutableValues.readFromTree(sharedMutableSlot, slot =>
+    node.getPublicStorageAt(ProtocolContractAddress.ContractInstanceDeployer, slot, blockNumber),
+  );
+  let currentClassId = sharedMutableValues.svc.getCurrentAt(blockNumber)[0];
+  if (currentClassId.isZero()) {
+    currentClassId = instance.originalContractClassId;
+  }
+  return currentClassId;
+}
+
+export async function verifyCurrentClassId(
+  contractAddress: AztecAddress,
+  instance: ContractInstance,
+  node: AztecNode,
+  blockNumber: number,
+) {
+  const currentClassId = await readCurrentClassId(contractAddress, instance, node, blockNumber);
+  if (!instance.currentContractClassId.equals(currentClassId)) {
+    throw new Error(
+      `Contract ${contractAddress} is outdated, current class id is ${currentClassId}, local class id is ${instance.currentContractClassId}`,
+    );
+  }
+}

package/src/{providers → private/providers}/acvm_native.ts

@@ -1,15 +1,15 @@
 import { runInDirectory } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { type NoirCompiledCircuit } from '@aztec/types/noir';
+import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
-import { type WitnessMap } from '@noir-lang/types';
+import type { WitnessMap } from '@noir-lang/types';
 import * as proc from 'child_process';
 import { promises as fs } from 'fs';
 
-import { type ACIRCallback, type ACIRExecutionResult } from '../acvm/acvm.js';
-import { type ACVMWitness } from '../acvm/acvm_types.js';
-import { type SimulationProvider } from '../common/simulation_provider.js';
+import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js';
+import type { ACVMWitness } from '../acvm/acvm_types.js';
+import type { SimulationProvider } from './simulation_provider.js';
 
 const logger = createLogger('simulator:acvm-native');
 
@@ -158,7 +158,7 @@ export class NativeACVMSimulator implements SimulationProvider {
       return result.witness;
     };
 
-    return await runInDirectory(this.workingDirectory, operation, false);
+    return await runInDirectory(this.workingDirectory, operation, false, logger);
   }
 
   executeUserCircuit(

package/src/{providers → private/providers}/acvm_wasm.ts

@@ -1,14 +1,14 @@
 import { createLogger } from '@aztec/foundation/log';
 import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/client';
-import { type NoirCompiledCircuit } from '@aztec/types/noir';
+import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 
 import initACVM, { type ExecutionError, executeCircuit } from '@noir-lang/acvm_js';
 import initAbi from '@noir-lang/noirc_abi';
-import { type WitnessMap } from '@noir-lang/types';
+import type { WitnessMap } from '@noir-lang/types';
 
 import { type ACIRCallback, acvm } from '../acvm/acvm.js';
-import { type ACVMWitness } from '../acvm/acvm_types.js';
-import { type SimulationProvider, parseErrorPayload } from '../common/simulation_provider.js';
+import type { ACVMWitness } from '../acvm/acvm_types.js';
+import { type SimulationProvider, parseErrorPayload } from './simulation_provider.js';
 
 export class WASMSimulator implements SimulationProvider {
   constructor(protected log = createLogger('wasm-simulator')) {}