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

package/dest/public/utils.js

@@ -1,30 +1,35 @@
-import { TxExecutionPhase } from '@aztec/circuit-types';
+import { TxExecutionPhase } from '@aztec/stdlib/tx';
 export function getExecutionRequestsByPhase(tx, phase) {
-    switch (phase) {
+    switch(phase){
         case TxExecutionPhase.SETUP:
             return tx.getNonRevertiblePublicExecutionRequests();
         case TxExecutionPhase.APP_LOGIC:
             return tx.getRevertiblePublicExecutionRequests();
-        case TxExecutionPhase.TEARDOWN: {
-            const request = tx.getPublicTeardownExecutionRequest();
-            return request ? [request] : [];
-        }
+        case TxExecutionPhase.TEARDOWN:
+            {
+                const request = tx.getPublicTeardownExecutionRequest();
+                return request ? [
+                    request
+                ] : [];
+            }
         default:
             throw new Error(`Unknown phase: ${phase}`);
     }
 }
 export function getCallRequestsByPhase(tx, phase) {
-    switch (phase) {
+    switch(phase){
         case TxExecutionPhase.SETUP:
             return tx.data.getNonRevertiblePublicCallRequests();
         case TxExecutionPhase.APP_LOGIC:
             return tx.data.getRevertiblePublicCallRequests();
-        case TxExecutionPhase.TEARDOWN: {
-            const request = tx.data.getTeardownPublicCallRequest();
-            return request ? [request] : [];
-        }
+        case TxExecutionPhase.TEARDOWN:
+            {
+                const request = tx.data.getTeardownPublicCallRequest();
+                return request ? [
+                    request
+                ] : [];
+            }
         default:
             throw new Error(`Unknown phase: ${phase}`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBd0MsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUc5RixNQUFNLFVBQVUsMkJBQTJCLENBQUMsRUFBTSxFQUFFLEtBQXVCO0lBQ3pFLFFBQVEsS0FBSyxFQUFFLENBQUM7UUFDZCxLQUFLLGdCQUFnQixDQUFDLEtBQUs7WUFDekIsT0FBTyxFQUFFLENBQUMsdUNBQXVDLEVBQUUsQ0FBQztRQUN0RCxLQUFLLGdCQUFnQixDQUFDLFNBQVM7WUFDN0IsT0FBTyxFQUFFLENBQUMsb0NBQW9DLEVBQUUsQ0FBQztRQUNuRCxLQUFLLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0IsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLGlDQUFpQyxFQUFFLENBQUM7WUFDdkQsT0FBTyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNsQyxDQUFDO1FBQ0Q7WUFDRSxNQUFNLElBQUksS0FBSyxDQUFDLGtCQUFrQixLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEVBQU0sRUFBRSxLQUF1QjtJQUNwRSxRQUFRLEtBQUssRUFBRSxDQUFDO1FBQ2QsS0FBSyxnQkFBZ0IsQ0FBQyxLQUFLO1lBQ3pCLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsRUFBRSxDQUFDO1FBQ3RELEtBQUssZ0JBQWdCLENBQUMsU0FBUztZQUM3QixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsK0JBQStCLEVBQUUsQ0FBQztRQUNuRCxLQUFLLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0IsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsRUFBRSxDQUFDO1lBQ3ZELE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDbEMsQ0FBQztRQUNEO1lBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQkFBa0IsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUMvQyxDQUFDO0FBQ0gsQ0FBQyJ9

package/dest/server.d.ts

@@ -1,6 +1,6 @@
-export * from './avm/index.js';
-export * from './common/index.js';
 export * from './public/index.js';
-export * from './providers/index.js';
-export * from './stats/index.js';
+export { WASMSimulatorWithBlobs } from './private/providers/acvm_wasm_with_blobs.js';
+export { NativeACVMSimulator } from './private/providers/acvm_native.js';
+export { type SimulationProvider } from './private/providers/simulation_provider.js';
+export * from './common/index.js';
 //# sourceMappingURL=server.d.ts.map

package/dest/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AACrF,cAAc,mBAAmB,CAAC"}

package/dest/server.js

@@ -1,6 +1,4 @@
-export * from './avm/index.js';
-export * from './common/index.js';
 export * from './public/index.js';
-export * from './providers/index.js';
-export * from './stats/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsa0JBQWtCLENBQUMifQ==
+export { WASMSimulatorWithBlobs } from './private/providers/acvm_wasm_with_blobs.js';
+export { NativeACVMSimulator } from './private/providers/acvm_native.js';
+export * from './common/index.js';

package/dest/test/utils.d.ts

@@ -1,5 +1,6 @@
-import { L1ToL2Message } from '@aztec/circuit-types';
-import { type AztecAddress, Fr } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { L1ToL2Message } from '@aztec/stdlib/messaging';
 /**
  * Test utility function to craft an L1 to L2 message.
  * @param selector - The cross chain message selector.

package/dest/test/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAW,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAc,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIvE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,mBACC,EAAE,EAAE,kBACL,YAAY,UACpB,EAAE,YACA,EAAE,GAAG,MAAM,2BAetB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAW,aAAa,EAAW,MAAM,yBAAyB,CAAC;AAE1E;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,mBACC,EAAE,EAAE,kBACL,YAAY,UACpB,EAAE,YACA,EAAE,GAAG,MAAM,2BAetB,CAAC"}

package/dest/test/utils.js

@@ -1,7 +1,8 @@
-import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
-import { EthAddress, Fr } from '@aztec/circuits.js';
-import { computeSecretHash } from '@aztec/circuits.js/hash';
 import { sha256ToField } from '@aztec/foundation/crypto';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { computeSecretHash } from '@aztec/stdlib/hash';
+import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/stdlib/messaging';
 /**
  * Test utility function to craft an L1 to L2 message.
  * @param selector - The cross chain message selector.
@@ -9,12 +10,13 @@ import { sha256ToField } from '@aztec/foundation/crypto';
  * @param targetContract - The contract to consume the message.
  * @param secret - The secret to unlock the message.
  * @returns The L1 to L2 message.
- */
-export const buildL1ToL2Message = async (selector, contentPreimage, targetContract, secret, msgIndex) => {
+ */ export const buildL1ToL2Message = async (selector, contentPreimage, targetContract, secret, msgIndex)=>{
     // Write the selector into a buffer.
     const selectorBuf = Buffer.from(selector, 'hex');
-    const content = sha256ToField([selectorBuf, ...contentPreimage]);
+    const content = sha256ToField([
+        selectorBuf,
+        ...contentPreimage
+    ]);
     const secretHash = await computeSecretHash(secret);
     return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash, new Fr(msgIndex));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQXFCLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLEtBQUssRUFDckMsUUFBZ0IsRUFDaEIsZUFBcUIsRUFDckIsY0FBNEIsRUFDNUIsTUFBVSxFQUNWLFFBQXFCLEVBQ3JCLEVBQUU7SUFDRixvQ0FBb0M7SUFDcEMsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFakQsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsZUFBZSxDQUFDLENBQUMsQ0FBQztJQUNqRSxNQUFNLFVBQVUsR0FBRyxNQUFNLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRW5ELE9BQU8sSUFBSSxhQUFhLENBQ3RCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFDbkMsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQyxFQUM5QixPQUFPLEVBQ1AsVUFBVSxFQUNWLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUNqQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.76.4",
+  "version": "0.77.0-testnet-ignition.17",
   "type": "module",
   "exports": {
-    "./common": "./dest/common.js",
     "./server": "./dest/server.js",
-    "./client": "./dest/client/index.js",
+    "./client": "./dest/client.js",
     "./public/fixtures": "./dest/public/fixtures/index.js"
   },
   "typedocOptions": {
@@ -21,7 +20,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json"
@@ -54,27 +53,27 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/noir-protocol-circuits-types": "0.76.4",
-    "@aztec/protocol-contracts": "0.76.4",
-    "@aztec/telemetry-client": "0.76.4",
-    "@aztec/types": "0.76.4",
-    "@aztec/world-state": "0.76.4",
-    "@noir-lang/acvm_js": "1.0.0-beta.1",
-    "@noir-lang/noirc_abi": "1.0.0-beta.1",
-    "@noir-lang/types": "1.0.0-beta.1",
+    "@aztec/constants": "0.77.0-testnet-ignition.17",
+    "@aztec/foundation": "0.77.0-testnet-ignition.17",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.17",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.17",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.17",
+    "@aztec/telemetry-client": "0.77.0-testnet-ignition.17",
+    "@aztec/world-state": "0.77.0-testnet-ignition.17",
     "levelup": "^5.1.1",
     "lodash.clonedeep": "^4.5.0",
+    "lodash.merge": "^4.6.2",
     "memdown": "^6.1.1",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "@aztec/noir-acvm_js": "0.77.0-testnet-ignition.17",
+    "@aztec/noir-noirc_abi": "0.77.0-testnet-ignition.17",
+    "@aztec/noir-types": "0.77.0-testnet-ignition.17"
   },
   "devDependencies": {
     "@aztec/kv-store": "workspace:^",
@@ -89,7 +88,6 @@
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.4",
-    "lodash.merge": "^4.6.2",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4",
     "viem": "2.22.8"

package/src/client.ts

@@ -0,0 +1,4 @@
+export * from './private/index.js';
+export { WASMSimulator } from './private/providers/acvm_wasm.js';
+export { type SimulationProvider } from './private/providers/simulation_provider.js';
+export * from './common/index.js';

package/src/{public → common}/db_interfaces.ts

@@ -1,13 +1,11 @@
-import { type NullifierMembershipWitness } from '@aztec/circuit-types';
-import {
-  type ContractInstanceWithAddress,
-  type FunctionSelector,
-  type L1_TO_L2_MSG_TREE_HEIGHT,
-} from '@aztec/circuits.js';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { type Fr } from '@aztec/foundation/fields';
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/fields';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { NullifierMembershipWitness } from '@aztec/stdlib/trees';
 
-import { type MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js';
+import type { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
 
 /**
  * Database interface for providing access to public state.
@@ -26,44 +24,14 @@ export interface PublicStateDB {
    * @param contract - Owner of the storage.
    * @param slot - Slot to read in the contract storage.
    * @param newValue - The new value to store.
-   * @returns The slot of the written leaf in the public data tree.
    */
-  storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
-
-  /**
-   * Mark the uncommitted changes in this TX as a checkpoint.
-   */
-  checkpoint(): Promise<void>;
-
-  /**
-   * Rollback to the last checkpoint.
-   */
-  rollbackToCheckpoint(): Promise<void>;
-
-  /**
-   * Commit the changes in this TX. Includes all changes since the last commit,
-   * even if they haven't been covered by a checkpoint.
-   */
-  commit(): Promise<void>;
-
-  /**
-   * Rollback to the last commit.
-   */
-  rollbackToCommit(): Promise<void>;
+  storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
 }
 
 /**
  * Database interface for providing access to public contract data.
  */
 export interface PublicContractsDB {
-  /**
-   * Returns the brillig (public bytecode) of a function.
-   * @param address - The contract address that owns this function.
-   * @param selector - The selector for the function.
-   * @returns The bytecode or undefined if not found.
-   */
-  getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined>;
-
   /**
    * Returns a publicly deployed contract instance.
    * @param address - Address of the contract.

package/src/common/debug_fn_name.ts

@@ -1,6 +1,8 @@
-import { type AztecAddress, type Fr, FunctionSelector } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import { type WorldStateDB } from '../public/public_db_sources.js';
+import type { WorldStateDB } from '../public/public_db_sources.js';
 
 export async function getPublicFunctionDebugName(
   db: WorldStateDB,

package/src/common/errors.ts

@@ -1,14 +1,14 @@
+import type { Fr } from '@aztec/foundation/fields';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/stdlib/abi';
 import {
   type FailingFunction,
   type NoirCallStack,
   SimulationError,
   type SourceCodeLocation,
-} from '@aztec/circuit-types';
-import { type Fr } from '@aztec/circuits.js';
-import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/foundation/abi';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
+} from '@aztec/stdlib/errors';
 
-import { type RawAssertionPayload } from '@noir-lang/acvm_js';
+import type { RawAssertionPayload } from '@noir-lang/acvm_js';
 import { abiDecodeError } from '@noir-lang/noirc_abi';
 
 /**

package/src/common/index.ts

@@ -1,2 +1,3 @@
-export * from './hashed_values_cache.js';
 export * from './errors.js';
+export * from './stats/index.js';
+export * from './message_load_oracle_inputs.js';

package/src/common/message_load_oracle_inputs.ts

@@ -1,5 +1,5 @@
-import { type SiblingPath } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
+import type { SiblingPath } from '@aztec/foundation/trees';
 
 export class MessageLoadOracleInputs<N extends number> {
   constructor(

package/src/common/stats/index.ts

@@ -0,0 +1 @@
+export * from './stats.js';

package/src/{stats → common/stats}/stats.ts

@@ -1,5 +1,5 @@
-import { type CircuitName, type CircuitSimulationStats } from '@aztec/circuit-types/stats';
-import { type Logger } from '@aztec/foundation/log';
+import type { Logger } from '@aztec/foundation/log';
+import type { CircuitName, CircuitSimulationStats } from '@aztec/stdlib/stats';
 
 export function emitCircuitSimulationStats(
   circuitName: CircuitName,

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

@@ -1,6 +1,6 @@
-import { type NoirCallStack } from '@aztec/circuit-types';
-import type { FunctionDebugMetadata } from '@aztec/foundation/abi';
 import { createLogger } from '@aztec/foundation/log';
+import type { FunctionDebugMetadata } from '@aztec/stdlib/abi';
+import type { NoirCallStack } from '@aztec/stdlib/errors';
 
 import {
   type ExecutionError,
@@ -9,9 +9,9 @@ import {
   executeCircuitWithReturnWitness,
 } from '@noir-lang/acvm_js';
 
-import { resolveOpcodeLocations, traverseCauseChain } from '../common/errors.js';
-import { type ACVMWitness } from './acvm_types.js';
-import { type ORACLE_NAMES } from './oracle/index.js';
+import { resolveOpcodeLocations, traverseCauseChain } from '../../common/errors.js';
+import type { ACVMWitness } from './acvm_types.js';
+import type { ORACLE_NAMES } from './oracle/index.js';
 
 /**
  * The callback interface for the ACIR.

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

@@ -1,4 +1,4 @@
-import { type WitnessMap } from '@noir-lang/acvm_js';
+import type { WitnessMap } from '@noir-lang/acvm_js';
 
 /**
  * ACVMField

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

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 
-import { type ACVMField, type ACVMWitness } from './acvm_types.js';
+import type { ACVMField, ACVMWitness } from './acvm_types.js';
 
 /**
  * Converts an ACVM field to a Fr.
@@ -31,7 +31,7 @@ export function frToBoolean(fr: Fr): boolean {
 
 /**
  * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
- * two separate ACVMField arrays.
+ * two separate ACVMField values (an array and a single field).
  *
  * @param storage The array with the BoundedVec's storage (i.e. BoundedVec::storage())
  * @param length The length of the BoundedVec (i.e. BoundedVec::len())

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

@@ -1,4 +1,4 @@
-import { type Oracle } from './oracle.js';
+import type { Oracle } from './oracle.js';
 
 export * from './oracle.js';
 export * from './typed_oracle.js';

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

@@ -1,12 +1,13 @@
-import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
-import { FunctionSelector, NoteSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ContractClassLog, LogWithTxData } from '@aztec/stdlib/logs';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
 
-import { type ACVMField } from '../acvm_types.js';
+import type { ACVMField } from '../acvm_types.js';
 import { frToBoolean, frToNumber, fromACVMField, fromBoundedVec } from '../deserialize.js';
-import { toACVMField } from '../serialize.js';
-import { type TypedOracle } from './typed_oracle.js';
+import { toACVMField, toACVMFieldSingleOrArray } from '../serialize.js';
+import type { TypedOracle } from './typed_oracle.js';
 
 /**
  * A data source that has all the apis required by Aztec.nr.
@@ -58,7 +59,7 @@ export class Oracle {
     return [
       instance.salt,
       instance.deployer,
-      instance.contractClassId,
+      instance.currentContractClassId,
       instance.initializationHash,
       ...instance.publicKeys.toFields(),
     ].map(toACVMField);
@@ -280,12 +281,11 @@ export class Oracle {
     return newValues.map(toACVMField);
   }
 
-  emitContractClassLog([contractAddress]: ACVMField[], message: ACVMField[], [counter]: ACVMField[]): ACVMField {
-    const logPayload = Buffer.concat(message.map(fromACVMField).map(f => f.toBuffer()));
-    const log = new UnencryptedL2Log(AztecAddress.fromString(contractAddress), logPayload);
+  emitContractClassLog([contractAddress]: ACVMField[], message: ACVMField[], [counter]: ACVMField[]): void {
+    const logPayload = message.map(fromACVMField);
+    const log = new ContractClassLog(new AztecAddress(fromACVMField(contractAddress)), logPayload);
 
-    const logHash = this.typedOracle.emitContractClassLog(log, +counter);
-    return toACVMField(logHash);
+    this.typedOracle.emitContractClassLog(log, +counter);
   }
 
   debugLog(message: ACVMField[], _ignoredFieldsSize: ACVMField[], fields: ACVMField[]): void {
@@ -396,6 +396,16 @@ export class Oracle {
     return toACVMField(true);
   }
 
+  async getLogByTag([tag]: ACVMField[]): Promise<(ACVMField | ACVMField[])[]> {
+    const log = await this.typedOracle.getLogByTag(fromACVMField(tag));
+
+    if (log == null) {
+      return [toACVMField(0), ...LogWithTxData.noirSerializationOfEmpty().map(toACVMFieldSingleOrArray)];
+    } else {
+      return [toACVMField(1), ...log.toNoirSerialization().map(toACVMFieldSingleOrArray)];
+    }
+  }
+
   async storeCapsule([contractAddress]: ACVMField[], [slot]: ACVMField[], capsule: ACVMField[]) {
     await this.typedOracle.storeCapsule(
       AztecAddress.fromField(fromACVMField(contractAddress)),