@aztec/txe 0.77.1 → 0.78.1

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAsLpD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,iEAIhD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AA+LpD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,iEAIhD"}

package/dest/index.js

@@ -1,6 +1,8 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { AztecAddress, Fr, PublicKeys, deriveKeys, getContractInstanceFromDeployParams, loadContractArtifact } from '@aztec/aztec.js';
 import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { protocolContractNames } from '@aztec/protocol-contracts';
+import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import { readFile, readdir } from 'fs/promises';
 import { join } from 'path';
 import { z } from 'zod';
@@ -20,6 +22,7 @@ const TXEForeignCallInputSchema = z.object({
 });
 class TXEDispatcher {
     logger;
+    protocolContracts;
     constructor(logger){
         this.logger = logger;
     }
@@ -111,7 +114,10 @@ class TXEDispatcher {
         this.logger.debug(`Calling ${functionName} on session ${sessionId}`);
         if (!TXESessions.has(sessionId) && functionName != 'reset') {
             this.logger.debug(`Creating new session ${sessionId}`);
-            TXESessions.set(sessionId, await TXEService.init(this.logger));
+            if (!this.protocolContracts) {
+                this.protocolContracts = await Promise.all(protocolContractNames.map((name)=>new BundledProtocolContractsProvider().getProtocolContractArtifact(name)));
+            }
+            TXESessions.set(sessionId, await TXEService.init(this.logger, this.protocolContracts));
         }
         switch(functionName){
             case 'reset':

package/dest/oracle/txe_oracle.d.ts

@@ -2,10 +2,12 @@
 /// <reference types="node" resolution-mode="require"/>
 import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
-import type { KeyStore } from '@aztec/key-store';
-import { ContractDataProvider } from '@aztec/pxe';
-import { type HashedValuesCache, type MessageLoadOracleInputs, type NoteData, type TypedOracle } from '@aztec/simulator/client';
+import { type Logger } from '@aztec/foundation/log';
+import { KeyStore } from '@aztec/key-store';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { ProtocolContract } from '@aztec/protocol-contracts';
+import { AddressDataProvider, ContractDataProvider } from '@aztec/pxe/server';
+import { type MessageLoadOracleInputs, type NoteData, type TypedOracle } from '@aztec/simulator/client';
 import { type PublicTxResult } from '@aztec/simulator/server';
 import { type ContractArtifact, type FunctionAbi, FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
@@ -18,14 +20,20 @@ import { IndexedTaggingSecret, type PrivateLog, type PublicLog } from '@aztec/st
 import type { NoteStatus } from '@aztec/stdlib/note';
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import { BlockHeader } from '@aztec/stdlib/tx';
-import { type NativeWorldStateService } from '@aztec/world-state/native';
-import type { TXEDatabase } from '../util/txe_database.js';
+import { NativeWorldStateService } from '@aztec/world-state/native';
+import { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
 export declare class TXE implements TypedOracle {
-    #private;
     private logger;
-    private executionCache;
     private keyStore;
-    private txeDatabase;
+    private contractDataProvider;
+    private noteDataProvider;
+    private capsuleDataProvider;
+    private syncDataProvider;
+    private taggingDataProvider;
+    private addressDataProvider;
+    private authWitnessDataProvider;
+    private accountDataProvider;
+    private executionCache;
     private contractAddress;
     private nativeWorldStateService;
     private baseFork;
@@ -36,9 +44,7 @@ export declare class TXE implements TypedOracle {
     private isStaticCall;
     private nestedCallReturndata;
     private nestedCallSuccess;
-    private contractDataProvider;
-    private pxeDataProvider;
-    private viewDataOracle;
+    private pxeOracleInterface;
     private publicDataWrites;
     private uniqueNoteHashesFromPublic;
     private siloedNullifiersFromPublic;
@@ -50,9 +56,8 @@ export declare class TXE implements TypedOracle {
     private node;
     private simulationProvider;
     private noteCache;
-    debug: LogFn;
     private constructor();
-    static create(logger: Logger, executionCache: HashedValuesCache, keyStore: KeyStore, txeDatabase: TXEDatabase, nativeWorldStateService: NativeWorldStateService, baseFork: MerkleTreeWriteOperations): Promise<TXE>;
+    static create(logger: Logger, store: AztecAsyncKVStore, protocolContracts: ProtocolContract[]): Promise<TXE>;
     getNativeWorldStateService(): NativeWorldStateService;
     getBaseFork(): MerkleTreeWriteOperations;
     getChainId(): Promise<Fr>;
@@ -66,8 +71,9 @@ export declare class TXE implements TypedOracle {
     setContractAddress(contractAddress: AztecAddress): void;
     setBlockNumber(blockNumber: number): void;
     getContractDataProvider(): ContractDataProvider;
-    getTXEDatabase(): TXEDatabase;
     getKeyStore(): KeyStore;
+    getAccountDataProvider(): TXEAccountDataProvider;
+    getAddressDataProvider(): AddressDataProvider;
     addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void>;
     addContractArtifact(contractClassId: Fr, artifact: ContractArtifact): Promise<void>;
     getPrivateContextInputs(blockNumber: number, sideEffectsCounter?: number, isStaticCall?: boolean): Promise<PrivateContextInputs>;

package/dest/oracle/txe_oracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txe_oracle.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"txe_oracle.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle.ts"],"names":[],"mappings":"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"}

package/dest/oracle/txe_oracle.js

@@ -1,12 +1,13 @@
 import { Body, L2Block, Note } from '@aztec/aztec.js';
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PRIVATE_CONTEXT_INPUTS_LENGTH, PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
+import { Aes128, Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { applyStringFormatting, createDebugOnlyLogger } from '@aztec/foundation/log';
+import { applyStringFormatting } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ContractDataProvider, PXEDataProvider, enrichPublicSimulationError } from '@aztec/pxe';
-import { ExecutionNoteCache, Oracle, UnconstrainedExecutionOracle, WASMSimulator, extractCallStack, extractPrivateCircuitPublicInputs, pickNotes, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
+import { KeyStore } from '@aztec/key-store';
+import { AddressDataProvider, AuthWitnessDataProvider, CapsuleDataProvider, ContractDataProvider, NoteDataProvider, PXEOracleInterface, SyncDataProvider, TaggingDataProvider, enrichPublicSimulationError } from '@aztec/pxe/server';
+import { ExecutionNoteCache, HashedValuesCache, Oracle, WASMSimulator, extractCallStack, extractPrivateCircuitPublicInputs, pickNotes, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
 import { createTxForPublicCalls } from '@aztec/simulator/public/fixtures';
 import { ExecutionError, PublicTxSimulator, createSimulationError, resolveAssertionMessageFromError } from '@aztec/simulator/server';
 import { FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
@@ -17,20 +18,27 @@ import { SimulationError } from '@aztec/stdlib/errors';
 import { Gas, GasFees } from '@aztec/stdlib/gas';
 import { computeNoteHashNonce, computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
-import { computeTaggingSecretPoint, deriveKeys } from '@aztec/stdlib/keys';
-import { IndexedTaggingSecret } from '@aztec/stdlib/logs';
+import { deriveKeys } from '@aztec/stdlib/keys';
 import { makeAppendOnlyTreeSnapshot, makeContentCommitment, makeGlobalVariables, makeHeader } from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot, MerkleTreeId, NullifierMembershipWitness, PublicDataTreeLeaf, PublicDataWitness } from '@aztec/stdlib/trees';
 import { BlockHeader, CallContext, GlobalVariables, PublicExecutionRequest, TxEffect, TxHash } from '@aztec/stdlib/tx';
-import { ForkCheckpoint } from '@aztec/world-state/native';
+import { ForkCheckpoint, NativeWorldStateService } from '@aztec/world-state/native';
 import { TXENode } from '../node/txe_node.js';
+import { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
 import { TXEWorldStateDB } from '../util/txe_world_state_db.js';
 export class TXE {
     logger;
-    executionCache;
     keyStore;
-    txeDatabase;
+    contractDataProvider;
+    noteDataProvider;
+    capsuleDataProvider;
+    syncDataProvider;
+    taggingDataProvider;
+    addressDataProvider;
+    authWitnessDataProvider;
+    accountDataProvider;
+    executionCache;
     contractAddress;
     nativeWorldStateService;
     baseFork;
@@ -42,9 +50,7 @@ export class TXE {
     // Return/revert data of the latest nested call.
     nestedCallReturndata;
     nestedCallSuccess;
-    contractDataProvider;
-    pxeDataProvider;
-    viewDataOracle;
+    pxeOracleInterface;
     publicDataWrites;
     uniqueNoteHashesFromPublic;
     siloedNullifiersFromPublic;
@@ -56,12 +62,18 @@ export class TXE {
     node;
     simulationProvider;
     noteCache;
-    debug;
-    constructor(logger, executionCache, keyStore, txeDatabase, contractAddress, nativeWorldStateService, baseFork){
+    constructor(logger, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, accountDataProvider, executionCache, contractAddress, nativeWorldStateService, baseFork){
         this.logger = logger;
-        this.executionCache = executionCache;
         this.keyStore = keyStore;
-        this.txeDatabase = txeDatabase;
+        this.contractDataProvider = contractDataProvider;
+        this.noteDataProvider = noteDataProvider;
+        this.capsuleDataProvider = capsuleDataProvider;
+        this.syncDataProvider = syncDataProvider;
+        this.taggingDataProvider = taggingDataProvider;
+        this.addressDataProvider = addressDataProvider;
+        this.authWitnessDataProvider = authWitnessDataProvider;
+        this.accountDataProvider = accountDataProvider;
+        this.executionCache = executionCache;
         this.contractAddress = contractAddress;
         this.nativeWorldStateService = nativeWorldStateService;
         this.baseFork = baseFork;
@@ -81,16 +93,30 @@ export class TXE {
         this.CHAIN_ID = 1;
         this.simulationProvider = new WASMSimulator();
         this.noteCache = new ExecutionNoteCache(this.getTxRequestHash());
-        this.contractDataProvider = new ContractDataProvider(txeDatabase);
         this.node = new TXENode(this.blockNumber, this.VERSION, this.CHAIN_ID, nativeWorldStateService, baseFork);
         // Default msg_sender (for entrypoints) is now Fr.max_value rather than 0 addr (see #7190 & #7404)
         this.msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE);
-        this.pxeDataProvider = new PXEDataProvider(txeDatabase, keyStore, this.node, this.simulationProvider, this.contractDataProvider);
-        this.viewDataOracle = new UnconstrainedExecutionOracle(this.contractAddress, [], [], this.pxeDataProvider);
-        this.debug = createDebugOnlyLogger('aztec:kv-pxe-database');
-    }
-    static async create(logger, executionCache, keyStore, txeDatabase, nativeWorldStateService, baseFork) {
-        return new TXE(logger, executionCache, keyStore, txeDatabase, await AztecAddress.random(), nativeWorldStateService, baseFork);
+        this.pxeOracleInterface = new PXEOracleInterface(this.node, this.keyStore, this.simulationProvider, this.contractDataProvider, this.noteDataProvider, this.capsuleDataProvider, this.syncDataProvider, this.taggingDataProvider, this.addressDataProvider, this.authWitnessDataProvider, this.logger);
+    }
+    static async create(logger, store, protocolContracts) {
+        const executionCache = new HashedValuesCache();
+        const nativeWorldStateService = await NativeWorldStateService.tmp();
+        const baseFork = await nativeWorldStateService.fork();
+        const addressDataProvider = new AddressDataProvider(store);
+        const authWitnessDataProvider = new AuthWitnessDataProvider(store);
+        const contractDataProvider = new ContractDataProvider(store);
+        const noteDataProvider = await NoteDataProvider.create(store);
+        const syncDataProvider = new SyncDataProvider(store);
+        const taggingDataProvider = new TaggingDataProvider(store);
+        const capsuleDataProvider = new CapsuleDataProvider(store);
+        const keyStore = new KeyStore(store);
+        const accountDataProvider = new TXEAccountDataProvider(store);
+        // Register protocol contracts.
+        for (const { contractClass, instance, artifact } of protocolContracts){
+            await contractDataProvider.addContractArtifact(contractClass.id, artifact);
+            await contractDataProvider.addContractInstance(instance);
+        }
+        return new TXE(logger, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, accountDataProvider, executionCache, await AztecAddress.random(), nativeWorldStateService, baseFork);
     }
     // Utils
     getNativeWorldStateService() {
@@ -133,17 +159,20 @@ export class TXE {
     getContractDataProvider() {
         return this.contractDataProvider;
     }
-    getTXEDatabase() {
-        return this.txeDatabase;
-    }
     getKeyStore() {
         return this.keyStore;
     }
+    getAccountDataProvider() {
+        return this.accountDataProvider;
+    }
+    getAddressDataProvider() {
+        return this.addressDataProvider;
+    }
     async addContractInstance(contractInstance) {
-        await this.txeDatabase.addContractInstance(contractInstance);
+        await this.contractDataProvider.addContractInstance(contractInstance);
     }
     async addContractArtifact(contractClassId, artifact) {
-        await this.txeDatabase.addContractArtifact(contractClassId, artifact);
+        await this.contractDataProvider.addContractArtifact(contractClassId, artifact);
     }
     async getPrivateContextInputs(blockNumber, sideEffectsCounter = this.sideEffectCounter, isStaticCall = false) {
         if (blockNumber > this.blockNumber) {
@@ -169,14 +198,14 @@ export class TXE {
         return deriveKeys(secret);
     }
     async addAuthWitness(address, messageHash) {
-        const account = await this.txeDatabase.getAccount(address);
+        const account = await this.accountDataProvider.getAccount(address);
         const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
         const schnorr = new Schnorr();
         const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
         const authWitness = new AuthWitness(messageHash, [
             ...signature.toBuffer()
         ]);
-        return this.txeDatabase.addAuthWitness(authWitness.requestHash, authWitness.witness);
+        return this.authWitnessDataProvider.addAuthWitness(authWitness.requestHash, authWitness.witness);
     }
     async addPublicDataWrites(writes) {
         this.publicDataWrites.push(...writes);
@@ -326,16 +355,16 @@ export class TXE {
         return header;
     }
     getCompleteAddress(account) {
-        return Promise.resolve(this.txeDatabase.getAccount(account));
+        return Promise.resolve(this.accountDataProvider.getAccount(account));
     }
     getAuthWitness(messageHash) {
-        return this.txeDatabase.getAuthWitness(messageHash);
+        return this.pxeOracleInterface.getAuthWitness(messageHash);
     }
     async getNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
         // Nullified pending notes are already removed from the list.
         const pendingNotes = this.noteCache.getNotes(this.contractAddress, storageSlot);
         const pendingNullifiers = this.noteCache.getNullifiers(this.contractAddress);
-        const dbNotes = await this.pxeDataProvider.getNotes(this.contractAddress, storageSlot, status);
+        const dbNotes = await this.pxeOracleInterface.getNotes(this.contractAddress, storageSlot, status);
         const dbNotesFiltered = dbNotes.filter((n)=>!pendingNullifiers.has(n.siloedNullifier.value));
         const notes = pickNotes([
             ...dbNotesFiltered,
@@ -649,7 +678,7 @@ export class TXE {
         // Poor man's revert handling
         if (!executionResult.revertCode.isOK()) {
             if (executionResult.revertReason && executionResult.revertReason instanceof SimulationError) {
-                await enrichPublicSimulationError(executionResult.revertReason, this.contractDataProvider, this.txeDatabase, this.logger);
+                await enrichPublicSimulationError(executionResult.revertReason, this.contractDataProvider, this.logger);
                 throw new Error(executionResult.revertReason.message);
             } else {
                 throw new Error(`Enqueued public function call reverted: ${executionResult.revertReason}`);
@@ -681,46 +710,24 @@ export class TXE {
         });
     }
     async incrementAppTaggingSecretIndexAsSender(sender, recipient) {
-        const appSecret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
-        const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
-            appSecret
-        ]);
-        await this.txeDatabase.setTaggingSecretsIndexesAsSender([
-            new IndexedTaggingSecret(appSecret, index + 1)
-        ]);
+        await this.pxeOracleInterface.incrementAppTaggingSecretIndexAsSender(this.contractAddress, sender, recipient);
     }
     async getIndexedTaggingSecretAsSender(sender, recipient) {
-        const secret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
-        const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
-            secret
-        ]);
-        return new IndexedTaggingSecret(secret, index);
-    }
-    async #calculateAppTaggingSecret(contractAddress, sender, recipient) {
-        const senderCompleteAddress = await this.getCompleteAddress(sender);
-        const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
-        const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
-        // Silo the secret to the app so it can't be used to track other app's notes
-        const appSecret = poseidon2Hash([
-            secretPoint.x,
-            secretPoint.y,
-            contractAddress
-        ]);
-        return appSecret;
+        return await this.pxeOracleInterface.getIndexedTaggingSecretAsSender(this.contractAddress, sender, recipient);
     }
     async syncNotes() {
-        const taggedLogsByRecipient = await this.pxeDataProvider.syncTaggedLogs(this.contractAddress, await this.getBlockNumber(), undefined);
+        const taggedLogsByRecipient = await this.pxeOracleInterface.syncTaggedLogs(this.contractAddress, await this.getBlockNumber(), undefined);
         for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()){
-            await this.pxeDataProvider.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
+            await this.pxeOracleInterface.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
         }
-        await this.pxeDataProvider.removeNullifiedNotes(this.contractAddress);
+        await this.pxeOracleInterface.removeNullifiedNotes(this.contractAddress);
         return Promise.resolve();
     }
     deliverNote(_contractAddress, _storageSlot, _nonce, _content, _noteHash, _nullifier, _txHash, _recipient) {
         throw new Error('deliverNote');
     }
     async getLogByTag(tag) {
-        return await this.pxeDataProvider.getLogByTag(tag);
+        return await this.pxeOracleInterface.getLogByTag(tag);
     }
     // AVM oracles
     async avmOpcodeCall(targetContractAddress, args, isStaticCall) {
@@ -796,30 +803,31 @@ export class TXE {
             // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
             throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
         }
-        return this.txeDatabase.storeCapsule(this.contractAddress, slot, capsule);
+        return this.pxeOracleInterface.storeCapsule(this.contractAddress, slot, capsule);
     }
     loadCapsule(contractAddress, slot) {
         if (!contractAddress.equals(this.contractAddress)) {
             // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
             throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
         }
-        return this.txeDatabase.loadCapsule(this.contractAddress, slot);
+        return this.pxeOracleInterface.loadCapsule(this.contractAddress, slot);
     }
     deleteCapsule(contractAddress, slot) {
         if (!contractAddress.equals(this.contractAddress)) {
             // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
             throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
         }
-        return this.txeDatabase.deleteCapsule(this.contractAddress, slot);
+        return this.pxeOracleInterface.deleteCapsule(this.contractAddress, slot);
     }
     copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
         if (!contractAddress.equals(this.contractAddress)) {
             // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
             throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
         }
-        return this.txeDatabase.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries);
+        return this.pxeOracleInterface.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries);
     }
     aes128Decrypt(ciphertext, iv, symKey) {
-        return this.viewDataOracle.aes128Decrypt(ciphertext, iv, symKey);
+        const aes128 = new Aes128();
+        return aes128.decryptBufferCBC(ciphertext, iv, symKey);
     }
 }

package/dest/txe_service/txe_service.d.ts

@@ -1,13 +1,14 @@
 import { type ContractInstanceWithAddress } from '@aztec/aztec.js';
 import type { Logger } from '@aztec/foundation/log';
-import { type TypedOracle } from '@aztec/simulator/client';
+import type { ProtocolContract } from '@aztec/protocol-contracts';
+import type { TypedOracle } from '@aztec/simulator/client';
 import { type ContractArtifact } from '@aztec/stdlib/abi';
 import { type ForeignCallArray, type ForeignCallSingle } from '../util/encoding.js';
 export declare class TXEService {
     private logger;
     private typedOracle;
     constructor(logger: Logger, typedOracle: TypedOracle);
-    static init(logger: Logger): Promise<TXEService>;
+    static init(logger: Logger, protocolContracts: ProtocolContract[]): Promise<TXEService>;
     getPrivateContextInputs(blockNumber: ForeignCallSingle): Promise<{
         values: (string | ForeignCallArray)[];
     }>;

package/dest/txe_service/txe_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txe_service.d.ts","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,2BAA2B,EAAM,MAAM,iBAAiB,CAAC;AAEvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAMpD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,KAAK,gBAAgB,EAAkC,MAAM,mBAAmB,CAAC;AAU1F,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAUvB,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,UAAU;IACT,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,WAAW;gBAAnC,MAAM,EAAE,MAAM,EAAU,WAAW,EAAE,WAAW;WAEvD,IAAI,CAAC,MAAM,EAAE,MAAM;IAwB1B,uBAAuB,CAAC,WAAW,EAAE,iBAAiB;;;IAKtD,eAAe,CAAC,MAAM,EAAE,iBAAiB;;;IAY/C,kBAAkB,CAAC,OAAO,EAAE,iBAAiB;;;IAMvC,UAAU,CAAC,MAAM,EAAE,iBAAiB;;;IAKpC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,iBAAiB;;;IAyBnG,kBAAkB,CACtB,eAAe,EAAE,iBAAiB,EAClC,gBAAgB,EAAE,iBAAiB,EACnC,MAAM,EAAE,gBAAgB;;;IAmBpB,aAAa,CAAC,MAAM,EAAE,iBAAiB;;;IAcvC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,iBAAiB;;;IAgB7G,qBAAqB;;;IAKf,cAAc,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,iBAAiB;;;IAKzE,qBAAqB,CACzB,OAAO,EAAE,iBAAiB,EAC1B,gBAAgB,EAAE,iBAAiB,EACnC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,gBAAgB;;;IAalB,sBAAsB,CAC1B,qBAAqB,EAAE,iBAAiB,EACxC,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,iBAAiB,EAC3B,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,iBAAiB;;;IAqBjC,cAAc;;;IAIR,kBAAkB;;;IAKlB,cAAc;;;IAMd,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB;;;IAK1E,sBAAsB,CAAC,IAAI,EAAE,iBAAiB;;;IAMpD,QAAQ,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB;;;IASlF,WAAW,CACf,eAAe,EAAE,iBAAiB,EAClC,gBAAgB,EAAE,iBAAiB,EACnC,WAAW,EAAE,iBAAiB,EAC9B,gBAAgB,EAAE,iBAAiB;;;IAW/B,YAAY,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB;;;IAK1E,wBAAwB,CAAC,WAAW,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB;;;IAWpF,QAAQ,CACZ,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,gBAAgB,EACjC,eAAe,EAAE,gBAAgB,EACjC,eAAe,EAAE,gBAAgB,EACjC,YAAY,EAAE,gBAAgB,EAC9B,iBAAiB,EAAE,gBAAgB,EACnC,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,gBAAgB,EAC/B,SAAS,EAAE,gBAAgB,EAC3B,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,iBAAiB;;;IA8C/B,iBAAiB,CACf,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,iBAAiB;;;IAYtB,mBAAmB,CACvB,cAAc,EAAE,iBAAiB,EACjC,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,iBAAiB;;;IAUtB,sBAAsB,CAAC,cAAc,EAAE,iBAAiB;;;IAKxD,oBAAoB,CAAC,cAAc,EAAE,iBAAiB;;;IAKtD,mBAAmB,CAAC,OAAO,EAAE,iBAAiB;;;IAa9C,8BAA8B,CAAC,OAAO,EAAE,iBAAiB;;;IAMzD,uBAAuB,CAAC,OAAO,EAAE,iBAAiB;;;IAKlD,mBAAmB,CACvB,qBAAqB,EAAE,iBAAiB,EACxC,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,iBAAiB,EAC3B,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,iBAAiB;;;IAY3B,6BAA6B,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;;;IAS1F,cAAc,CAAC,WAAW,EAAE,iBAAiB;;;IAS7C,yBAAyB,CAC7B,qBAAqB,EAAE,iBAAiB,EACxC,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,iBAAiB,EAC3B,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,iBAAiB;;;IAYpB,6BAA6B,CACxC,qBAAqB,EAAE,iBAAiB,EACxC,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,iBAAiB,EAC3B,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,iBAAiB;;;IAY1B,uCAAuC,CAAC,8BAA8B,EAAE,iBAAiB;IAI1F,UAAU;;;IAIV,UAAU;;;IAIV,cAAc,CAAC,WAAW,EAAE,iBAAiB;;;IAQ7C,oBAAoB,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;;;IAa5G,gCAAgC,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;;;IAU7F,+BAA+B,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;;;IAQvF,SAAS;;;IAKT,YAAY,CAAC,eAAe,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,gBAAgB;;;IASnG,WAAW,CAAC,eAAe,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB;;;IAgBjG,aAAa,CAAC,eAAe,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB;;;IAKzE,WAAW,CACf,eAAe,EAAE,iBAAiB,EAClC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,iBAAiB;;;IAazB,aAAa,CAAC,UAAU,EAAE,gBAAgB,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB;;;IAYhG,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB;;;IAKhD,oBAAoB,CAAC,IAAI,EAAE,iBAAiB;;;IAK5C,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB;;;IAKvE,oCAAoC,CAAC,OAAO,EAAE,iBAAiB;;;IAS/D,mCAAmC,CAAC,OAAO,EAAE,iBAAiB;;;IAS9D,8CAA8C,CAAC,OAAO,EAAE,iBAAiB;;;IAS/E,eAAe;;;IAKT,sBAAsB,CAAC,SAAS,EAAE,iBAAiB;;;IAKnD,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB;;;IAKjD,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB;;;IAQ5F,gBAAgB;;;IAKhB,oBAAoB;;;IAK1B,qBAAqB;;;IAKf,gBAAgB;;;IAKhB,gBAAgB;;;IAKtB,uBAAuB;;;IAKvB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB;;;IAS1E,aAAa,CACjB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,gBAAgB;;;IA0BlB,mBAAmB,CACvB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,gBAAgB;;;IA0BxB,oBAAoB;;;CAIrB"}
+{"version":3,"file":"txe_service.d.ts","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"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"}

package/dest/txe_service/txe_service.js

@@ -1,11 +1,7 @@
 import { Fr } from '@aztec/aztec.js';
 import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants';
-import { KeyStore } from '@aztec/key-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
-import { protocolContractNames } from '@aztec/protocol-contracts';
-import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
-import { enrichPublicSimulationError } from '@aztec/pxe';
-import { HashedValuesCache } from '@aztec/simulator/client';
+import { enrichPublicSimulationError } from '@aztec/pxe/server';
 import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -13,11 +9,9 @@ import { computePartialAddress } from '@aztec/stdlib/contract';
 import { SimulationError } from '@aztec/stdlib/errors';
 import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { NativeWorldStateService } from '@aztec/world-state';
 import { TXE } from '../oracle/txe_oracle.js';
 import { addressFromSingle, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, toArray, toForeignCallResult, toSingle } from '../util/encoding.js';
 import { ExpectedFailureError } from '../util/expected_failure_error.js';
-import { TXEDatabase } from '../util/txe_database.js';
 export class TXEService {
     logger;
     typedOracle;
@@ -25,22 +19,10 @@ export class TXEService {
         this.logger = logger;
         this.typedOracle = typedOracle;
     }
-    static async init(logger) {
-        const store = await openTmpStore('test');
-        const executionCache = new HashedValuesCache();
-        const nativeWorldStateService = await NativeWorldStateService.tmp();
-        const baseFork = await nativeWorldStateService.fork();
-        const keyStore = new KeyStore(store);
-        const txeDatabase = new TXEDatabase(store);
-        // Register protocol contracts.
-        const provider = new BundledProtocolContractsProvider();
-        for (const name of protocolContractNames){
-            const { contractClass, instance, artifact } = await provider.getProtocolContractArtifact(name);
-            await txeDatabase.addContractArtifact(contractClass.id, artifact);
-            await txeDatabase.addContractInstance(instance);
-        }
+    static async init(logger, protocolContracts) {
         logger.debug(`TXE service initialized`);
-        const txe = await TXE.create(logger, executionCache, keyStore, txeDatabase, nativeWorldStateService, baseFork);
+        const store = await openTmpStore('test');
+        const txe = await TXE.create(logger, store, protocolContracts);
         const service = new TXEService(logger, txe);
         await service.advanceBlocksBy(toSingle(new Fr(1n)));
         return service;
@@ -110,8 +92,10 @@ export class TXEService {
         const secretFr = fromSingle(secret);
         // This is a footgun !
         const completeAddress = await keyStore.addAccount(secretFr, secretFr);
-        const accountStore = this.typedOracle.getTXEDatabase();
-        await accountStore.setAccount(completeAddress.address, completeAddress);
+        const accountDataProvider = this.typedOracle.getAccountDataProvider();
+        await accountDataProvider.setAccount(completeAddress.address, completeAddress);
+        const addressDataProvider = this.typedOracle.getAddressDataProvider();
+        await addressDataProvider.addCompleteAddress(completeAddress);
         this.logger.debug(`Created account ${completeAddress.address}`);
         return toForeignCallResult([
             toSingle(completeAddress.address),
@@ -124,8 +108,10 @@ export class TXEService {
         await this.typedOracle.addContractArtifact(instance.currentContractClassId, artifact);
         const keyStore = this.typedOracle.getKeyStore();
         const completeAddress = await keyStore.addAccount(fromSingle(secret), await computePartialAddress(instance));
-        const accountStore = this.typedOracle.getTXEDatabase();
-        await accountStore.setAccount(completeAddress.address, completeAddress);
+        const accountDataProvider = this.typedOracle.getAccountDataProvider();
+        await accountDataProvider.setAccount(completeAddress.address, completeAddress);
+        const addressDataProvider = this.typedOracle.getAddressDataProvider();
+        await addressDataProvider.addCompleteAddress(completeAddress);
         this.logger.debug(`Created account ${completeAddress.address}`);
         return toForeignCallResult([
             toSingle(completeAddress.address),
@@ -556,7 +542,7 @@ export class TXEService {
         // Poor man's revert handling
         if (!result.revertCode.isOK()) {
             if (result.revertReason && result.revertReason instanceof SimulationError) {
-                await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataProvider(), this.typedOracle.getTXEDatabase(), this.logger);
+                await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataProvider(), this.logger);
                 throw new Error(result.revertReason.message);
             } else {
                 throw new Error(`Public function call reverted: ${result.revertReason}`);
@@ -569,7 +555,7 @@ export class TXEService {
         // Poor man's revert handling
         if (!result.revertCode.isOK()) {
             if (result.revertReason && result.revertReason instanceof SimulationError) {
-                await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataProvider(), this.typedOracle.getTXEDatabase(), this.logger);
+                await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataProvider(), this.logger);
                 throw new Error(result.revertReason.message);
             } else {
                 throw new Error(`Public function call reverted: ${result.revertReason}`);

package/dest/util/{txe_database.d.ts → txe_account_data_provider.d.ts}

@@ -1,11 +1,10 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { KVPxeDatabase } from '@aztec/pxe';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
-export declare class TXEDatabase extends KVPxeDatabase {
+export declare class TXEAccountDataProvider {
     #private;
-    constructor(db: AztecAsyncKVStore);
+    constructor(store: AztecAsyncKVStore);
     getAccount(key: AztecAddress): Promise<CompleteAddress>;
     setAccount(key: AztecAddress, value: CompleteAddress): Promise<void>;
 }
-//# sourceMappingURL=txe_database.d.ts.map
+//# sourceMappingURL=txe_account_data_provider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"txe_account_data_provider.d.ts","sourceRoot":"","sources":["../../src/util/txe_account_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAsB;;gBAGrB,KAAK,EAAE,iBAAiB;IAI9B,UAAU,CAAC,GAAG,EAAE,YAAY;IAQ5B,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe;CAG3D"}

package/dest/util/{txe_database.js → txe_account_data_provider.js}

@@ -1,10 +1,8 @@
-import { KVPxeDatabase } from '@aztec/pxe';
 import { CompleteAddress } from '@aztec/stdlib/contract';
-export class TXEDatabase extends KVPxeDatabase {
+export class TXEAccountDataProvider {
     #accounts;
-    constructor(db){
-        super(db);
-        this.#accounts = db.openMap('accounts');
+    constructor(store){
+        this.#accounts = store.openMap('accounts');
     }
     async getAccount(key) {
         const completeAddress = await this.#accounts.getAsync(key.toString());
@@ -15,6 +13,5 @@ export class TXEDatabase extends KVPxeDatabase {
     }
     async setAccount(key, value) {
         await this.#accounts.set(key.toString(), value.toBuffer());
-        await this.addCompleteAddress(value);
     }
 }

package/dest/util/txe_public_contract_data_source.js

@@ -1,6 +1,6 @@
 import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { PrivateFunctionsTree } from '@aztec/pxe';
+import { PrivateFunctionsTree } from '@aztec/pxe/server';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 export class TXEPublicContractDataSource {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "0.77.1",
+  "version": "0.78.1",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -59,17 +59,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.77.1",
-    "@aztec/aztec.js": "0.77.1",
-    "@aztec/constants": "0.77.1",
-    "@aztec/foundation": "0.77.1",
-    "@aztec/key-store": "0.77.1",
-    "@aztec/kv-store": "0.77.1",
-    "@aztec/protocol-contracts": "0.77.1",
-    "@aztec/pxe": "0.77.1",
-    "@aztec/simulator": "0.77.1",
-    "@aztec/stdlib": "0.77.1",
-    "@aztec/world-state": "0.77.1",
+    "@aztec/accounts": "0.78.1",
+    "@aztec/aztec.js": "0.78.1",
+    "@aztec/constants": "0.78.1",
+    "@aztec/foundation": "0.78.1",
+    "@aztec/key-store": "0.78.1",
+    "@aztec/kv-store": "0.78.1",
+    "@aztec/protocol-contracts": "0.78.1",
+    "@aztec/pxe": "0.78.1",
+    "@aztec/simulator": "0.78.1",
+    "@aztec/stdlib": "0.78.1",
+    "@aztec/world-state": "0.78.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/index.ts

@@ -11,6 +11,8 @@ import {
 } from '@aztec/aztec.js';
 import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import type { Logger } from '@aztec/foundation/log';
+import { type ProtocolContract, protocolContractNames } from '@aztec/protocol-contracts';
+import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import type { ApiSchemaFor, ZodFor } from '@aztec/stdlib/schemas';
 
 import { readFile, readdir } from 'fs/promises';
@@ -59,6 +61,8 @@ const TXEForeignCallInputSchema = z.object({
 }) satisfies ZodFor<TXEForeignCallInput>;
 
 class TXEDispatcher {
+  private protocolContracts!: ProtocolContract[];
+
   constructor(private logger: Logger) {}
 
   async #processDeployInputs({ inputs, root_path: rootPath, package_name: packageName }: TXEForeignCallInput) {
@@ -162,7 +166,12 @@ class TXEDispatcher {
 
     if (!TXESessions.has(sessionId) && functionName != 'reset') {
       this.logger.debug(`Creating new session ${sessionId}`);
-      TXESessions.set(sessionId, await TXEService.init(this.logger));
+      if (!this.protocolContracts) {
+        this.protocolContracts = await Promise.all(
+          protocolContractNames.map(name => new BundledProtocolContractsProvider().getProtocolContractArtifact(name)),
+        );
+      }
+      TXESessions.set(sessionId, await TXEService.init(this.logger, this.protocolContracts));
     }
 
     switch (functionName) {

package/src/oracle/txe_oracle.ts

@@ -11,20 +11,31 @@ import {
   PUBLIC_DISPATCH_SELECTOR,
 } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
+import { Aes128, Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { type LogFn, type Logger, applyStringFormatting, createDebugOnlyLogger } from '@aztec/foundation/log';
+import { type Logger, applyStringFormatting } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import type { KeyStore } from '@aztec/key-store';
-import { ContractDataProvider, PXEDataProvider, enrichPublicSimulationError } from '@aztec/pxe';
+import { KeyStore } from '@aztec/key-store';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { ProtocolContract } from '@aztec/protocol-contracts';
+import {
+  AddressDataProvider,
+  AuthWitnessDataProvider,
+  CapsuleDataProvider,
+  ContractDataProvider,
+  NoteDataProvider,
+  PXEOracleInterface,
+  SyncDataProvider,
+  TaggingDataProvider,
+  enrichPublicSimulationError,
+} from '@aztec/pxe/server';
 import {
   ExecutionNoteCache,
-  type HashedValuesCache,
+  HashedValuesCache,
   type MessageLoadOracleInputs,
   type NoteData,
   Oracle,
   type TypedOracle,
-  UnconstrainedExecutionOracle,
   WASMSimulator,
   extractCallStack,
   extractPrivateCircuitPublicInputs,
@@ -62,7 +73,7 @@ import {
 } from '@aztec/stdlib/hash';
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { type KeyValidationRequest, PrivateContextInputs } from '@aztec/stdlib/kernel';
-import { computeTaggingSecretPoint, deriveKeys } from '@aztec/stdlib/keys';
+import { deriveKeys } from '@aztec/stdlib/keys';
 import { ContractClassLog, LogWithTxData } from '@aztec/stdlib/logs';
 import { IndexedTaggingSecret, type PrivateLog, type PublicLog } from '@aztec/stdlib/logs';
 import type { NoteStatus } from '@aztec/stdlib/note';
@@ -83,10 +94,10 @@ import {
   PublicDataWitness,
 } from '@aztec/stdlib/trees';
 import { BlockHeader, CallContext, GlobalVariables, PublicExecutionRequest, TxEffect, TxHash } from '@aztec/stdlib/tx';
-import { ForkCheckpoint, type NativeWorldStateService } from '@aztec/world-state/native';
+import { ForkCheckpoint, NativeWorldStateService } from '@aztec/world-state/native';
 
 import { TXENode } from '../node/txe_node.js';
-import type { TXEDatabase } from '../util/txe_database.js';
+import { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
 import { TXEWorldStateDB } from '../util/txe_world_state_db.js';
 
@@ -100,9 +111,7 @@ export class TXE implements TypedOracle {
   private nestedCallReturndata: Fr[] = [];
   private nestedCallSuccess: boolean = false;
 
-  private contractDataProvider: ContractDataProvider;
-  private pxeDataProvider: PXEDataProvider;
-  private viewDataOracle: UnconstrainedExecutionOracle;
+  private pxeOracleInterface: PXEOracleInterface;
 
   private publicDataWrites: PublicDataWrite[] = [];
   private uniqueNoteHashesFromPublic: Fr[] = [];
@@ -121,57 +130,77 @@ export class TXE implements TypedOracle {
 
   private noteCache: ExecutionNoteCache;
 
-  debug: LogFn;
-
   private constructor(
     private logger: Logger,
-    private executionCache: HashedValuesCache,
     private keyStore: KeyStore,
-    private txeDatabase: TXEDatabase,
+    private contractDataProvider: ContractDataProvider,
+    private noteDataProvider: NoteDataProvider,
+    private capsuleDataProvider: CapsuleDataProvider,
+    private syncDataProvider: SyncDataProvider,
+    private taggingDataProvider: TaggingDataProvider,
+    private addressDataProvider: AddressDataProvider,
+    private authWitnessDataProvider: AuthWitnessDataProvider,
+    private accountDataProvider: TXEAccountDataProvider,
+    private executionCache: HashedValuesCache,
     private contractAddress: AztecAddress,
     private nativeWorldStateService: NativeWorldStateService,
     private baseFork: MerkleTreeWriteOperations,
   ) {
     this.noteCache = new ExecutionNoteCache(this.getTxRequestHash());
-    this.contractDataProvider = new ContractDataProvider(txeDatabase);
 
     this.node = new TXENode(this.blockNumber, this.VERSION, this.CHAIN_ID, nativeWorldStateService, baseFork);
-
     // Default msg_sender (for entrypoints) is now Fr.max_value rather than 0 addr (see #7190 & #7404)
     this.msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE);
-    this.pxeDataProvider = new PXEDataProvider(
-      txeDatabase,
-      keyStore,
+
+    this.pxeOracleInterface = new PXEOracleInterface(
       this.node,
+      this.keyStore,
       this.simulationProvider,
       this.contractDataProvider,
+      this.noteDataProvider,
+      this.capsuleDataProvider,
+      this.syncDataProvider,
+      this.taggingDataProvider,
+      this.addressDataProvider,
+      this.authWitnessDataProvider,
+      this.logger,
     );
+  }
 
-    this.viewDataOracle = new UnconstrainedExecutionOracle(
-      this.contractAddress,
-      [] /* authWitnesses */,
-      [] /* capsules */,
-      this.pxeDataProvider, // note: PXEDataProvider implements ExecutionDataProvider
-      /* log, */
-      /* scopes, */
-    );
+  static async create(logger: Logger, store: AztecAsyncKVStore, protocolContracts: ProtocolContract[]) {
+    const executionCache = new HashedValuesCache();
+    const nativeWorldStateService = await NativeWorldStateService.tmp();
+    const baseFork = await nativeWorldStateService.fork();
 
-    this.debug = createDebugOnlyLogger('aztec:kv-pxe-database');
-  }
+    const addressDataProvider = new AddressDataProvider(store);
+    const authWitnessDataProvider = new AuthWitnessDataProvider(store);
+    const contractDataProvider = new ContractDataProvider(store);
+    const noteDataProvider = await NoteDataProvider.create(store);
+    const syncDataProvider = new SyncDataProvider(store);
+    const taggingDataProvider = new TaggingDataProvider(store);
+    const capsuleDataProvider = new CapsuleDataProvider(store);
+    const keyStore = new KeyStore(store);
+
+    const accountDataProvider = new TXEAccountDataProvider(store);
+
+    // Register protocol contracts.
+    for (const { contractClass, instance, artifact } of protocolContracts) {
+      await contractDataProvider.addContractArtifact(contractClass.id, artifact);
+      await contractDataProvider.addContractInstance(instance);
+    }
 
-  static async create(
-    logger: Logger,
-    executionCache: HashedValuesCache,
-    keyStore: KeyStore,
-    txeDatabase: TXEDatabase,
-    nativeWorldStateService: NativeWorldStateService,
-    baseFork: MerkleTreeWriteOperations,
-  ) {
     return new TXE(
       logger,
-      executionCache,
       keyStore,
-      txeDatabase,
+      contractDataProvider,
+      noteDataProvider,
+      capsuleDataProvider,
+      syncDataProvider,
+      taggingDataProvider,
+      addressDataProvider,
+      authWitnessDataProvider,
+      accountDataProvider,
+      executionCache,
       await AztecAddress.random(),
       nativeWorldStateService,
       baseFork,
@@ -233,20 +262,24 @@ export class TXE implements TypedOracle {
     return this.contractDataProvider;
   }
 
-  getTXEDatabase() {
-    return this.txeDatabase;
-  }
-
   getKeyStore() {
     return this.keyStore;
   }
 
+  getAccountDataProvider() {
+    return this.accountDataProvider;
+  }
+
+  getAddressDataProvider() {
+    return this.addressDataProvider;
+  }
+
   async addContractInstance(contractInstance: ContractInstanceWithAddress) {
-    await this.txeDatabase.addContractInstance(contractInstance);
+    await this.contractDataProvider.addContractInstance(contractInstance);
   }
 
   async addContractArtifact(contractClassId: Fr, artifact: ContractArtifact) {
-    await this.txeDatabase.addContractArtifact(contractClassId, artifact);
+    await this.contractDataProvider.addContractArtifact(contractClassId, artifact);
   }
 
   async getPrivateContextInputs(
@@ -287,12 +320,12 @@ export class TXE implements TypedOracle {
   }
 
   async addAuthWitness(address: AztecAddress, messageHash: Fr) {
-    const account = await this.txeDatabase.getAccount(address);
+    const account = await this.accountDataProvider.getAccount(address);
     const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
     const schnorr = new Schnorr();
     const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
     const authWitness = new AuthWitness(messageHash, [...signature.toBuffer()]);
-    return this.txeDatabase.addAuthWitness(authWitness.requestHash, authWitness.witness);
+    return this.authWitnessDataProvider.addAuthWitness(authWitness.requestHash, authWitness.witness);
   }
 
   async addPublicDataWrites(writes: PublicDataWrite[]) {
@@ -501,11 +534,11 @@ export class TXE implements TypedOracle {
   }
 
   getCompleteAddress(account: AztecAddress) {
-    return Promise.resolve(this.txeDatabase.getAccount(account));
+    return Promise.resolve(this.accountDataProvider.getAccount(account));
   }
 
   getAuthWitness(messageHash: Fr) {
-    return this.txeDatabase.getAuthWitness(messageHash);
+    return this.pxeOracleInterface.getAuthWitness(messageHash);
   }
 
   async getNotes(
@@ -528,7 +561,7 @@ export class TXE implements TypedOracle {
     const pendingNotes = this.noteCache.getNotes(this.contractAddress, storageSlot);
 
     const pendingNullifiers = this.noteCache.getNullifiers(this.contractAddress);
-    const dbNotes = await this.pxeDataProvider.getNotes(this.contractAddress, storageSlot, status);
+    const dbNotes = await this.pxeOracleInterface.getNotes(this.contractAddress, storageSlot, status);
     const dbNotesFiltered = dbNotes.filter(n => !pendingNullifiers.has((n.siloedNullifier as Fr).value));
 
     const notes = pickNotes<NoteData>([...dbNotesFiltered, ...pendingNotes], {
@@ -986,12 +1019,7 @@ export class TXE implements TypedOracle {
     // Poor man's revert handling
     if (!executionResult.revertCode.isOK()) {
       if (executionResult.revertReason && executionResult.revertReason instanceof SimulationError) {
-        await enrichPublicSimulationError(
-          executionResult.revertReason,
-          this.contractDataProvider,
-          this.txeDatabase,
-          this.logger,
-        );
+        await enrichPublicSimulationError(executionResult.revertReason, this.contractDataProvider, this.logger);
         throw new Error(executionResult.revertReason.message);
       } else {
         throw new Error(`Enqueued public function call reverted: ${executionResult.revertReason}`);
@@ -1043,38 +1071,25 @@ export class TXE implements TypedOracle {
   }
 
   async incrementAppTaggingSecretIndexAsSender(sender: AztecAddress, recipient: AztecAddress): Promise<void> {
-    const appSecret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
-    const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([appSecret]);
-    await this.txeDatabase.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(appSecret, index + 1)]);
+    await this.pxeOracleInterface.incrementAppTaggingSecretIndexAsSender(this.contractAddress, sender, recipient);
   }
 
   async getIndexedTaggingSecretAsSender(sender: AztecAddress, recipient: AztecAddress): Promise<IndexedTaggingSecret> {
-    const secret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
-    const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([secret]);
-    return new IndexedTaggingSecret(secret, index);
-  }
-
-  async #calculateAppTaggingSecret(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress) {
-    const senderCompleteAddress = await this.getCompleteAddress(sender);
-    const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
-    const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
-    // Silo the secret to the app so it can't be used to track other app's notes
-    const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
-    return appSecret;
+    return await this.pxeOracleInterface.getIndexedTaggingSecretAsSender(this.contractAddress, sender, recipient);
   }
 
   async syncNotes() {
-    const taggedLogsByRecipient = await this.pxeDataProvider.syncTaggedLogs(
+    const taggedLogsByRecipient = await this.pxeOracleInterface.syncTaggedLogs(
       this.contractAddress,
       await this.getBlockNumber(),
       undefined,
     );
 
     for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
-      await this.pxeDataProvider.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
+      await this.pxeOracleInterface.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
     }
 
-    await this.pxeDataProvider.removeNullifiedNotes(this.contractAddress);
+    await this.pxeOracleInterface.removeNullifiedNotes(this.contractAddress);
 
     return Promise.resolve();
   }
@@ -1093,7 +1108,7 @@ export class TXE implements TypedOracle {
   }
 
   async getLogByTag(tag: Fr): Promise<LogWithTxData | null> {
-    return await this.pxeDataProvider.getLogByTag(tag);
+    return await this.pxeOracleInterface.getLogByTag(tag);
   }
 
   // AVM oracles
@@ -1192,7 +1207,7 @@ export class TXE implements TypedOracle {
       // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
       throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
     }
-    return this.txeDatabase.storeCapsule(this.contractAddress, slot, capsule);
+    return this.pxeOracleInterface.storeCapsule(this.contractAddress, slot, capsule);
   }
 
   loadCapsule(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null> {
@@ -1200,7 +1215,7 @@ export class TXE implements TypedOracle {
       // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
       throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
     }
-    return this.txeDatabase.loadCapsule(this.contractAddress, slot);
+    return this.pxeOracleInterface.loadCapsule(this.contractAddress, slot);
   }
 
   deleteCapsule(contractAddress: AztecAddress, slot: Fr): Promise<void> {
@@ -1208,7 +1223,7 @@ export class TXE implements TypedOracle {
       // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
       throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
     }
-    return this.txeDatabase.deleteCapsule(this.contractAddress, slot);
+    return this.pxeOracleInterface.deleteCapsule(this.contractAddress, slot);
   }
 
   copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
@@ -1216,10 +1231,11 @@ export class TXE implements TypedOracle {
       // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
       throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
     }
-    return this.txeDatabase.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries);
+    return this.pxeOracleInterface.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries);
   }
 
   aes128Decrypt(ciphertext: Buffer, iv: Buffer, symKey: Buffer): Promise<Buffer> {
-    return this.viewDataOracle.aes128Decrypt(ciphertext, iv, symKey);
+    const aes128 = new Aes128();
+    return aes128.decryptBufferCBC(ciphertext, iv, symKey);
   }
 }

package/src/txe_service/txe_service.ts

@@ -1,12 +1,10 @@
 import { type ContractInstanceWithAddress, Fr } from '@aztec/aztec.js';
 import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants';
 import type { Logger } from '@aztec/foundation/log';
-import { KeyStore } from '@aztec/key-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
-import { protocolContractNames } from '@aztec/protocol-contracts';
-import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
-import { enrichPublicSimulationError } from '@aztec/pxe';
-import { HashedValuesCache, type TypedOracle } from '@aztec/simulator/client';
+import type { ProtocolContract } from '@aztec/protocol-contracts';
+import { enrichPublicSimulationError } from '@aztec/pxe/server';
+import type { TypedOracle } from '@aztec/simulator/client';
 import { type ContractArtifact, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -14,7 +12,6 @@ import { computePartialAddress } from '@aztec/stdlib/contract';
 import { SimulationError } from '@aztec/stdlib/errors';
 import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { NativeWorldStateService } from '@aztec/world-state';
 
 import { TXE } from '../oracle/txe_oracle.js';
 import {
@@ -31,28 +28,14 @@ import {
   toSingle,
 } from '../util/encoding.js';
 import { ExpectedFailureError } from '../util/expected_failure_error.js';
-import { TXEDatabase } from '../util/txe_database.js';
 
 export class TXEService {
   constructor(private logger: Logger, private typedOracle: TypedOracle) {}
 
-  static async init(logger: Logger) {
-    const store = await openTmpStore('test');
-    const executionCache = new HashedValuesCache();
-    const nativeWorldStateService = await NativeWorldStateService.tmp();
-    const baseFork = await nativeWorldStateService.fork();
-
-    const keyStore = new KeyStore(store);
-    const txeDatabase = new TXEDatabase(store);
-    // Register protocol contracts.
-    const provider = new BundledProtocolContractsProvider();
-    for (const name of protocolContractNames) {
-      const { contractClass, instance, artifact } = await provider.getProtocolContractArtifact(name);
-      await txeDatabase.addContractArtifact(contractClass.id, artifact);
-      await txeDatabase.addContractInstance(instance);
-    }
+  static async init(logger: Logger, protocolContracts: ProtocolContract[]) {
     logger.debug(`TXE service initialized`);
-    const txe = await TXE.create(logger, executionCache, keyStore, txeDatabase, nativeWorldStateService, baseFork);
+    const store = await openTmpStore('test');
+    const txe = await TXE.create(logger, store, protocolContracts);
     const service = new TXEService(logger, txe);
     await service.advanceBlocksBy(toSingle(new Fr(1n)));
     return service;
@@ -140,8 +123,10 @@ export class TXEService {
     const secretFr = fromSingle(secret);
     // This is a footgun !
     const completeAddress = await keyStore.addAccount(secretFr, secretFr);
-    const accountStore = (this.typedOracle as TXE).getTXEDatabase();
-    await accountStore.setAccount(completeAddress.address, completeAddress);
+    const accountDataProvider = (this.typedOracle as TXE).getAccountDataProvider();
+    await accountDataProvider.setAccount(completeAddress.address, completeAddress);
+    const addressDataProvider = (this.typedOracle as TXE).getAddressDataProvider();
+    await addressDataProvider.addCompleteAddress(completeAddress);
     this.logger.debug(`Created account ${completeAddress.address}`);
     return toForeignCallResult([
       toSingle(completeAddress.address),
@@ -156,8 +141,10 @@ export class TXEService {
 
     const keyStore = (this.typedOracle as TXE).getKeyStore();
     const completeAddress = await keyStore.addAccount(fromSingle(secret), await computePartialAddress(instance));
-    const accountStore = (this.typedOracle as TXE).getTXEDatabase();
-    await accountStore.setAccount(completeAddress.address, completeAddress);
+    const accountDataProvider = (this.typedOracle as TXE).getAccountDataProvider();
+    await accountDataProvider.setAccount(completeAddress.address, completeAddress);
+    const addressDataProvider = (this.typedOracle as TXE).getAddressDataProvider();
+    await addressDataProvider.addCompleteAddress(completeAddress);
     this.logger.debug(`Created account ${completeAddress.address}`);
     return toForeignCallResult([
       toSingle(completeAddress.address),
@@ -715,7 +702,6 @@ export class TXEService {
         await enrichPublicSimulationError(
           result.revertReason,
           (this.typedOracle as TXE).getContractDataProvider(),
-          (this.typedOracle as TXE).getTXEDatabase(),
           this.logger,
         );
         throw new Error(result.revertReason.message);
@@ -745,7 +731,6 @@ export class TXEService {
         await enrichPublicSimulationError(
           result.revertReason,
           (this.typedOracle as TXE).getContractDataProvider(),
-          (this.typedOracle as TXE).getTXEDatabase(),
           this.logger,
         );
         throw new Error(result.revertReason.message);

package/src/util/{txe_database.ts → txe_account_data_provider.ts}

@@ -1,14 +1,12 @@
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
-import { KVPxeDatabase } from '@aztec/pxe';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
-export class TXEDatabase extends KVPxeDatabase {
+export class TXEAccountDataProvider {
   #accounts: AztecAsyncMap<string, Buffer>;
 
-  constructor(db: AztecAsyncKVStore) {
-    super(db);
-    this.#accounts = db.openMap('accounts');
+  constructor(store: AztecAsyncKVStore) {
+    this.#accounts = store.openMap('accounts');
   }
 
   async getAccount(key: AztecAddress) {
@@ -21,6 +19,5 @@ export class TXEDatabase extends KVPxeDatabase {
 
   async setAccount(key: AztecAddress, value: CompleteAddress) {
     await this.#accounts.set(key.toString(), value.toBuffer());
-    await this.addCompleteAddress(value);
   }
 }

package/src/util/txe_public_contract_data_source.ts

@@ -1,6 +1,6 @@
 import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { PrivateFunctionsTree } from '@aztec/pxe';
+import { PrivateFunctionsTree } from '@aztec/pxe/server';
 import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {

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

@@ -1 +0,0 @@
-{"version":3,"file":"txe_database.d.ts","sourceRoot":"","sources":["../../src/util/txe_database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,WAAY,SAAQ,aAAa;;gBAGhC,EAAE,EAAE,iBAAiB;IAK3B,UAAU,CAAC,GAAG,EAAE,YAAY;IAQ5B,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe;CAI3D"}