@aztec/txe 1.2.0 → 2.0.0-nightly.20250813

package/dest/util/txe_public_contract_data_source.js

@@ -9,7 +9,7 @@ export class TXEPublicContractDataSource {
         this.#privateFunctionsRoot = new Map();
     }
     getBlockNumber() {
-        return this.txeOracle.getBlockNumber();
+        return this.txeOracle.utilityGetBlockNumber();
     }
     async getContractClass(id) {
         const contractClass = await this.txeOracle.getContractDataProvider().getContractClass(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "1.2.0",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -16,7 +16,7 @@
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
-    "dev": "LOG_LEVEL=debug node ./dest/bin/index.js",
+    "dev": "LOG_LEVEL=\"debug; trace: simulator:state_manager; info: json-rpc:proxy\" node ./dest/bin/index.js",
     "start": "node --no-warnings ./dest/bin/index.js"
   },
   "inherits": [
@@ -61,20 +61,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "1.2.0",
-    "@aztec/archiver": "1.2.0",
-    "@aztec/aztec-node": "1.2.0",
-    "@aztec/aztec.js": "1.2.0",
-    "@aztec/bb-prover": "1.2.0",
-    "@aztec/constants": "1.2.0",
-    "@aztec/foundation": "1.2.0",
-    "@aztec/key-store": "1.2.0",
-    "@aztec/kv-store": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
-    "@aztec/pxe": "1.2.0",
-    "@aztec/simulator": "1.2.0",
-    "@aztec/stdlib": "1.2.0",
-    "@aztec/world-state": "1.2.0",
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/archiver": "2.0.0-nightly.20250813",
+    "@aztec/aztec-node": "2.0.0-nightly.20250813",
+    "@aztec/aztec.js": "2.0.0-nightly.20250813",
+    "@aztec/bb-prover": "2.0.0-nightly.20250813",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/key-store": "2.0.0-nightly.20250813",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/pxe": "2.0.0-nightly.20250813",
+    "@aztec/simulator": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
+    "@aztec/world-state": "2.0.0-nightly.20250813",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/index.ts

@@ -6,7 +6,7 @@ import {
   type NoirCompiledContract,
   PublicKeys,
   deriveKeys,
-  getContractInstanceFromDeployParams,
+  getContractInstanceFromInstantiationParams,
   loadContractArtifact,
 } from '@aztec/aztec.js';
 import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
@@ -19,7 +19,7 @@ import type { ApiSchemaFor, ZodFor } from '@aztec/stdlib/schemas';
 import { createHash } from 'crypto';
 import { createReadStream } from 'fs';
 import { readFile, readdir } from 'fs/promises';
-import { join } from 'path';
+import { join, parse } from 'path';
 import { z } from 'zod';
 
 import { TXEService } from './txe_service/txe_service.js';
@@ -32,7 +32,6 @@ import {
   type ForeignCallSingle,
   fromArray,
   fromSingle,
-  toForeignCallResult,
   toSingle,
 } from './util/encoding.js';
 import type { ContractArtifactWithHash } from './util/txe_contract_data_provider.js';
@@ -54,7 +53,7 @@ type MethodNames<T> = {
 
 type TXEForeignCallInput = {
   session_id: number;
-  function: MethodNames<TXEService> | 'reset';
+  function: MethodNames<TXEService>;
   root_path: string;
   package_name: string;
   inputs: ForeignCallArgs;
@@ -63,7 +62,7 @@ type TXEForeignCallInput = {
 const TXEForeignCallInputSchema = z.object({
   // eslint-disable-next-line camelcase
   session_id: z.number().int().nonnegative(),
-  function: z.string() as ZodFor<MethodNames<TXEService> | 'reset'>,
+  function: z.string() as ZodFor<MethodNames<TXEService>>,
   // eslint-disable-next-line camelcase
   root_path: z.string(),
   // eslint-disable-next-line camelcase
@@ -92,42 +91,43 @@ class TXEDispatcher {
   }
 
   async #processDeployInputs({ inputs, root_path: rootPath, package_name: packageName }: TXEForeignCallInput) {
-    const [pathStr, contractName, initializer] = inputs.slice(0, 3).map(input =>
+    const [contractPath, initializer] = inputs.slice(0, 2).map(input =>
       fromArray(input as ForeignCallArray)
         .map(char => String.fromCharCode(char.toNumber()))
         .join(''),
     );
 
-    const decodedArgs = fromArray(inputs[4] as ForeignCallArray);
-    const secret = fromSingle(inputs[5] as ForeignCallSingle);
+    const decodedArgs = fromArray(inputs[3] as ForeignCallArray);
+    const secret = fromSingle(inputs[4] as ForeignCallSingle);
     const publicKeys = secret.equals(Fr.ZERO) ? PublicKeys.default() : (await deriveKeys(secret)).publicKeys;
     const publicKeysHash = await publicKeys.hash();
 
     let artifactPath = '';
-    // We're deploying the contract under test
-    // env.deploy_self("contractName")
-    if (!pathStr) {
-      artifactPath = join(rootPath, './target', `${packageName}-${contractName}.json`);
-    } else {
-      // We're deploying a contract that belongs in a workspace
-      // env.deploy("../path/to/workspace/root@packageName", "contractName")
-      if (pathStr.includes('@')) {
-        const [workspace, pkg] = pathStr.split('@');
-        const targetPath = join(rootPath, workspace, './target');
+    const { dir: contractDirectory, base: contractFilename } = parse(contractPath);
+    if (contractDirectory) {
+      if (contractDirectory.includes('@')) {
+        // We're deploying a contract that belongs in a workspace
+        // env.deploy("../path/to/workspace/root@packageName/contractName")
+        const [workspace, pkg] = contractDirectory.split('@');
+        const targetPath = join(rootPath, workspace, '/target');
         this.logger.debug(`Looking for compiled artifact in workspace ${targetPath}`);
-        artifactPath = join(targetPath, `${pkg}-${contractName}.json`);
+        artifactPath = join(targetPath, `${pkg}-${contractFilename}.json`);
       } else {
-        // We're deploying a standalone contract
-        // env.deploy("../path/to/contract/root", "contractName")
-        const targetPath = join(rootPath, pathStr, './target');
+        // We're deploying a standalone external contract
+        // env.deploy("../path/to/contract/root/contractName")
+        const targetPath = join(rootPath, contractDirectory, '/target');
         this.logger.debug(`Looking for compiled artifact in ${targetPath}`);
-        [artifactPath] = (await readdir(targetPath)).filter(file => file.endsWith(`-${contractName}.json`));
+        [artifactPath] = (await readdir(targetPath)).filter(file => file.endsWith(`-${contractFilename}.json`));
       }
+    } else {
+      // We're deploying a local contract
+      // env.deploy("contractName")
+      artifactPath = join(rootPath, './target', `${packageName}-${contractFilename}.json`);
     }
 
     const fileHash = await this.fastHashFile(artifactPath);
 
-    const cacheKey = `${pathStr}-${contractName}-${initializer}-${decodedArgs
+    const cacheKey = `${contractDirectory ?? ''}-${contractFilename}-${initializer}-${decodedArgs
       .map(arg => arg.toString())
       .join('-')}-${publicKeysHash}-${fileHash}`;
 
@@ -152,7 +152,7 @@ class TXEDispatcher {
           artifact.name
         } with initializer ${initializer}(${decodedArgs}) and public keys hash ${publicKeysHash.toString()}`,
       );
-      instance = await getContractInstanceFromDeployParams(artifact, {
+      instance = await getContractInstanceFromInstantiationParams(artifact, {
         constructorArgs: decodedArgs,
         skipArgsDecoding: true,
         salt: Fr.ONE,
@@ -163,7 +163,7 @@ class TXEDispatcher {
       TXEArtifactsCache.set(cacheKey, { artifact, instance });
     }
 
-    inputs.splice(0, 2, artifact, instance, toSingle(secret));
+    inputs.splice(0, 1, artifact, instance, toSingle(secret));
   }
 
   async #processAddAccountInputs({ inputs }: TXEForeignCallInput) {
@@ -186,7 +186,7 @@ class TXEDispatcher {
         // and the TXE contract data provider can cache it
         artifactHash: await computeArtifactHash(SchnorrAccountContractArtifact),
       };
-      instance = await getContractInstanceFromDeployParams(artifact, {
+      instance = await getContractInstanceFromInstantiationParams(artifact, {
         constructorArgs: args,
         skipArgsDecoding: true,
         salt: Fr.ONE,
@@ -205,7 +205,7 @@ class TXEDispatcher {
     const { session_id: sessionId, function: functionName, inputs } = callData;
     this.logger.debug(`Calling ${functionName} on session ${sessionId}`);
 
-    if (!TXESessions.has(sessionId) && functionName != 'reset') {
+    if (!TXESessions.has(sessionId)) {
       this.logger.debug(`Creating new session ${sessionId}`);
       if (!this.protocolContracts) {
         this.protocolContracts = await Promise.all(
@@ -216,22 +216,29 @@ class TXEDispatcher {
     }
 
     switch (functionName) {
-      case 'reset': {
-        TXESessions.delete(sessionId) &&
-          this.logger.debug(`Called reset on session ${sessionId}, yeeting it out of existence`);
-        return toForeignCallResult([]);
-      }
-      case 'deploy': {
+      case 'txeDeploy': {
         await this.#processDeployInputs(callData);
         break;
       }
-      case 'addAccount': {
+      case 'txeAddAccount': {
         await this.#processAddAccountInputs(callData);
         break;
       }
     }
 
     const txeService = TXESessions.get(sessionId);
+
+    // Check if the function exists on the txeService before calling it
+    if (typeof (txeService as any)[functionName] !== 'function') {
+      const availableMethods = Object.getOwnPropertyNames(Object.getPrototypeOf(txeService))
+        .filter(name => typeof (txeService as any)[name] === 'function' && name !== 'constructor')
+        .sort();
+
+      throw new Error(
+        `TXE function '${functionName}' is not available. ` + `Available methods: ${availableMethods.join(', ')}`,
+      );
+    }
+
     const response = await (txeService as any)[functionName](...inputs);
     return response;
   }