@aztec/txe 0.46.5 → 0.46.6

package/dest/util/txe_public_contract_data_source.js

@@ -0,0 +1,48 @@
+import { Fr, unpackBytecode } from '@aztec/circuits.js';
+import { PrivateFunctionsTree } from '@aztec/pxe';
+export class TXEPublicContractDataSource {
+    constructor(txeOracle) {
+        this.txeOracle = txeOracle;
+    }
+    async getPublicFunction(address, selector) {
+        const bytecode = await this.txeOracle.getContractDataOracle().getBytecode(address, selector);
+        if (!bytecode) {
+            return undefined;
+        }
+        return { bytecode, selector };
+    }
+    getBlockNumber() {
+        return this.txeOracle.getBlockNumber();
+    }
+    async getContractClass(id) {
+        const contractClass = await this.txeOracle.getContractDataOracle().getContractClass(id);
+        const artifact = await this.txeOracle.getContractDataOracle().getContractArtifact(id);
+        const tree = new PrivateFunctionsTree(artifact);
+        const privateFunctionsRoot = tree.getFunctionTreeRoot();
+        return {
+            id,
+            artifactHash: contractClass.artifactHash,
+            packedBytecode: contractClass.packedBytecode,
+            publicFunctions: unpackBytecode(contractClass.packedBytecode),
+            privateFunctionsRoot: new Fr(privateFunctionsRoot.root),
+            version: contractClass.version,
+            privateFunctions: [],
+            unconstrainedFunctions: [],
+        };
+    }
+    async getContract(address) {
+        const instance = await this.txeOracle.getContractDataOracle().getContractInstance(address);
+        return { ...instance, address };
+    }
+    getContractClassIds() {
+        throw new Error('Method not implemented.');
+    }
+    async getContractArtifact(address) {
+        const instance = await this.txeOracle.getContractDataOracle().getContractInstance(address);
+        return this.txeOracle.getContractDataOracle().getContractArtifact(instance.contractClassId);
+    }
+    addContractArtifact(address, contract) {
+        return this.txeOracle.addContractArtifact(contract);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFxQixFQUFFLEVBQXlCLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxHLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQVVsRCxNQUFNLE9BQU8sMkJBQTJCO0lBQ3RDLFlBQW9CLFNBQWM7UUFBZCxjQUFTLEdBQVQsU0FBUyxDQUFLO0lBQUcsQ0FBQztJQUV0QyxLQUFLLENBQUMsaUJBQWlCLENBQUMsT0FBcUIsRUFBRSxRQUEwQjtRQUN2RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdGLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFDRCxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFRCxjQUFjO1FBQ1osT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsRUFBTTtRQUMzQixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4RixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RixNQUFNLElBQUksR0FBRyxJQUFJLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFFeEQsT0FBTztZQUNMLEVBQUU7WUFDRixZQUFZLEVBQUUsYUFBYyxDQUFDLFlBQVk7WUFDekMsY0FBYyxFQUFFLGFBQWMsQ0FBQyxjQUFjO1lBQzdDLGVBQWUsRUFBRSxjQUFjLENBQUMsYUFBYyxDQUFDLGNBQWMsQ0FBQztZQUM5RCxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxvQkFBcUIsQ0FBQyxJQUFJLENBQUM7WUFDeEQsT0FBTyxFQUFFLGFBQWMsQ0FBQyxPQUFPO1lBQy9CLGdCQUFnQixFQUFFLEVBQUU7WUFDcEIsc0JBQXNCLEVBQUUsRUFBRTtTQUMzQixDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBcUI7UUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxFQUFFLEdBQUcsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2xDLENBQUM7SUFFRCxtQkFBbUI7UUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBcUI7UUFDN0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxPQUFxQixFQUFFLFFBQTBCO1FBQ25FLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0RCxDQUFDO0NBQ0YifQ==

package/dest/util/txe_public_state_db.d.ts

@@ -0,0 +1,14 @@
+import { type AztecAddress, Fr } from '@aztec/circuits.js';
+import { type PublicStateDB } from '@aztec/simulator';
+import { type TXE } from '../oracle/txe_oracle.js';
+export declare class TXEPublicStateDB implements PublicStateDB {
+    private txeOracle;
+    constructor(txeOracle: TXE);
+    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
+    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
+    checkpoint(): Promise<void>;
+    rollbackToCheckpoint(): Promise<void>;
+    commit(): Promise<void>;
+    rollbackToCommit(): Promise<void>;
+}
+//# sourceMappingURL=txe_public_state_db.d.ts.map

package/dest/util/txe_public_state_db.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"txe_public_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_state_db.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EACjB,EAAE,EAIH,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,gBAAiB,YAAW,aAAa;IACxC,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAiB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAWnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGrC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}

package/dest/util/txe_public_state_db.js

@@ -0,0 +1,37 @@
+import { MerkleTreeId } from '@aztec/circuit-types';
+import { Fr, PUBLIC_DATA_SUBTREE_HEIGHT, PublicDataTreeLeaf, } from '@aztec/circuits.js';
+import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+export class TXEPublicStateDB {
+    constructor(txeOracle) {
+        this.txeOracle = txeOracle;
+    }
+    async storageRead(contract, slot) {
+        const db = this.txeOracle.getTrees().asLatest();
+        const leafSlot = computePublicDataTreeLeafSlot(contract, slot).toBigInt();
+        const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        let value = Fr.ZERO;
+        if (lowLeafResult && lowLeafResult.alreadyPresent) {
+            const preimage = (await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
+            value = preimage.value;
+        }
+        return value;
+    }
+    async storageWrite(contract, slot, newValue) {
+        const db = this.txeOracle.getTrees().asLatest();
+        await db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, [new PublicDataTreeLeaf(computePublicDataTreeLeafSlot(contract, slot), newValue).toBuffer()], PUBLIC_DATA_SUBTREE_HEIGHT);
+        return newValue.toBigInt();
+    }
+    checkpoint() {
+        return Promise.resolve();
+    }
+    rollbackToCheckpoint() {
+        throw new Error('Cannot rollback');
+    }
+    commit() {
+        return Promise.resolve();
+    }
+    rollbackToCommit() {
+        throw new Error('Cannot rollback');
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19zdGF0ZV9kYi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfc3RhdGVfZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sRUFFTCxFQUFFLEVBQ0YsMEJBQTBCLEVBQzFCLGtCQUFrQixHQUVuQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3hFLE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsWUFBb0IsU0FBYztRQUFkLGNBQVMsR0FBVCxTQUFTLENBQUs7SUFBRyxDQUFDO0lBRXRDLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ2hELE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDaEQsTUFBTSxRQUFRLEdBQUcsNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBRTFFLE1BQU0sYUFBYSxHQUFHLE1BQU0sRUFBRSxDQUFDLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUU5RixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDO1FBQ3BCLElBQUksYUFBYSxJQUFJLGFBQWEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUNsRCxNQUFNLFFBQVEsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLGVBQWUsQ0FDeEMsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDL0QsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVoRCxNQUFNLEVBQUUsQ0FBQyxXQUFXLENBQ2xCLFlBQVksQ0FBQyxnQkFBZ0IsRUFDN0IsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxFQUM1RiwwQkFBMEIsQ0FDM0IsQ0FBQztRQUNGLE9BQU8sUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNELG9CQUFvQjtRQUNsQixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztJQUNELE1BQU07UUFDSixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ0QsZ0JBQWdCO1FBQ2QsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.46.5",
+  "version": "0.46.6",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -57,18 +57,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.46.5",
-    "@aztec/aztec.js": "0.46.5",
-    "@aztec/circuit-types": "0.46.5",
-    "@aztec/circuits.js": "0.46.5",
-    "@aztec/foundation": "0.46.5",
-    "@aztec/key-store": "0.46.5",
-    "@aztec/kv-store": "0.46.5",
-    "@aztec/noir-contracts.js": "0.46.5",
-    "@aztec/pxe": "0.46.5",
-    "@aztec/simulator": "0.46.5",
-    "@aztec/types": "0.46.5",
-    "@aztec/world-state": "0.46.5"
+    "@aztec/archiver": "0.46.6",
+    "@aztec/aztec.js": "0.46.6",
+    "@aztec/circuit-types": "0.46.6",
+    "@aztec/circuits.js": "0.46.6",
+    "@aztec/foundation": "0.46.6",
+    "@aztec/key-store": "0.46.6",
+    "@aztec/kv-store": "0.46.6",
+    "@aztec/noir-contracts.js": "0.46.6",
+    "@aztec/pxe": "0.46.6",
+    "@aztec/simulator": "0.46.6",
+    "@aztec/types": "0.46.6",
+    "@aztec/world-state": "0.46.6"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",

package/src/bin/index.ts

@@ -1,81 +1,24 @@
 #!/usr/bin/env -S node --no-warnings
-import { Fr } from '@aztec/foundation/fields';
-import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
-import { type Logger, createDebugLogger } from '@aztec/foundation/log';
+import { createDebugLogger } from '@aztec/aztec.js';
 
 import http from 'http';
 
-import { TXEService } from '../txe_service/txe_service.js';
-import { type ForeignCallResult, toForeignCallResult } from '../util/encoding.js';
-
-const { TXE_PORT = 8080 } = process.env;
-
-const logger = createDebugLogger('aztec:txe_service');
-
-const TXESessions = new Map<number, TXEService>();
-
-type MethodNames<T> = {
-  [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
-}[keyof T];
-
-type TXEForeignCallInput = {
-  session_id: number;
-  function: MethodNames<TXEService> | 'reset';
-  inputs: any[];
-};
-
-class TXEDispatcher {
-  constructor(private logger: Logger) {}
-
-  // eslint-disable-next-line camelcase
-  async resolve_foreign_call({
-    session_id: sessionId,
-    function: functionName,
-    inputs,
-  }: TXEForeignCallInput): Promise<ForeignCallResult> {
-    this.logger.debug(`Calling ${functionName} on session ${sessionId}`);
-
-    if (!TXESessions.has(sessionId) && functionName != 'reset') {
-      this.logger.info(`Creating new session ${sessionId}`);
-      TXESessions.set(sessionId, await TXEService.init(logger));
-    }
-
-    if (functionName === 'reset') {
-      TXESessions.delete(sessionId) &&
-        this.logger.info(`Called reset on session ${sessionId}, yeeting it out of existence`);
-      return toForeignCallResult([]);
-    } else {
-      const txeService = TXESessions.get(sessionId);
-      const response = await (txeService as any)[functionName](...inputs);
-      return response;
-    }
-  }
-}
-
-/**
- * Creates an http server that forwards calls to the TXE and starts it on the given port.
- * @param txeService - TXE that answers queries to the created HTTP server.
- * @param port - Port to listen in.
- * @returns A running http server.
- */
-export function startTXEHttpServer(dispatcher: TXEDispatcher, port: string | number): http.Server {
-  const txeServer = new JsonRpcServer(dispatcher, { Fr }, {}, ['init']);
-
-  const app = txeServer.getApp();
-  const httpServer = http.createServer(app.callback());
-  httpServer.timeout = 1e3 * 60 * 5; // 5 minutes
-  httpServer.listen(port);
-
-  return httpServer;
-}
+import { createTXERpcServer } from '../index.js';
 
 /**
  * Create and start a new TXE HTTP Server
  */
 function main() {
+  const { TXE_PORT = 8080 } = process.env;
+
+  const logger = createDebugLogger('aztec:txe_service');
   logger.info(`Setting up TXE...`);
 
-  startTXEHttpServer(new TXEDispatcher(logger), TXE_PORT);
+  const txeServer = createTXERpcServer(logger);
+  const app = txeServer.getApp();
+  const httpServer = http.createServer(app.callback());
+  httpServer.timeout = 1e3 * 60 * 5; // 5 minutes
+  httpServer.listen(TXE_PORT);
 
   logger.info(`TXE listening on port ${TXE_PORT}`);
 }

package/src/index.ts

@@ -0,0 +1,55 @@
+import { Fr } from '@aztec/foundation/fields';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { type Logger } from '@aztec/foundation/log';
+
+import { TXEService } from './txe_service/txe_service.js';
+import { type ForeignCallResult, toForeignCallResult } from './util/encoding.js';
+
+const TXESessions = new Map<number, TXEService>();
+
+type MethodNames<T> = {
+  [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
+}[keyof T];
+
+type TXEForeignCallInput = {
+  session_id: number;
+  function: MethodNames<TXEService> | 'reset';
+  inputs: any[];
+};
+
+class TXEDispatcher {
+  constructor(private logger: Logger) {}
+
+  // eslint-disable-next-line camelcase
+  async resolve_foreign_call({
+    session_id: sessionId,
+    function: functionName,
+    inputs,
+  }: TXEForeignCallInput): Promise<ForeignCallResult> {
+    this.logger.debug(`Calling ${functionName} on session ${sessionId}`);
+
+    if (!TXESessions.has(sessionId) && functionName != 'reset') {
+      this.logger.info(`Creating new session ${sessionId}`);
+      TXESessions.set(sessionId, await TXEService.init(this.logger));
+    }
+
+    if (functionName === 'reset') {
+      TXESessions.delete(sessionId) &&
+        this.logger.info(`Called reset on session ${sessionId}, yeeting it out of existence`);
+      return toForeignCallResult([]);
+    } else {
+      const txeService = TXESessions.get(sessionId);
+      const response = await (txeService as any)[functionName](...inputs);
+      return response;
+    }
+  }
+}
+
+/**
+ * Creates an RPC server that forwards calls to the TXE.
+ * @param logger - Logger to output to
+ * @returns A TXE RPC server.
+ */
+export function createTXERpcServer(logger: Logger) {
+  return new JsonRpcServer(new TXEDispatcher(logger), { Fr }, {}, ['init']);
+}