@aztec/txe 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/util/encoding.js

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress, ContractInstanceWithAddressSchema } from '@aztec/circuits.js';
 import { ContractArtifactSchema } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { hexToBuffer } from '@aztec/foundation/string';
@@ -10,21 +10,30 @@ export function addressFromSingle(obj) {
     return new AztecAddress(fromSingle(obj));
 }
 export function fromArray(obj) {
-    return obj.map(str => Fr.fromBuffer(hexToBuffer(str)));
+    return obj.map((str)=>Fr.fromBuffer(hexToBuffer(str)));
 }
 export function toSingle(obj) {
     return obj.toString().slice(2);
 }
 export function toArray(objs) {
-    return objs.map(obj => obj.toString());
+    return objs.map((obj)=>obj.toString());
 }
 export function toForeignCallResult(obj) {
-    return { values: obj };
+    return {
+        values: obj
+    };
 }
 export const ForeignCallSingleSchema = z.string();
 export const ForeignCallArraySchema = z.array(z.string());
-export const ForeignCallArgsSchema = z.array(z.union([ForeignCallSingleSchema, ForeignCallArraySchema, ContractArtifactSchema]));
+export const ForeignCallArgsSchema = z.array(z.union([
+    ForeignCallSingleSchema,
+    ForeignCallArraySchema,
+    ContractArtifactSchema,
+    ContractInstanceWithAddressSchema
+]));
 export const ForeignCallResultSchema = z.object({
-    values: z.array(z.union([ForeignCallSingleSchema, ForeignCallArraySchema])),
+    values: z.array(z.union([
+        ForeignCallSingleSchema,
+        ForeignCallArraySchema
+    ]))
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2RpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbC9lbmNvZGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUF5QixzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQVl4QixNQUFNLFVBQVUsVUFBVSxDQUFDLEdBQXNCO0lBQy9DLE9BQU8sRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUM7QUFFRCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsR0FBc0I7SUFDdEQsT0FBTyxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztBQUMzQyxDQUFDO0FBRUQsTUFBTSxVQUFVLFNBQVMsQ0FBQyxHQUFxQjtJQUM3QyxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDekQsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRLENBQUMsR0FBc0I7SUFDN0MsT0FBTyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pDLENBQUM7QUFFRCxNQUFNLFVBQVUsT0FBTyxDQUFDLElBQVU7SUFDaEMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7QUFDekMsQ0FBQztBQUVELE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxHQUE2QztJQUMvRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxDQUFDO0FBQ3pCLENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7QUFFbEQsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztBQUUxRCxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUMxQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsdUJBQXVCLEVBQUUsc0JBQXNCLEVBQUUsc0JBQXNCLENBQUMsQ0FBQyxDQUNuRixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUM5QyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsdUJBQXVCLEVBQUUsc0JBQXNCLENBQUMsQ0FBQyxDQUFDO0NBQzVFLENBQUMsQ0FBQyJ9

package/dest/util/expected_failure_error.js

@@ -1,6 +1,5 @@
 export class ExpectedFailureError extends Error {
-    constructor(message) {
+    constructor(message){
         super(message);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwZWN0ZWRfZmFpbHVyZV9lcnJvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2V4cGVjdGVkX2ZhaWx1cmVfZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLG9CQUFxQixTQUFRLEtBQUs7SUFDN0MsWUFBWSxPQUFlO1FBQ3pCLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNqQixDQUFDO0NBQ0YifQ==

package/dest/util/txe_database.js

@@ -1,24 +1,20 @@
-var _TXEDatabase_accounts;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { CompleteAddress } from '@aztec/circuits.js';
 import { KVPxeDatabase } from '@aztec/pxe';
 export class TXEDatabase extends KVPxeDatabase {
-    constructor(db) {
+    #accounts;
+    constructor(db){
         super(db);
-        _TXEDatabase_accounts.set(this, void 0);
-        __classPrivateFieldSet(this, _TXEDatabase_accounts, db.openMap('accounts'), "f");
+        this.#accounts = db.openMap('accounts');
     }
     async getAccount(key) {
-        const completeAddress = await __classPrivateFieldGet(this, _TXEDatabase_accounts, "f").getAsync(key.toString());
+        const completeAddress = await this.#accounts.getAsync(key.toString());
         if (!completeAddress) {
             throw new Error(`Account not found: ${key.toString()}`);
         }
         return CompleteAddress.fromBuffer(completeAddress);
     }
     async setAccount(key, value) {
-        await __classPrivateFieldGet(this, _TXEDatabase_accounts, "f").set(key.toString(), value.toBuffer());
+        await this.#accounts.set(key.toString(), value.toBuffer());
         await this.addCompleteAddress(value);
     }
 }
-_TXEDatabase_accounts = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX2RhdGFiYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX2RhdGFiYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFxQixlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV4RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNDLE1BQU0sT0FBTyxXQUFZLFNBQVEsYUFBYTtJQUc1QyxZQUFZLEVBQXFCO1FBQy9CLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUhaLHdDQUF5QztRQUl2Qyx1QkFBQSxJQUFJLHlCQUFhLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQUEsQ0FBQztJQUMxQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFpQjtRQUNoQyxNQUFNLGVBQWUsR0FBRyxNQUFNLHVCQUFBLElBQUksNkJBQVUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDdEUsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3JCLE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLEdBQUcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDMUQsQ0FBQztRQUNELE9BQU8sZUFBZSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFpQixFQUFFLEtBQXNCO1FBQ3hELE1BQU0sdUJBQUEsSUFBSSw2QkFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDM0QsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDdkMsQ0FBQztDQUNGIn0=

package/dest/util/txe_public_contract_data_source.js

@@ -1,7 +1,8 @@
-import { Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
+import { Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR, computePublicBytecodeCommitment } from '@aztec/circuits.js';
 import { PrivateFunctionsTree } from '@aztec/pxe';
 export class TXEPublicContractDataSource {
-    constructor(txeOracle) {
+    txeOracle;
+    constructor(txeOracle){
         this.txeOracle = txeOracle;
     }
     async getPublicFunction(address, selector) {
@@ -9,7 +10,10 @@ export class TXEPublicContractDataSource {
         if (!bytecode) {
             return undefined;
         }
-        return { bytecode, selector };
+        return {
+            bytecode,
+            selector
+        };
     }
     getBlockNumber() {
         return this.txeOracle.getBlockNumber();
@@ -23,7 +27,7 @@ export class TXEPublicContractDataSource {
         if (contractClass.packedBytecode.length > 0) {
             publicFunctions.push({
                 selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
-                bytecode: contractClass.packedBytecode,
+                bytecode: contractClass.packedBytecode
             });
         }
         return {
@@ -34,7 +38,7 @@ export class TXEPublicContractDataSource {
             privateFunctionsRoot: new Fr(privateFunctionsRoot.root),
             version: contractClass.version,
             privateFunctions: [],
-            unconstrainedFunctions: [],
+            unconstrainedFunctions: []
         };
     }
     async getBytecodeCommitment(id) {
@@ -43,7 +47,10 @@ export class TXEPublicContractDataSource {
     }
     async getContract(address) {
         const instance = await this.txeOracle.getContractDataOracle().getContractInstance(address);
-        return { ...instance, address };
+        return {
+            ...instance,
+            address
+        };
     }
     getContractClassIds() {
         throw new Error('Method not implemented.');
@@ -57,11 +64,14 @@ export class TXEPublicContractDataSource {
         if (!artifact) {
             return undefined;
         }
-        const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f) => ({
-            name: f.name,
-            selector: await FunctionSelector.fromNameAndParameters({ name: f.name, parameters: f.parameters }),
-        })));
-        const func = functionSelectorsAndNames.find(f => f.selector.equals(selector));
+        const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f)=>({
+                name: f.name,
+                selector: await FunctionSelector.fromNameAndParameters({
+                    name: f.name,
+                    parameters: f.parameters
+                })
+            })));
+        const func = functionSelectorsAndNames.find((f)=>f.selector.equals(selector));
         return Promise.resolve(func?.name);
     }
     registerContractFunctionSignatures(_address, _signatures) {
@@ -73,4 +83,3 @@ export class TXEPublicContractDataSource {
         return Promise.resolve();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLEVBQUUsRUFDRixnQkFBZ0IsRUFDaEIsd0JBQXdCLEVBRXhCLCtCQUErQixHQUNoQyxNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUlsRCxNQUFNLE9BQU8sMkJBQTJCO0lBQ3RDLFlBQW9CLFNBQWM7UUFBZCxjQUFTLEdBQVQsU0FBUyxDQUFLO0lBQUcsQ0FBQztJQUV0QyxLQUFLLENBQUMsaUJBQWlCLENBQUMsT0FBcUIsRUFBRSxRQUEwQjtRQUN2RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdGLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFDRCxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFRCxjQUFjO1FBQ1osT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsRUFBTTtRQUMzQixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4RixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RixN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

package/dest/util/txe_world_state_db.js

@@ -1,26 +1,26 @@
 import { MerkleTreeId } from '@aztec/circuit-types';
-import { Fr, PublicDataWrite, } from '@aztec/circuits.js';
+import { Fr, PublicDataWrite } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { WorldStateDB } from '@aztec/simulator/server';
 export class TXEWorldStateDB extends WorldStateDB {
-    constructor(merkleDb, dataSource, txe) {
-        super(merkleDb, dataSource);
-        this.merkleDb = merkleDb;
-        this.txe = txe;
+    merkleDb;
+    txe;
+    constructor(merkleDb, dataSource, txe){
+        super(merkleDb, dataSource), this.merkleDb = merkleDb, this.txe = txe;
     }
     async storageRead(contract, slot) {
         const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
         const lowLeafResult = await this.merkleDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
         let value = Fr.ZERO;
         if (lowLeafResult && lowLeafResult.alreadyPresent) {
-            const preimage = (await this.merkleDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
+            const preimage = await this.merkleDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
             value = preimage.value;
         }
         return value;
     }
     async storageWrite(contract, slot, newValue) {
         await this.txe.addPublicDataWrites([
-            new PublicDataWrite(await computePublicDataTreeLeafSlot(contract, slot), newValue),
+            new PublicDataWrite(await computePublicDataTreeLeafSlot(contract, slot), newValue)
         ]);
         return newValue.toBigInt();
     }
@@ -37,4 +37,3 @@ export class TXEWorldStateDB extends WorldStateDB {
         throw new Error('Cannot rollback');
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3dvcmxkX3N0YXRlX2RiLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX3dvcmxkX3N0YXRlX2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWtDLE1BQU0sc0JBQXNCLENBQUM7QUFDcEYsT0FBTyxFQUdMLEVBQUUsRUFFRixlQUFlLEdBQ2hCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXZELE1BQU0sT0FBTyxlQUFnQixTQUFRLFlBQVk7SUFDL0MsWUFBb0IsUUFBbUMsRUFBRSxVQUE4QixFQUFVLEdBQVE7UUFDdkcsS0FBSyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztRQURWLGFBQVEsR0FBUixRQUFRLENBQTJCO1FBQTBDLFFBQUcsR0FBSCxHQUFHLENBQUs7SUFFekcsQ0FBQztJQUVRLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ3pELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVsRixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsWUFBWSxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRXpHLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7UUFDcEIsSUFBSSxhQUFhLElBQUksYUFBYSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ2xELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FDbkQsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFUSxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDeEUsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDO1lBQ2pDLElBQUksZUFBZSxDQUFDLE1BQU0sNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxFQUFFLFFBQVEsQ0FBQztTQUNuRixDQUFDLENBQUM7UUFFSCxPQUFPLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRVEsVUFBVTtRQUNqQixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ1Esb0JBQW9CO1FBQzNCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBQ1EsTUFBTTtRQUNiLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFDUSxnQkFBZ0I7UUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.74.0",
+  "version": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -17,7 +17,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}",
     "dev": "LOG_LEVEL=debug node ./dest/bin/index.js",
     "start": "node --no-warnings ./dest/bin/index.js"
   },
@@ -59,19 +59,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.74.0",
-    "@aztec/aztec.js": "0.74.0",
-    "@aztec/circuit-types": "0.74.0",
-    "@aztec/circuits.js": "0.74.0",
-    "@aztec/foundation": "0.74.0",
-    "@aztec/key-store": "0.74.0",
-    "@aztec/kv-store": "0.74.0",
-    "@aztec/protocol-contracts": "0.74.0",
-    "@aztec/pxe": "0.74.0",
-    "@aztec/simulator": "0.74.0",
-    "@aztec/telemetry-client": "0.74.0",
-    "@aztec/types": "0.74.0",
-    "@aztec/world-state": "0.74.0",
+    "@aztec/accounts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/aztec.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/circuit-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/circuits.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/foundation": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/key-store": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/kv-store": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/protocol-contracts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/pxe": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/simulator": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/world-state": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/index.ts

@@ -1,7 +1,17 @@
-import { loadContractArtifact } from '@aztec/aztec.js';
+import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
+import {
+  AztecAddress,
+  type ContractArtifact,
+  type ContractInstanceWithAddress,
+  Fr,
+  PublicKeys,
+  deriveKeys,
+  getContractInstanceFromDeployParams,
+  loadContractArtifact,
+} from '@aztec/aztec.js';
+import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import { type Logger } from '@aztec/foundation/log';
 import { type ApiSchemaFor, type ZodFor } from '@aztec/foundation/schemas';
-import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
 
 import { readFile, readdir } from 'fs/promises';
 import { join } from 'path';
@@ -14,12 +24,16 @@ import {
   type ForeignCallArray,
   type ForeignCallResult,
   ForeignCallResultSchema,
+  type ForeignCallSingle,
   fromArray,
+  fromSingle,
   toForeignCallResult,
 } from './util/encoding.js';
 
 const TXESessions = new Map<number, TXEService>();
 
+const TXEArtifactsCache = new Map<string, { artifact: ContractArtifact; instance: ContractInstanceWithAddress }>();
+
 type MethodNames<T> = {
   [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
 }[keyof T];
@@ -47,36 +61,94 @@ class TXEDispatcher {
   constructor(private logger: Logger) {}
 
   async #processDeployInputs({ inputs, root_path: rootPath, package_name: packageName }: TXEForeignCallInput) {
-    const pathStr = fromArray(inputs[0] as ForeignCallArray)
-      .map(char => String.fromCharCode(char.toNumber()))
-      .join('');
-    const contractName = fromArray(inputs[1] as ForeignCallArray)
-      .map(char => String.fromCharCode(char.toNumber()))
-      .join('');
-    let artifactPath = '';
-    // We're deploying the contract under test
-    // env.deploy_self("contractName")
-    if (!pathStr) {
-      artifactPath = join(rootPath, './target', `${packageName}-${contractName}.json`);
+    const [pathStr, contractName, initializer] = inputs.slice(0, 3).map(input =>
+      fromArray(input as ForeignCallArray)
+        .map(char => String.fromCharCode(char.toNumber()))
+        .join(''),
+    );
+
+    const decodedArgs = fromArray(inputs[4] as ForeignCallArray);
+    const publicKeysHashFr = fromSingle(inputs[5] as ForeignCallSingle);
+
+    const cacheKey = `${pathStr}-${contractName}-${initializer}-${decodedArgs
+      .map(arg => arg.toString())
+      .join('-')}-${publicKeysHashFr}`;
+
+    let artifact;
+    let instance;
+
+    if (TXEArtifactsCache.has(cacheKey)) {
+      this.logger.debug(`Using cached artifact for ${cacheKey}`);
+      ({ artifact, instance } = TXEArtifactsCache.get(cacheKey)!);
     } 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');
-        this.logger.debug(`Looking for compiled artifact in workspace ${targetPath}`);
-        artifactPath = join(targetPath, `${pkg}-${contractName}.json`);
+      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 standalone contract
-        // env.deploy("../path/to/contract/root", "contractName")
-        const targetPath = join(rootPath, pathStr, './target');
-        this.logger.debug(`Looking for compiled artifact in ${targetPath}`);
-        [artifactPath] = (await readdir(targetPath)).filter(file => file.endsWith(`-${contractName}.json`));
+        // 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');
+          this.logger.debug(`Looking for compiled artifact in workspace ${targetPath}`);
+          artifactPath = join(targetPath, `${pkg}-${contractName}.json`);
+        } else {
+          // We're deploying a standalone contract
+          // env.deploy("../path/to/contract/root", "contractName")
+          const targetPath = join(rootPath, pathStr, './target');
+          this.logger.debug(`Looking for compiled artifact in ${targetPath}`);
+          [artifactPath] = (await readdir(targetPath)).filter(file => file.endsWith(`-${contractName}.json`));
+        }
       }
+      this.logger.debug(`Loading compiled artifact ${artifactPath}`);
+      artifact = loadContractArtifact(JSON.parse(await readFile(artifactPath, 'utf-8')));
+      this.logger.debug(
+        `Deploy ${artifact.name} with initializer ${initializer}(${decodedArgs}) and public keys hash ${publicKeysHashFr}`,
+      );
+      instance = await getContractInstanceFromDeployParams(artifact, {
+        constructorArgs: decodedArgs,
+        skipArgsDecoding: true,
+        salt: Fr.ONE,
+        // TODO: Modify this to allow for passing public keys.
+        publicKeys: PublicKeys.default(),
+        constructorArtifact: initializer ? initializer : undefined,
+        deployer: AztecAddress.ZERO,
+      });
+      TXEArtifactsCache.set(cacheKey, { artifact, instance });
+    }
+
+    inputs.splice(0, 2, artifact, instance);
+  }
+
+  async #processAddAccountInputs({ inputs }: TXEForeignCallInput) {
+    const secret = fromSingle(inputs[0] as ForeignCallSingle);
+
+    const cacheKey = `SchnorrAccountContract-${secret}`;
+
+    let artifact;
+    let instance;
+
+    if (TXEArtifactsCache.has(cacheKey)) {
+      this.logger.debug(`Using cached artifact for ${cacheKey}`);
+      ({ artifact, instance } = TXEArtifactsCache.get(cacheKey)!);
+    } else {
+      const keys = await deriveKeys(secret);
+      const args = [keys.publicKeys.masterIncomingViewingPublicKey.x, keys.publicKeys.masterIncomingViewingPublicKey.y];
+      artifact = SchnorrAccountContractArtifact;
+      instance = await getContractInstanceFromDeployParams(artifact, {
+        constructorArgs: args,
+        skipArgsDecoding: true,
+        salt: Fr.ONE,
+        publicKeys: keys.publicKeys,
+        constructorArtifact: 'constructor',
+        deployer: AztecAddress.ZERO,
+      });
+      TXEArtifactsCache.set(cacheKey, { artifact, instance });
     }
-    this.logger.debug(`Loading compiled artifact ${artifactPath}`);
-    const artifact = loadContractArtifact(JSON.parse(await readFile(artifactPath, 'utf-8')));
-    inputs.splice(0, 2, artifact);
+
+    inputs.splice(0, 0, artifact, instance);
   }
 
   // eslint-disable-next-line camelcase
@@ -96,16 +168,18 @@ class TXEDispatcher {
         return toForeignCallResult([]);
       }
       case 'deploy': {
-        // Modify inputs and fall through
         await this.#processDeployInputs(callData);
+        break;
       }
-      // eslint-disable-next-line no-fallthrough
-      default: {
-        const txeService = TXESessions.get(sessionId);
-        const response = await (txeService as any)[functionName](...inputs);
-        return response;
+      case 'addAccount': {
+        await this.#processAddAccountInputs(callData);
+        break;
       }
     }
+
+    const txeService = TXESessions.get(sessionId);
+    const response = await (txeService as any)[functionName](...inputs);
+    return response;
   }
 }
 
@@ -120,7 +194,7 @@ const TXEDispatcherApiSchema: ApiSchemaFor<TXEDispatcher> = {
  * @returns A TXE RPC server.
  */
 export function createTXERpcServer(logger: Logger) {
-  return createTracedJsonRpcServer(new TXEDispatcher(logger), TXEDispatcherApiSchema, {
+  return createSafeJsonRpcServer(new TXEDispatcher(logger), TXEDispatcherApiSchema, {
     http200OnError: true,
   });
 }

package/src/node/txe_node.ts

@@ -568,6 +568,10 @@ export class TXENode implements AztecNode {
     throw new Error('TXE Node method getTxByHash not implemented');
   }
 
+  getTxsByHash(_txHashes: TxHash[]): Promise<Tx[]> {
+    throw new Error('TXE Node method getTxByHash not implemented');
+  }
+
   /**
    * Gets the storage value at the given contract storage slot.
    *

package/src/oracle/txe_oracle.ts

@@ -22,7 +22,6 @@ import {
   CallContext,
   type ContractInstance,
   type ContractInstanceWithAddress,
-  DEPLOYER_CONTRACT_ADDRESS,
   Gas,
   GasFees,
   GlobalVariables,
@@ -44,10 +43,8 @@ import {
   type PublicDataTreeLeafPreimage,
   PublicDataWrite,
   type PublicLog,
-  computeContractClassId,
   computeTaggingSecretPoint,
   deriveKeys,
-  getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import {
@@ -251,9 +248,8 @@ export class TXE implements TypedOracle {
     await this.txeDatabase.addContractInstance(contractInstance);
   }
 
-  async addContractArtifact(artifact: ContractArtifact) {
-    const contractClass = await getContractClassFromArtifact(artifact);
-    await this.txeDatabase.addContractArtifact(await computeContractClassId(contractClass), artifact);
+  async addContractArtifact(contractClassId: Fr, artifact: ContractArtifact) {
+    await this.txeDatabase.addContractArtifact(contractClassId, artifact);
   }
 
   async getPrivateContextInputs(
@@ -502,6 +498,8 @@ export class TXE implements TypedOracle {
       Fr.ZERO,
     );
 
+    header.globalVariables.blockNumber = new Fr(blockNumber);
+
     return header;
   }
 
@@ -741,6 +739,8 @@ export class TXE implements TypedOracle {
       Fr.ZERO,
     );
 
+    header.globalVariables.blockNumber = new Fr(blockNumber);
+
     l2Block.header = header;
 
     await fork.updateArchive(l2Block.header);
@@ -888,7 +888,6 @@ export class TXE implements TypedOracle {
     const executionRequest = new PublicExecutionRequest(callContext, args);
 
     const db = this.baseFork;
-    const worldStateDb = new TXEWorldStateDB(db, new TXEPublicContractDataSource(this), this);
 
     const globalVariables = GlobalVariables.empty();
     globalVariables.chainId = new Fr(await this.node.getChainId());
@@ -896,28 +895,9 @@ export class TXE implements TypedOracle {
     globalVariables.blockNumber = new Fr(this.blockNumber);
     globalVariables.gasFees = new GasFees(1, 1);
 
-    const tempFork = await this.nativeWorldStateService.fork();
-    // Apply current public data writes
-    await tempFork.sequentialInsert(
-      MerkleTreeId.PUBLIC_DATA_TREE,
-      this.publicDataWrites.map(p => p.toBuffer()),
-    );
-
-    // If the contract instance exists in the TXE's world state, make sure its nullifier is present in the tree
-    // so its nullifier check passes.
-    if ((await worldStateDb.getContractInstance(callContext.contractAddress)) !== undefined) {
-      const contractAddressNullifier = await siloNullifier(
-        AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS),
-        callContext.contractAddress.toField(),
-      );
-      if ((await worldStateDb.getNullifierIndex(contractAddressNullifier)) === undefined) {
-        await tempFork.batchInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()], 0);
-      }
-    }
-
     const simulator = new PublicTxSimulator(
-      tempFork,
-      new TXEWorldStateDB(tempFork, new TXEPublicContractDataSource(this), this),
+      db,
+      new TXEWorldStateDB(db, new TXEPublicContractDataSource(this), this),
       globalVariables,
     );
 
@@ -954,7 +934,6 @@ export class TXE implements TypedOracle {
       ),
     );
 
-    await tempFork.close();
     return Promise.resolve(result);
   }
 

package/src/txe_service/txe_service.ts

@@ -1,14 +1,13 @@
-import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { MerkleTreeId, SimulationError } from '@aztec/circuit-types';
 import {
+  type ContractInstanceWithAddress,
+  DEPLOYER_CONTRACT_ADDRESS,
   Fr,
   FunctionSelector,
   PublicDataWrite,
-  PublicKeys,
   computePartialAddress,
-  getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
 import { type ContractArtifact, NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Logger } from '@aztec/foundation/log';
@@ -89,35 +88,15 @@ export class TXEService {
     return toForeignCallResult(keys.publicKeys.toFields().map(toSingle));
   }
 
-  async deploy(
-    artifact: ContractArtifact,
-    initializer: ForeignCallArray,
-    _length: ForeignCallSingle,
-    args: ForeignCallArray,
-    publicKeysHash: ForeignCallSingle,
-  ) {
-    const initializerStr = fromArray(initializer)
-      .map(char => String.fromCharCode(char.toNumber()))
-      .join('');
-    const decodedArgs = fromArray(args);
-    const publicKeysHashFr = fromSingle(publicKeysHash);
-    this.logger.debug(
-      `Deploy ${artifact.name} with initializer ${initializerStr}(${decodedArgs}) and public keys hash ${publicKeysHashFr}`,
-    );
-
-    const instance = await getContractInstanceFromDeployParams(artifact, {
-      constructorArgs: decodedArgs,
-      skipArgsDecoding: true,
-      salt: Fr.ONE,
-      // TODO: Modify this to allow for passing public keys.
-      publicKeys: PublicKeys.default(),
-      constructorArtifact: initializerStr ? initializerStr : undefined,
-      deployer: AztecAddress.ZERO,
-    });
+  async deploy(artifact: ContractArtifact, instance: ContractInstanceWithAddress) {
+    // Emit deployment nullifier
+    (this.typedOracle as TXE).addSiloedNullifiersFromPublic([
+      await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), instance.address.toField()),
+    ]);
 
     this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
     await (this.typedOracle as TXE).addContractInstance(instance);
-    await (this.typedOracle as TXE).addContractArtifact(artifact);
+    await (this.typedOracle as TXE).addContractArtifact(instance.contractClassId, artifact);
     return toForeignCallResult([
       toArray([
         instance.salt,
@@ -151,9 +130,10 @@ export class TXEService {
     return toForeignCallResult([toArray(publicDataWrites.map(write => write.value))]);
   }
 
-  async createAccount() {
+  async createAccount(secret: ForeignCallSingle) {
     const keyStore = (this.typedOracle as TXE).getKeyStore();
-    const completeAddress = await keyStore.createAccount();
+    const secretFr = fromSingle(secret);
+    const completeAddress = await keyStore.addAccount(secretFr, secretFr);
     const accountStore = (this.typedOracle as TXE).getTXEDatabase();
     await accountStore.setAccount(completeAddress.address, completeAddress);
     this.logger.debug(`Created account ${completeAddress.address}`);
@@ -163,22 +143,10 @@ export class TXEService {
     ]);
   }
 
-  async addAccount(secret: ForeignCallSingle) {
-    const keys = await (this.typedOracle as TXE).deriveKeys(fromSingle(secret));
-    const args = [keys.publicKeys.masterIncomingViewingPublicKey.x, keys.publicKeys.masterIncomingViewingPublicKey.y];
-    const artifact = SchnorrAccountContractArtifact;
-    const instance = await getContractInstanceFromDeployParams(artifact, {
-      constructorArgs: args,
-      skipArgsDecoding: true,
-      salt: Fr.ONE,
-      publicKeys: keys.publicKeys,
-      constructorArtifact: 'constructor',
-      deployer: AztecAddress.ZERO,
-    });
-
+  async addAccount(artifact: ContractArtifact, instance: ContractInstanceWithAddress, secret: ForeignCallSingle) {
     this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
     await (this.typedOracle as TXE).addContractInstance(instance);
-    await (this.typedOracle as TXE).addContractArtifact(artifact);
+    await (this.typedOracle as TXE).addContractArtifact(instance.contractClassId, artifact);
 
     const keyStore = (this.typedOracle as TXE).getKeyStore();
     const completeAddress = await keyStore.addAccount(fromSingle(secret), await computePartialAddress(instance));