@aztec/txe 3.0.0-nightly.20260104 → 3.0.0-nightly.20260106

package/src/oracle/txe_oracle_top_level_context.ts

@@ -13,14 +13,14 @@ import { LogLevels, type Logger, applyStringFormatting, createLogger } from '@az
 import { TestDateProvider } from '@aztec/foundation/timer';
 import type { KeyStore } from '@aztec/key-store';
 import {
-  AddressDataProvider,
-  CapsuleDataProvider,
-  NoteDataProvider,
+  AddressStore,
+  CapsuleStore,
+  NoteStore,
   ORACLE_VERSION,
-  PrivateEventDataProvider,
-  RecipientTaggingDataProvider,
-  SenderAddressBook,
-  SenderTaggingDataProvider,
+  PrivateEventStore,
+  RecipientTaggingStore,
+  SenderAddressBookStore,
+  SenderTaggingStore,
   enrichPublicSimulationError,
 } from '@aztec/pxe/server';
 import {
@@ -49,7 +49,7 @@ import {
   PublicContractsDB,
   PublicProcessor,
 } from '@aztec/simulator/server';
-import { type ContractArtifact, EventSelector, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { type ContractArtifact, EventSelector, FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -80,10 +80,10 @@ import {
 import type { UInt64 } from '@aztec/stdlib/types';
 import { ForkCheckpoint } from '@aztec/world-state';
 
+import { DEFAULT_ADDRESS } from '../constants.js';
 import type { TXEStateMachine } from '../state_machine/index.js';
-import { DEFAULT_ADDRESS } from '../txe_session.js';
-import type { TXEAccountDataProvider } from '../util/txe_account_data_provider.js';
-import type { TXEContractDataProvider } from '../util/txe_contract_data_provider.js';
+import type { TXEAccountStore } from '../util/txe_account_store.js';
+import type { TXEContractStore } from '../util/txe_contract_store.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
 import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from '../utils/block_creation.js';
 import type { ITxeExecutionOracle } from './interfaces.js';
@@ -96,16 +96,16 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
   constructor(
     private stateMachine: TXEStateMachine,
-    private contractDataProvider: TXEContractDataProvider,
-    private noteDataProvider: NoteDataProvider,
+    private contractStore: TXEContractStore,
+    private noteStore: NoteStore,
     private keyStore: KeyStore,
-    private addressDataProvider: AddressDataProvider,
-    private accountDataProvider: TXEAccountDataProvider,
-    private senderTaggingDataProvider: SenderTaggingDataProvider,
-    private recipientTaggingDataProvider: RecipientTaggingDataProvider,
-    private senderAddressBook: SenderAddressBook,
-    private capsuleDataProvider: CapsuleDataProvider,
-    private privateEventDataProvider: PrivateEventDataProvider,
+    private addressStore: AddressStore,
+    private accountStore: TXEAccountStore,
+    private senderTaggingStore: SenderTaggingStore,
+    private recipientTaggingStore: RecipientTaggingStore,
+    private senderAddressBookStore: SenderAddressBookStore,
+    private capsuleStore: CapsuleStore,
+    private privateEventStore: PrivateEventStore,
     private nextBlockTimestamp: bigint,
     private version: Fr,
     private chainId: Fr,
@@ -170,7 +170,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
   async txeGetPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress) {
     return (
-      await this.privateEventDataProvider.getPrivateEvents(selector, {
+      await this.privateEventStore.getPrivateEvents(selector, {
         contractAddress,
         scopes: [scope],
         fromBlock: 0,
@@ -206,8 +206,8 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     if (!secret.equals(Fr.ZERO)) {
       await this.txeAddAccount(artifact, instance, secret);
     } else {
-      await this.contractDataProvider.addContractInstance(instance);
-      await this.contractDataProvider.addContractArtifact(instance.currentContractClassId, artifact);
+      await this.contractStore.addContractInstance(instance);
+      await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
       this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
     }
   }
@@ -216,12 +216,12 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     const partialAddress = await computePartialAddress(instance);
 
     this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
-    await this.contractDataProvider.addContractInstance(instance);
-    await this.contractDataProvider.addContractArtifact(instance.currentContractClassId, artifact);
+    await this.contractStore.addContractInstance(instance);
+    await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
 
     const completeAddress = await this.keyStore.addAccount(secret, partialAddress);
-    await this.accountDataProvider.setAccount(completeAddress.address, completeAddress);
-    await this.addressDataProvider.addCompleteAddress(completeAddress);
+    await this.accountStore.setAccount(completeAddress.address, completeAddress);
+    await this.addressStore.addCompleteAddress(completeAddress);
     this.logger.debug(`Created account ${completeAddress.address}`);
 
     return completeAddress;
@@ -230,15 +230,15 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
   async txeCreateAccount(secret: Fr) {
     // This is a foot gun !
     const completeAddress = await this.keyStore.addAccount(secret, secret);
-    await this.accountDataProvider.setAccount(completeAddress.address, completeAddress);
-    await this.addressDataProvider.addCompleteAddress(completeAddress);
+    await this.accountStore.setAccount(completeAddress.address, completeAddress);
+    await this.addressStore.addCompleteAddress(completeAddress);
     this.logger.debug(`Created account ${completeAddress.address}`);
 
     return completeAddress;
   }
 
   async txeAddAuthWitness(address: AztecAddress, messageHash: Fr) {
-    const account = await this.accountDataProvider.getAccount(address);
+    const account = await this.accountStore.getAccount(address);
     const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
 
     const schnorr = new Schnorr();
@@ -283,10 +283,10 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     isStaticCall: boolean = false,
   ) {
     this.logger.verbose(
-      `Executing external function ${await this.contractDataProvider.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`,
+      `Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`,
     );
 
-    const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
+    const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
     if (!artifact) {
       const message = functionSelector.equals(await FunctionSelector.fromSignature('verify_private_authwit(Field)'))
         ? 'Found no account contract artifact for a private authwit check - use `create_contract_account` instead of `create_light_account` for authwit support.'
@@ -294,19 +294,24 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       throw new Error(message);
     }
 
+    // Sync notes before executing private function to discover notes from previous transactions
+    const utilityExecutor = async (call: FunctionCall) => {
+      await this.executeUtilityCall(call);
+    };
+
+    await this.contractStore.syncPrivateState(targetContractAddress, functionSelector, utilityExecutor);
+
     const blockNumber = await this.txeGetNextBlockNumber();
 
     const callContext = new CallContext(from, targetContractAddress, functionSelector, isStaticCall);
 
     const gasLimits = new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
-
     const teardownGasLimits = new Gas(DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT);
-
     const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
 
     const txContext = new TxContext(this.chainId, this.version, gasSettings);
 
-    const blockHeader = await this.stateMachine.anchorBlockDataProvider.getBlockHeader();
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
 
     const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
     const noteCache = new ExecutionNoteCache(protocolNullifier);
@@ -320,6 +325,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       callContext,
       /** Header of a block whose state is used during private execution (not the block the transaction is included in). */
       blockHeader,
+      utilityExecutor,
       /** List of transient auth witnesses to be used during this simulation */
       Array.from(this.authwits.values()),
       /** List of transient auth witnesses to be used during this simulation */
@@ -327,17 +333,17 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       HashedValuesCache.create([new HashedValues(args, argsHash)]),
       noteCache,
       taggingIndexCache,
-      this.contractDataProvider,
-      this.noteDataProvider,
+      this.contractStore,
+      this.noteStore,
       this.keyStore,
-      this.addressDataProvider,
+      this.addressStore,
       this.stateMachine.node,
-      this.stateMachine.anchorBlockDataProvider,
-      this.senderTaggingDataProvider,
-      this.recipientTaggingDataProvider,
-      this.senderAddressBook,
-      this.capsuleDataProvider,
-      this.privateEventDataProvider,
+      this.stateMachine.anchorBlockStore,
+      this.senderTaggingStore,
+      this.recipientTaggingStore,
+      this.senderAddressBookStore,
+      this.capsuleStore,
+      this.privateEventStore,
       0,
       1,
       undefined, // log
@@ -387,7 +393,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     // can either be the first nullifier in the tx or the hash of the initial tx request
     // if there are none.
     const nonceGenerator = result.firstNullifier.equals(Fr.ZERO) ? protocolNullifier : result.firstNullifier;
-    const { publicInputs } = await generateSimulatedProvingResult(result, nonceGenerator, this.contractDataProvider);
+    const { publicInputs } = await generateSimulatedProvingResult(result, nonceGenerator, this.contractStore);
 
     const globals = makeGlobalVariables();
     globals.blockNumber = blockNumber;
@@ -398,7 +404,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
 
-    const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractDataProvider));
+    const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore));
     const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
     const config = PublicSimulatorConfig.from({
       skipFeeEnforcement: true,
@@ -437,7 +443,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     } else if (!processedTx.revertCode.isOK()) {
       if (processedTx.revertReason) {
         try {
-          await enrichPublicSimulationError(processedTx.revertReason, this.contractDataProvider, this.logger);
+          await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
           // eslint-disable-next-line no-empty
         } catch {}
         throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
@@ -482,7 +488,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     isStaticCall: boolean,
   ) {
     this.logger.verbose(
-      `Executing public function ${await this.contractDataProvider.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`,
+      `Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`,
     );
 
     const blockNumber = await this.txeGetNextBlockNumber();
@@ -495,7 +501,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     const txContext = new TxContext(this.chainId, this.version, gasSettings);
 
-    const anchorBlockHeader = await this.stateMachine.anchorBlockDataProvider.getBlockHeader();
+    const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
 
     const calldataHash = await computeCalldataHash(calldata);
     const calldataHashedValues = new HashedValues(calldata, calldataHash);
@@ -509,7 +515,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
 
     const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
 
-    const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractDataProvider));
+    const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore));
     const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
     const config = PublicSimulatorConfig.from({
       skipFeeEnforcement: true,
@@ -577,7 +583,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     } else if (!processedTx.revertCode.isOK()) {
       if (processedTx.revertReason) {
         try {
-          await enrichPublicSimulationError(processedTx.revertReason, this.contractDataProvider, this.logger);
+          await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
           // eslint-disable-next-line no-empty
         } catch {}
         throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
@@ -623,21 +629,32 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     functionSelector: FunctionSelector,
     args: Fr[],
   ) {
-    const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
+    const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
     if (!artifact) {
       throw new Error(`Cannot call ${functionSelector} as there is no artifact found at ${targetContractAddress}.`);
     }
 
-    const call = {
-      name: artifact.name,
-      selector: functionSelector,
-      to: targetContractAddress,
-    };
+    // Sync notes before executing utility function to discover notes from previous transactions
+    await this.contractStore.syncPrivateState(targetContractAddress, functionSelector, async call => {
+      await this.executeUtilityCall(call);
+    });
 
-    const entryPointArtifact = await this.contractDataProvider.getFunctionArtifactWithDebugMetadata(
-      call.to,
-      call.selector,
+    const call = new FunctionCall(
+      artifact.name,
+      targetContractAddress,
+      functionSelector,
+      FunctionType.UTILITY,
+      false,
+      false,
+      args,
+      [],
     );
+
+    return this.executeUtilityCall(call);
+  }
+
+  private async executeUtilityCall(call: FunctionCall): Promise<Fr[]> {
+    const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
     if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
       throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
     }
@@ -648,25 +665,25 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
     });
 
     try {
-      const anchorBlockHeader = await this.stateMachine.anchorBlockDataProvider.getBlockHeader();
+      const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
       const oracle = new UtilityExecutionOracle(
         call.to,
         [],
         [],
         anchorBlockHeader,
-        this.contractDataProvider,
-        this.noteDataProvider,
+        this.contractStore,
+        this.noteStore,
         this.keyStore,
-        this.addressDataProvider,
+        this.addressStore,
         this.stateMachine.node,
-        this.stateMachine.anchorBlockDataProvider,
-        this.recipientTaggingDataProvider,
-        this.senderAddressBook,
-        this.capsuleDataProvider,
-        this.privateEventDataProvider,
+        this.stateMachine.anchorBlockStore,
+        this.recipientTaggingStore,
+        this.senderAddressBookStore,
+        this.capsuleStore,
+        this.privateEventStore,
       );
       const acirExecutionResult = await new WASMSimulator()
-        .executeUserCircuit(toACVMWitness(0, args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
+        .executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
         .catch((err: Error) => {
           err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
           throw new ExecutionError(

package/src/state_machine/index.ts

@@ -2,7 +2,7 @@ import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { TestCircuitVerifier } from '@aztec/bb-prover/test';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { AnchorBlockDataProvider } from '@aztec/pxe/server';
+import { AnchorBlockStore } from '@aztec/pxe/server';
 import { L2Block } from '@aztec/stdlib/block';
 import { L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
@@ -22,13 +22,13 @@ export class TXEStateMachine {
     public node: AztecNode,
     public synchronizer: TXESynchronizer,
     public archiver: TXEArchiver,
-    public anchorBlockDataProvider: AnchorBlockDataProvider,
+    public anchorBlockStore: AnchorBlockStore,
   ) {}
 
   public static async create(db: AztecAsyncKVStore) {
     const archiver = new TXEArchiver(db);
     const synchronizer = await TXESynchronizer.create();
-    const anchorBlockDataProvider = new AnchorBlockDataProvider(db);
+    const anchorBlockStore = new AnchorBlockStore(db);
 
     const aztecNodeConfig = {} as AztecNodeConfig;
 
@@ -55,7 +55,7 @@ export class TXEStateMachine {
       log,
     );
 
-    return new this(node, synchronizer, archiver, anchorBlockDataProvider);
+    return new this(node, synchronizer, archiver, anchorBlockStore);
   }
 
   public async handleL2Block(block: L2Block) {
@@ -72,7 +72,7 @@ export class TXEStateMachine {
     await Promise.all([
       this.synchronizer.handleL2Block(block.toL2Block()),
       this.archiver.addCheckpoints([publishedCheckpoint], undefined),
-      this.anchorBlockDataProvider.setHeader(block.getBlockHeader()),
+      this.anchorBlockStore.setHeader(block.getBlockHeader()),
     ]);
   }
 }