@aztec/txe 3.0.0-nightly.20250926 → 3.0.0-nightly.20250927

package/dest/oracle/txe_oracle_top_level_context.js

@@ -185,10 +185,10 @@ export class TXEOracleTopLevelContext {
         const simulator = new WASMSimulator();
         const privateExecutionOracle = new PrivateExecutionOracle(argsHash, txContext, callContext, /** Header of a block whose state is used during private execution (not the block the transaction is included in). */ blockHeader, /** 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 */ [], HashedValuesCache.create([
             new HashedValues(args, argsHash)
-        ]), noteCache, this.pxeOracleInterface, simulator, 0, 1, undefined, undefined, /**
+        ]), noteCache, this.pxeOracleInterface, 0, 1, undefined, undefined, /**
        * In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
        * contract would perform, including setting senderForTags.
-       */ from);
+       */ from, simulator);
         // Note: This is a slight modification of simulator.run without any of the checks. Maybe we should modify simulator.run with a boolean value to skip checks.
         let result;
         let executionResult;

package/dest/rpc_translator.js

@@ -57,23 +57,23 @@ export class RPCTranslator {
     }
     // TXE session state transition functions - these get handled by the state handler
     async txeSetTopLevelTXEContext() {
-        await this.stateHandler.setTopLevelContext();
+        await this.stateHandler.enterTopLevelState();
         return toForeignCallResult([]);
     }
     async txeSetPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
         const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? fromSingle(foreignAnchorBlockNumberValue).toNumber() : undefined;
-        const privateContextInputs = await this.stateHandler.setPrivateContext(contractAddress, anchorBlockNumber);
+        const privateContextInputs = await this.stateHandler.enterPrivateState(contractAddress, anchorBlockNumber);
         return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
     }
     async txeSetPublicTXEContext(foreignContractAddressIsSome, foreignContractAddressValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        await this.stateHandler.setPublicContext(contractAddress);
+        await this.stateHandler.enterPublicState(contractAddress);
         return toForeignCallResult([]);
     }
     async txeSetUtilityTXEContext(foreignContractAddressIsSome, foreignContractAddressValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        await this.stateHandler.setUtilityContext(contractAddress);
+        await this.stateHandler.enterUtilityState(contractAddress);
         return toForeignCallResult([]);
     }
     // Other oracles - these get handled by the oracle handler

package/dest/txe_session.d.ts

@@ -3,7 +3,7 @@ import { type Logger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
 import type { ProtocolContract } from '@aztec/protocol-contracts';
 import { AddressDataProvider, PXEOracleInterface } from '@aztec/pxe/server';
-import type { IPrivateExecutionOracle, IUtilityExecutionOracle } from '@aztec/pxe/simulator';
+import { type IPrivateExecutionOracle, type IUtilityExecutionOracle } from '@aztec/pxe/simulator';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
 import type { UInt32 } from '@aztec/stdlib/types';
@@ -22,10 +22,10 @@ type MethodNames<T> = {
  */
 export type TXEOracleFunctionName = MethodNames<RPCTranslator>;
 export interface TXESessionStateHandler {
-    setTopLevelContext(): Promise<void>;
-    setPublicContext(contractAddress?: AztecAddress): Promise<void>;
-    setPrivateContext(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    setUtilityContext(contractAddress?: AztecAddress): Promise<void>;
+    enterTopLevelState(): Promise<void>;
+    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
+    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
+    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
 }
 /**
  * A `TXESession` corresponds to a Noir `#[test]` function, and handles all of its oracle calls, stores test-specific
@@ -54,16 +54,14 @@ export declare class TXESession implements TXESessionStateHandler {
      * @returns The oracle return values.
      */
     processFunction(functionName: TXEOracleFunctionName, inputs: ForeignCallArgs): Promise<ForeignCallResult>;
-    setTopLevelContext(): Promise<void>;
-    setPublicContext(contractAddress?: AztecAddress): Promise<void>;
-    setPrivateContext(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    setUtilityContext(contractAddress?: AztecAddress): Promise<void>;
-    private exitTopLevelContext;
-    private exitPublicContext;
-    private exitPrivateContext;
+    enterTopLevelState(): Promise<void>;
+    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
+    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
+    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
+    private exitTopLevelState;
+    private exitPrivateState;
+    private exitPublicState;
     private exitUtilityContext;
-    private assertState;
-    private getPrivateContextInputs;
 }
 export {};
 //# sourceMappingURL=txe_session.d.ts.map

package/dest/txe_session.d.ts.map

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

package/dest/txe_session.js

@@ -3,42 +3,21 @@ import { createLogger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { AddressDataProvider, CapsuleDataProvider, NoteDataProvider, PXEOracleInterface, PrivateEventDataProvider, TaggingDataProvider } from '@aztec/pxe/server';
+import { ExecutionNoteCache, HashedValuesCache, PrivateExecutionOracle, UtilityExecutionOracle } from '@aztec/pxe/simulator';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Body, L2Block } from '@aztec/stdlib/block';
 import { GasSettings } from '@aztec/stdlib/gas';
-import { PrivateContextInputs } from '@aztec/stdlib/kernel';
-import { makeGlobalVariables } from '@aztec/stdlib/testing';
-import { CallContext, GlobalVariables, TxContext } from '@aztec/stdlib/tx';
-import { TXE } from './oracle/txe_oracle.js';
+import { makeAppendOnlyTreeSnapshot, makeGlobalVariables } from '@aztec/stdlib/testing';
+import { CallContext, TxContext } from '@aztec/stdlib/tx';
 import { TXEOraclePublicContext } from './oracle/txe_oracle_public_context.js';
 import { TXEOracleTopLevelContext } from './oracle/txe_oracle_top_level_context.js';
 import { RPCTranslator } from './rpc_translator.js';
 import { TXEStateMachine } from './state_machine/index.js';
 import { TXEAccountDataProvider } from './util/txe_account_data_provider.js';
 import { TXEContractDataProvider } from './util/txe_contract_data_provider.js';
-import { getSingleTxBlockRequestHash } from './utils/block_creation.js';
-/**
- * A TXE Session can be ine one of four states, which change as the test progresses and different oracles are called.
- * The current state determines which oracles are available.
- */ var SessionState = /*#__PURE__*/ function(SessionState) {
-    /**
-   * The top-level state is the default state, before any other state has been entered. This is where contracts can be
-   * deployed, accounts created, blocks mined, etc.
-   */ SessionState[SessionState["TOP_LEVEL"] = 0] = "TOP_LEVEL";
-    /**
-   * The private state is entered via the `private_context` function. In this state the PXE oracles that `#[private]`
-   * functions use are available, such as those related to note retrieval, notification of side-effects, capsule access,
-   * etc. */ SessionState[SessionState["PRIVATE"] = 1] = "PRIVATE";
-    /**
-   * The public state is entered via the `public_context` function. In this state the AVM opcodes that `#[public]`
-   * functions execute are resolved as oracles by TXE, since Noir tests are not transpiled. */ SessionState[SessionState["PUBLIC"] = 2] = "PUBLIC";
-    /**
-   * The utility state is entered via the `utility_context` function. In this state the PXE oracles that `#[utility]`
-   * functions use are available, such as those related to (unconstrained) note retrieval, capsule access, public
-   * storage reads, etc.
-   */ SessionState[SessionState["UTILITY"] = 3] = "UTILITY";
-    return SessionState;
-}(SessionState || {});
+import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlockHeader } from './utils/block_creation.js';
+import { makeTxEffect } from './utils/tx_effect_creation.js';
 const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
 /**
  * A `TXESession` corresponds to a Noir `#[test]` function, and handles all of its oracle calls, stores test-specific
@@ -69,7 +48,9 @@ const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
         this.version = version;
         this.nextBlockTimestamp = nextBlockTimestamp;
         this.pxeOracleInterface = pxeOracleInterface;
-        this.state = 0;
+        this.state = {
+            name: 'TOP_LEVEL'
+        };
         this.authwits = new Map();
     }
     static async init(protocolContracts) {
@@ -106,30 +87,81 @@ const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
             return new RPCTranslator(this, this.oracleHandler)[functionName](...inputs);
         } catch (error) {
             if (error instanceof Error) {
-                throw new Error(`Execution error while processing function ${functionName} in state ${SessionState[this.state]}: ${error.message}`);
+                throw new Error(`Execution error while processing function ${functionName} in state ${this.state.name}: ${error.message}`);
             } else {
-                throw new Error(`Unknown execution error while processing function ${functionName} in state ${SessionState[this.state]}`);
+                throw new Error(`Unknown execution error while processing function ${functionName} in state ${this.state.name}`);
             }
         }
     }
-    async setTopLevelContext() {
-        if (this.state == 1) {
-            await this.exitPrivateContext();
-        } else if (this.state == 2) {
-            await this.exitPublicContext();
-        } else if (this.state == 3) {
-            this.exitUtilityContext();
-        } else if (this.state == 0) {
-            throw new Error(`Expected to be in state other than ${SessionState[0]}`);
-        } else {
-            throw new Error(`Unexpected state '${this.state}'`);
+    async enterTopLevelState() {
+        switch(this.state.name){
+            case 'PRIVATE':
+                {
+                    await this.exitPrivateState();
+                    break;
+                }
+            case 'PUBLIC':
+                {
+                    await this.exitPublicState();
+                    break;
+                }
+            case 'UTILITY':
+                {
+                    this.exitUtilityContext();
+                    break;
+                }
+            case 'TOP_LEVEL':
+                {
+                    throw new Error(`Expected to be in state other than TOP_LEVEL`);
+                }
+            default:
+                {
+                    this.state;
+                }
         }
         this.oracleHandler = new TXEOracleTopLevelContext(this.stateMachine, this.contractDataProvider, this.keyStore, this.addressDataProvider, this.accountDataProvider, this.pxeOracleInterface, this.nextBlockTimestamp, this.version, this.chainId, this.authwits);
-        this.state = 0;
-        this.logger.debug(`Entered state ${SessionState[this.state]}`);
+        this.state = {
+            name: 'TOP_LEVEL'
+        };
+        this.logger.debug(`Entered state ${this.state.name}`);
+    }
+    async enterPrivateState(contractAddress = DEFAULT_ADDRESS, anchorBlockNumber) {
+        this.exitTopLevelState();
+        // There is no automatic message discovery and contract-driven syncing process in inlined private or utility
+        // contexts, which means that known nullifiers are also not searched for, since it is during the tagging sync that
+        // we perform this. We therefore search for known nullifiers now, as otherwise notes that were nullified would not
+        // be removed from the database.
+        // TODO(#12553): make the synchronizer sync here instead and remove this
+        await this.pxeOracleInterface.removeNullifiedNotes(contractAddress);
+        // Private execution has two associated block numbers: the anchor block (i.e. the historical block that is used to
+        // build the proof), and the *next* block, i.e. the one we'll create once the execution ends, and which will contain
+        // a single transaction with the effects of what was done in the test.
+        const anchorBlock = await this.stateMachine.node.getBlockHeader(anchorBlockNumber ?? 'latest');
+        const latestBlock = await this.stateMachine.node.getBlockHeader('latest');
+        const nextBlockGlobalVariables = makeGlobalVariables(undefined, {
+            blockNumber: latestBlock.globalVariables.blockNumber + 1,
+            timestamp: this.nextBlockTimestamp,
+            version: this.version,
+            chainId: this.chainId
+        });
+        const txRequestHash = getSingleTxBlockRequestHash(nextBlockGlobalVariables.blockNumber);
+        const noteCache = new ExecutionNoteCache(txRequestHash);
+        this.oracleHandler = new PrivateExecutionOracle(Fr.ZERO, new TxContext(this.chainId, this.version, GasSettings.empty()), new CallContext(AztecAddress.ZERO, contractAddress, FunctionSelector.empty(), false), anchorBlock, [], [], new HashedValuesCache(), noteCache, this.pxeOracleInterface);
+        // We store the note cache fed into the PrivateExecutionOracle (along with some other auxiliary data) in order to
+        // refer to it later, mimicking the way this object is used by the ContractFunctionSimulator. The difference resides
+        // in that the simulator has all information needed in order to run the simulation, while ours will be ongoing as
+        // the different oracles will be invoked from the Noir test, until eventually the private execution finishes.
+        this.state = {
+            name: 'PRIVATE',
+            nextBlockGlobalVariables,
+            txRequestHash,
+            noteCache
+        };
+        this.logger.debug(`Entered state ${this.state.name}`);
+        return this.oracleHandler.getPrivateContextInputs();
     }
-    async setPublicContext(contractAddress) {
-        this.exitTopLevelContext();
+    async enterPublicState(contractAddress) {
+        this.exitTopLevelState();
         // The PublicContext will create a block with a single transaction in it, containing the effects of what was done in
         // the test. The block therefore gets the *next* block number and timestamp.
         const latestBlockNumber = (await this.stateMachine.node.getBlockHeader('latest')).globalVariables.blockNumber;
@@ -140,45 +172,29 @@ const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
             chainId: this.chainId
         });
         this.oracleHandler = new TXEOraclePublicContext(contractAddress ?? DEFAULT_ADDRESS, await this.stateMachine.synchronizer.nativeWorldStateService.fork(), getSingleTxBlockRequestHash(globalVariables.blockNumber), globalVariables);
-        this.state = 2;
-        this.logger.debug(`Entered state ${SessionState[this.state]}`);
+        this.state = {
+            name: 'PUBLIC'
+        };
+        this.logger.debug(`Entered state ${this.state.name}`);
     }
-    async setPrivateContext(contractAddress, anchorBlockNumber) {
-        this.exitTopLevelContext();
-        // A PrivateContext has two associated block numbers: the anchor block (i.e. the historical block that is used to build the
-        // proof), and the *next* block, i.e. the one the PrivateContext will create with the single transaction that
-        // contains the effects of what was done in the test.
-        const anchorBlock = await this.stateMachine.node.getBlockHeader(anchorBlockNumber ?? 'latest');
-        const latestBlock = await this.stateMachine.node.getBlockHeader('latest');
-        const anchorBlockGlobalVariables = makeGlobalVariables(undefined, {
-            blockNumber: anchorBlock.globalVariables.blockNumber,
-            timestamp: anchorBlock.globalVariables.timestamp,
-            version: this.version,
-            chainId: this.chainId
-        });
-        const nextBlockGlobalVariables = makeGlobalVariables(undefined, {
-            blockNumber: latestBlock.globalVariables.blockNumber + 1,
-            timestamp: this.nextBlockTimestamp,
-            version: this.version,
-            chainId: this.chainId
-        });
-        const privateContextInputs = await this.getPrivateContextInputs(anchorBlockGlobalVariables.blockNumber, contractAddress ?? DEFAULT_ADDRESS);
-        this.oracleHandler = await TXE.create(contractAddress ?? DEFAULT_ADDRESS, this.pxeOracleInterface, await this.stateMachine.synchronizer.nativeWorldStateService.fork(), anchorBlockGlobalVariables, nextBlockGlobalVariables, getSingleTxBlockRequestHash(nextBlockGlobalVariables.blockNumber));
-        this.state = 1;
-        this.logger.debug(`Entered state ${SessionState[this.state]}`);
-        return privateContextInputs;
-    }
-    async setUtilityContext(contractAddress) {
-        this.exitTopLevelContext();
-        // A UtilityContext is built using the latest block as a reference, mimicking what would happen if PXE had synced
-        // all the way to the tip of the chain.
-        const latestBlock = await this.stateMachine.node.getBlockHeader('latest');
-        this.oracleHandler = await TXE.create(contractAddress ?? DEFAULT_ADDRESS, this.pxeOracleInterface, await this.stateMachine.synchronizer.nativeWorldStateService.fork(), latestBlock.globalVariables, GlobalVariables.empty(), Fr.random());
-        this.state = 3;
-        this.logger.debug(`Entered state ${SessionState[this.state]}`);
+    async enterUtilityState(contractAddress = DEFAULT_ADDRESS) {
+        this.exitTopLevelState();
+        // There is no automatic message discovery and contract-driven syncing process in inlined private or utility
+        // contexts, which means that known nullifiers are also not searched for, since it is during the tagging sync that
+        // we perform this. We therefore search for known nullifiers now, as otherwise notes that were nullified would not
+        // be removed from the database.
+        // TODO(#12553): make the synchronizer sync here instead and remove this
+        await this.pxeOracleInterface.removeNullifiedNotes(contractAddress);
+        this.oracleHandler = new UtilityExecutionOracle(contractAddress, [], [], this.pxeOracleInterface);
+        this.state = {
+            name: 'UTILITY'
+        };
+        this.logger.debug(`Entered state ${this.state.name}`);
     }
-    exitTopLevelContext() {
-        this.assertState(0);
+    exitTopLevelState() {
+        if (this.state.name != 'TOP_LEVEL') {
+            throw new Error(`Expected to be in state 'TOP_LEVEL', but got '${this.state.name}' instead`);
+        }
         // Note that while all public and private contexts do is build a single block that we then process when exiting
         // those, the top level context performs a large number of actions not captured in the following 'close' call. Among
         // others, it will create empty blocks (via `txeAdvanceBlocksBy` and `deploy`), create blocks with transactions via
@@ -190,27 +206,39 @@ const DEFAULT_ADDRESS = AztecAddress.fromNumber(42);
         // Ideally authwits would be passed alongside a contract call instead of pre-seeded.
         [this.nextBlockTimestamp, this.authwits] = this.oracleHandler.close();
     }
-    async exitPublicContext() {
-        this.assertState(2);
-        const block = await this.oracleHandler.close();
+    async exitPrivateState() {
+        if (this.state.name != 'PRIVATE') {
+            throw new Error(`Expected to be in state 'PRIVATE', but got '${this.state.name}' instead`);
+        }
+        this.logger.debug('Exiting Private state, building block with collected side effects', {
+            blockNumber: this.state.nextBlockGlobalVariables.blockNumber
+        });
+        // We rely on the note cache to determine the effects of the transaction. This is incomplete as it doesn't private
+        // logs (other effects like enqueued public calls don't need to be considered since those are not allowed).
+        const txEffect = await makeTxEffect(this.state.noteCache, this.state.txRequestHash, this.state.nextBlockGlobalVariables.blockNumber);
+        // We build a block holding just this transaction
+        const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
+        await insertTxEffectIntoWorldTrees(txEffect, forkedWorldTrees);
+        const block = new L2Block(makeAppendOnlyTreeSnapshot(), await makeTXEBlockHeader(forkedWorldTrees, this.state.nextBlockGlobalVariables), new Body([
+            txEffect
+        ]));
         await this.stateMachine.handleL2Block(block);
+        await forkedWorldTrees.close();
+        this.logger.debug('Exited PublicContext with built block', {
+            blockNumber: block.number,
+            txEffects: block.body.txEffects
+        });
     }
-    async exitPrivateContext() {
-        this.assertState(1);
+    async exitPublicState() {
+        if (this.state.name != 'PUBLIC') {
+            throw new Error(`Expected to be in state 'PUBLIC', but got '${this.state.name}' instead`);
+        }
         const block = await this.oracleHandler.close();
         await this.stateMachine.handleL2Block(block);
     }
     exitUtilityContext() {
-        this.assertState(3);
-    }
-    assertState(state) {
-        if (this.state != state) {
-            throw new Error(`Expected to be in state ${SessionState[state]}, but got '${SessionState[this.state]}' instead`);
+        if (this.state.name != 'UTILITY') {
+            throw new Error(`Expected to be in state 'UTILITY', but got '${this.state.name}' instead`);
         }
     }
-    async getPrivateContextInputs(anchorBlockNumber, contractAddress) {
-        this.logger.info(`Creating private context for block ${anchorBlockNumber}`);
-        const sender = await AztecAddress.random();
-        return new PrivateContextInputs(new CallContext(sender, contractAddress, FunctionSelector.empty(), false), await this.stateMachine.node.getBlockHeader(anchorBlockNumber), new TxContext(this.chainId, this.version, GasSettings.empty()), 0);
-    }
 }

package/dest/utils/tx_effect_creation.d.ts

@@ -0,0 +1,5 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { ExecutionNoteCache } from '@aztec/pxe/simulator';
+import { TxEffect } from '@aztec/stdlib/tx';
+export declare function makeTxEffect(noteCache: ExecutionNoteCache, txRequestHash: Fr, txBlockNumber: number): Promise<TxEffect>;
+//# sourceMappingURL=tx_effect_creation.d.ts.map

package/dest/utils/tx_effect_creation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_effect_creation.d.ts","sourceRoot":"","sources":["../../src/utils/tx_effect_creation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAU,MAAM,kBAAkB,CAAC;AAEpD,wBAAsB,YAAY,CAChC,SAAS,EAAE,kBAAkB,EAC7B,aAAa,EAAE,EAAE,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,QAAQ,CAAC,CA2BnB"}

package/dest/utils/tx_effect_creation.js

@@ -0,0 +1,16 @@
+import { Fr } from '@aztec/foundation/fields';
+import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash } from '@aztec/stdlib/hash';
+import { TxEffect, TxHash } from '@aztec/stdlib/tx';
+export async function makeTxEffect(noteCache, txRequestHash, txBlockNumber) {
+    const txEffect = TxEffect.empty();
+    const { usedTxRequestHashForNonces } = noteCache.finish();
+    const nonceGenerator = usedTxRequestHashForNonces ? txRequestHash : noteCache.getAllNullifiers()[0];
+    txEffect.noteHashes = await Promise.all(noteCache.getAllNotes().map(async (pendingNote, i)=>computeUniqueNoteHash(await computeNoteHashNonce(nonceGenerator, i), await siloNoteHash(pendingNote.note.contractAddress, pendingNote.noteHashForConsumption))));
+    // Nullifiers are already siloed
+    txEffect.nullifiers = noteCache.getAllNullifiers();
+    if (usedTxRequestHashForNonces) {
+        txEffect.nullifiers.unshift(txRequestHash);
+    }
+    txEffect.txHash = new TxHash(new Fr(txBlockNumber));
+    return txEffect;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/txe",
-  "version": "3.0.0-nightly.20250926",
+  "version": "3.0.0-nightly.20250927",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -61,20 +61,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250926",
-    "@aztec/archiver": "3.0.0-nightly.20250926",
-    "@aztec/aztec-node": "3.0.0-nightly.20250926",
-    "@aztec/aztec.js": "3.0.0-nightly.20250926",
-    "@aztec/bb-prover": "3.0.0-nightly.20250926",
-    "@aztec/constants": "3.0.0-nightly.20250926",
-    "@aztec/foundation": "3.0.0-nightly.20250926",
-    "@aztec/key-store": "3.0.0-nightly.20250926",
-    "@aztec/kv-store": "3.0.0-nightly.20250926",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250926",
-    "@aztec/pxe": "3.0.0-nightly.20250926",
-    "@aztec/simulator": "3.0.0-nightly.20250926",
-    "@aztec/stdlib": "3.0.0-nightly.20250926",
-    "@aztec/world-state": "3.0.0-nightly.20250926",
+    "@aztec/accounts": "3.0.0-nightly.20250927",
+    "@aztec/archiver": "3.0.0-nightly.20250927",
+    "@aztec/aztec-node": "3.0.0-nightly.20250927",
+    "@aztec/aztec.js": "3.0.0-nightly.20250927",
+    "@aztec/bb-prover": "3.0.0-nightly.20250927",
+    "@aztec/constants": "3.0.0-nightly.20250927",
+    "@aztec/foundation": "3.0.0-nightly.20250927",
+    "@aztec/key-store": "3.0.0-nightly.20250927",
+    "@aztec/kv-store": "3.0.0-nightly.20250927",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250927",
+    "@aztec/pxe": "3.0.0-nightly.20250927",
+    "@aztec/simulator": "3.0.0-nightly.20250927",
+    "@aztec/stdlib": "3.0.0-nightly.20250927",
+    "@aztec/world-state": "3.0.0-nightly.20250927",
     "zod": "^3.23.8"
   },
   "devDependencies": {

package/src/oracle/txe_oracle_top_level_context.ts

@@ -303,7 +303,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
       HashedValuesCache.create([new HashedValues(args, argsHash)]),
       noteCache,
       this.pxeOracleInterface,
-      simulator,
       0,
       1,
       undefined, // log
@@ -313,6 +312,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
        * contract would perform, including setting senderForTags.
        */
       from,
+      simulator,
     );
 
     // Note: This is a slight modification of simulator.run without any of the checks. Maybe we should modify simulator.run with a boolean value to skip checks.

package/src/rpc_translator.ts

@@ -97,7 +97,7 @@ export class RPCTranslator {
   // TXE session state transition functions - these get handled by the state handler
 
   async txeSetTopLevelTXEContext() {
-    await this.stateHandler.setTopLevelContext();
+    await this.stateHandler.enterTopLevelState();
 
     return toForeignCallResult([]);
   }
@@ -116,7 +116,7 @@ export class RPCTranslator {
       ? fromSingle(foreignAnchorBlockNumberValue).toNumber()
       : undefined;
 
-    const privateContextInputs = await this.stateHandler.setPrivateContext(contractAddress, anchorBlockNumber);
+    const privateContextInputs = await this.stateHandler.enterPrivateState(contractAddress, anchorBlockNumber);
 
     return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
   }
@@ -129,7 +129,7 @@ export class RPCTranslator {
       ? AztecAddress.fromField(fromSingle(foreignContractAddressValue))
       : undefined;
 
-    await this.stateHandler.setPublicContext(contractAddress);
+    await this.stateHandler.enterPublicState(contractAddress);
 
     return toForeignCallResult([]);
   }
@@ -142,7 +142,7 @@ export class RPCTranslator {
       ? AztecAddress.fromField(fromSingle(foreignContractAddressValue))
       : undefined;
 
-    await this.stateHandler.setUtilityContext(contractAddress);
+    await this.stateHandler.enterUtilityState(contractAddress);
 
     return toForeignCallResult([]);
   }