@aztec/pxe 1.2.1 → 2.0.0-nightly.20250813

package/dest/pxe_service/pxe_service.js

@@ -109,7 +109,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
             throw new Error(`L2 to L1 message not found in block ${blockNumber}`);
         }
         return [
-            result.l2MessageIndex,
+            result.leafIndex,
             result.siblingPath
         ];
     }
@@ -180,7 +180,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     async #isContractClassPubliclyRegistered(id) {
         return !!await this.node.getContractClass(id);
     }
-    async #isContractPubliclyDeployed(address) {
+    async #isContractPublished(address) {
         return !!await this.node.getContract(address);
     }
     async #isContractInitialized(address) {
@@ -206,10 +206,14 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
             returnTypes: functionDao.returnTypes
         };
     }
-    async #executePrivate(contractFunctionSimulator, txRequest, msgSender, scopes) {
+    // Executes the entrypoint private function, as well as all nested private
+    // functions that might arise.
+    async #executePrivate(contractFunctionSimulator, txRequest, scopes) {
         const { origin: contractAddress, functionSelector } = txRequest;
         try {
-            const result = await contractFunctionSimulator.run(txRequest, contractAddress, functionSelector, msgSender, scopes);
+            const result = await contractFunctionSimulator.run(txRequest, contractAddress, functionSelector, undefined, // The sender for tags is set by contracts, typically by an account
+            // contract entrypoint
+            undefined, scopes);
             this.log.debug(`Private simulation completed for ${contractAddress.toString()}:${functionSelector}`);
             return result;
         } catch (err) {
@@ -319,7 +323,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         return {
             contractInstance: instance,
             isContractInitialized: await this.#isContractInitialized(address),
-            isContractPubliclyDeployed: await this.#isContractPubliclyDeployed(address)
+            isContractPublished: await this.#isContractPublished(address)
         };
     }
     async registerAccount(secretKey, partialAddress) {
@@ -427,6 +431,8 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         return this.contractDataProvider.getContractsAddresses();
     }
     async getNotes(filter) {
+        // We need to manually trigger private state sync to have a guarantee that all the events are available.
+        await this.simulateUtility('sync_private_state', [], filter.contractAddress);
         const noteDaos = await this.noteDataProvider.getNotes(filter);
         const extendedNotes = noteDaos.map(async (dao)=>{
             let recipient = filter.recipient;
@@ -486,7 +492,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     perFunction,
                     unaccounted: totalTime - ((syncTime ?? 0) + (proving ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0))
                 };
-                this.log.info(`Proving completed in ${totalTime}ms`, {
+                this.log.debug(`Proving completed in ${totalTime}ms`, {
                     timings
                 });
                 return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof, {
@@ -498,7 +504,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
             }
         });
     }
-    profileTx(txRequest, profileMode, skipProofGeneration = true, msgSender) {
+    profileTx(txRequest, profileMode, skipProofGeneration = true) {
         // We disable concurrent profiles for consistency with simulateTx.
         return this.#putInJobQueue(async ()=>{
             const totalTimer = new Timer();
@@ -507,7 +513,6 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     origin: txRequest.origin,
                     functionSelector: txRequest.functionSelector,
                     simulatePublic: false,
-                    msgSender,
                     chainId: txRequest.txContext.chainId,
                     version: txRequest.txContext.version,
                     authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
@@ -517,7 +522,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 await this.synchronizer.sync();
                 const syncTime = syncTimer.ms();
                 const contractFunctionSimulator = this.#getSimulatorForTx();
-                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest, msgSender);
+                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest);
                 const { executionSteps, timings: { proving } = {} } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: skipProofGeneration,
                     skipFeeEnforcement: false,
@@ -547,7 +552,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     nodeRPCCalls: simulatorStats.nodeRPCCalls
                 });
             } catch (err) {
-                throw this.#contextualizeError(err, inspect(txRequest), `profileMode=${profileMode}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`);
+                throw this.#contextualizeError(err, inspect(txRequest), `profileMode=${profileMode}`);
             }
         });
     }
@@ -563,7 +568,6 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     origin: txRequest.origin,
                     functionSelector: txRequest.functionSelector,
                     simulatePublic,
-                    msgSender: overrides?.msgSender,
                     chainId: txRequest.txContext.chainId,
                     version: txRequest.txContext.version,
                     authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
@@ -577,7 +581,8 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 // will fail. Consider handing control to the user/wallet on whether they want to run them
                 // or not.
                 const skipKernels = overrides?.contracts !== undefined && Object.keys(overrides.contracts ?? {}).length > 0;
-                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest, overrides?.msgSender, scopes);
+                // Execution of private functions only; no proving, and no kernel logic.
+                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest, scopes);
                 let publicInputs;
                 let executionSteps = [];
                 if (skipKernels) {
@@ -587,6 +592,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     const nonceGenerator = privateExecutionResult.firstNullifier.equals(Fr.ZERO) ? await txRequest.toTxRequest().hash() : privateExecutionResult.firstNullifier;
                     ({ publicInputs, executionSteps } = await generateSimulatedProvingResult(privateExecutionResult, nonceGenerator, this.contractDataProvider));
                 } else {
+                    // Kernel logic, plus proving of all private functions and kernels.
                     ({ publicInputs, executionSteps } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                         simulate: true,
                         skipFeeEnforcement,
@@ -594,7 +600,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     }));
                 }
                 const privateSimulationResult = new PrivateSimulationResult(privateExecutionResult, publicInputs);
-                const simulatedTx = privateSimulationResult.toSimulatedTx();
+                const simulatedTx = await privateSimulationResult.toSimulatedTx();
                 let publicSimulationTime;
                 let publicOutput;
                 if (simulatePublic && publicInputs.forPublic) {
@@ -603,7 +609,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     publicSimulationTime = publicSimulationTimer.ms();
                 }
                 let validationTime;
-                if (!skipTxValidation && !skipKernels) {
+                if (!skipTxValidation) {
                     const validationTimer = new Timer();
                     const validationResult = await this.node.isValidTx(simulatedTx, {
                         isSimulation: true,
@@ -614,7 +620,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                         throw new Error('The simulated transaction is unable to be added to state and is invalid.');
                     }
                 }
-                const txHash = await simulatedTx.getTxHash();
+                const txHash = simulatedTx.getTxHash();
                 const totalTime = totalTimer.ms();
                 const perFunction = executionSteps.map(({ functionName, timings: { witgen, oracles } })=>({
                         functionName,
@@ -644,12 +650,12 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     nodeRPCCalls: simulatorStats.nodeRPCCalls
                 });
             } catch (err) {
-                throw this.#contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${overrides?.msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
+                throw this.#contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `skipTxValidation=${skipTxValidation}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
             }
         });
     }
     async sendTx(tx) {
-        const txHash = await tx.getTxHash();
+        const txHash = tx.getTxHash();
         if (await this.node.getTxEffect(txHash)) {
             throw new Error(`A settled tx with equal hash ${txHash.toString()} exists.`);
         }
@@ -731,9 +737,9 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         return Promise.resolve({
             pxeVersion: this.packageVersion,
             protocolContractAddresses: {
-                classRegisterer: ProtocolContractAddress.ContractClassRegisterer,
+                classRegistry: ProtocolContractAddress.ContractClassRegistry,
                 feeJuice: ProtocolContractAddress.FeeJuice,
-                instanceDeployer: ProtocolContractAddress.ContractInstanceDeployer,
+                instanceRegistry: ProtocolContractAddress.ContractInstanceRegistry,
                 multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint
             }
         });
@@ -776,4 +782,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     async resetNoteSyncData() {
         return await this.taggingDataProvider.resetNoteSyncData();
     }
+    stop() {
+        return this.jobQueue.end();
+    }
 }

package/dest/storage/capsule_data_provider/capsule_data_provider.js

@@ -17,7 +17,7 @@ export class CapsuleDataProvider {
     async loadCapsule(contractAddress, slot) {
         const dataBuffer = await this.#capsules.getAsync(dbSlotToKey(contractAddress, slot));
         if (!dataBuffer) {
-            this.logger.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
+            this.logger.trace(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
             return null;
         }
         const capsule = [];

package/dest/storage/note_data_provider/note_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB5D,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3E,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAkGvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA2DtF,OAAO;CAGd"}
+{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB5D,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3E,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA8FvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA2DtF,OAAO;CAkBd"}

package/dest/storage/note_data_provider/note_data_provider.js

@@ -154,7 +154,7 @@ export class NoteDataProvider {
             if (!await this.#scopes.hasAsync(formattedScopeString)) {
                 throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
             }
-            activeNoteIdsPerScope.push(filter.recipient ? await toArray(this.#notesByRecipientAndScope.get(formattedScopeString).getValuesAsync(filter.recipient.toString())) : filter.txHash ? await toArray(this.#notesByTxHashAndScope.get(formattedScopeString).getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#notesByContractAndScope.get(formattedScopeString).getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#notesByStorageSlotAndScope.get(formattedScopeString).getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#notesByRecipientAndScope.get(formattedScopeString).valuesAsync()));
+            activeNoteIdsPerScope.push(filter.recipient ? await toArray(this.#notesByRecipientAndScope.get(formattedScopeString).getValuesAsync(filter.recipient.toString())) : filter.txHash ? await toArray(this.#notesByTxHashAndScope.get(formattedScopeString).getValuesAsync(filter.txHash.toString())) : filter.storageSlot ? await toArray(this.#notesByStorageSlotAndScope.get(formattedScopeString).getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#notesByContractAndScope.get(formattedScopeString).getValuesAsync(filter.contractAddress.toString())));
         }
         candidateNoteSources.push({
             ids: new Set(activeNoteIdsPerScope.flat()),
@@ -162,7 +162,7 @@ export class NoteDataProvider {
         });
         if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
             candidateNoteSources.push({
-                ids: filter.recipient ? await toArray(this.#nullifiedNotesByRecipient.getValuesAsync(filter.recipient.toString())) : filter.txHash ? await toArray(this.#nullifiedNotesByTxHash.getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#nullifiedNotesByContract.getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#nullifiedNotesByStorageSlot.getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#nullifiedNotes.keysAsync()),
+                ids: filter.recipient ? await toArray(this.#nullifiedNotesByRecipient.getValuesAsync(filter.recipient.toString())) : filter.txHash ? await toArray(this.#nullifiedNotesByTxHash.getValuesAsync(filter.txHash.toString())) : filter.storageSlot ? await toArray(this.#nullifiedNotesByStorageSlot.getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#nullifiedNotesByContract.getValuesAsync(filter.contractAddress.toString())),
                 notes: this.#nullifiedNotes
             });
         }
@@ -174,7 +174,7 @@ export class NoteDataProvider {
                     continue;
                 }
                 const note = NoteDao.fromBuffer(serializedNote);
-                if (filter.contractAddress && !note.contractAddress.equals(filter.contractAddress)) {
+                if (!note.contractAddress.equals(filter.contractAddress)) {
                     continue;
                 }
                 if (filter.txHash && !note.txHash.equals(filter.txHash)) {
@@ -243,6 +243,18 @@ export class NoteDataProvider {
         });
     }
     async getSize() {
-        return (await this.getNotes({})).reduce((sum, note)=>sum + note.getSize(), 0);
+        const scopes = await toArray(this.#scopes.keysAsync());
+        const contractAddresses = new Set();
+        // Collect all unique contract addresses across all scopes
+        for (const scope of scopes){
+            const addresses = await toArray(this.#notesByContractAndScope.get(scope).keysAsync());
+            addresses.forEach((addr)=>contractAddresses.add(addr));
+        }
+        // Get all notes for each contract address
+        const allNotes = await Promise.all(Array.from(contractAddresses).map((addr)=>this.getNotes({
+                contractAddress: AztecAddress.fromString(addr)
+            })));
+        // Reduce all notes to get total size
+        return allNotes.flat().reduce((sum, note)=>sum + note.getSize(), 0);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -62,19 +62,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "1.2.1",
-    "@aztec/bb.js": "1.2.1",
-    "@aztec/builder": "1.2.1",
-    "@aztec/constants": "1.2.1",
-    "@aztec/ethereum": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/key-store": "1.2.1",
-    "@aztec/kv-store": "1.2.1",
-    "@aztec/noir-protocol-circuits-types": "1.2.1",
-    "@aztec/noir-types": "1.2.1",
-    "@aztec/protocol-contracts": "1.2.1",
-    "@aztec/simulator": "1.2.1",
-    "@aztec/stdlib": "1.2.1",
+    "@aztec/bb-prover": "2.0.0-nightly.20250813",
+    "@aztec/bb.js": "2.0.0-nightly.20250813",
+    "@aztec/builder": "2.0.0-nightly.20250813",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/key-store": "2.0.0-nightly.20250813",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250813",
+    "@aztec/noir-types": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/simulator": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
@@ -83,8 +83,8 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "1.2.1",
-    "@aztec/noir-test-contracts.js": "1.2.1",
+    "@aztec/merkle-tree": "2.0.0-nightly.20250813",
+    "@aztec/noir-test-contracts.js": "2.0.0-nightly.20250813",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/config/package_info.ts

@@ -1,3 +1,3 @@
 export function getPackageInfo() {
-  return { version: '1.2.0', name: '@aztec/pxe' };
+  return { version: '1.2.1', name: '@aztec/pxe' };
 }

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -37,7 +37,6 @@ import {
   PrivateToPublicAccumulatedData,
   PrivateToRollupAccumulatedData,
   PublicCallRequest,
-  RollupValidationRequests,
   ScopedLogHash,
 } from '@aztec/stdlib/kernel';
 import { PrivateLog } from '@aztec/stdlib/logs';
@@ -79,7 +78,10 @@ export class ContractFunctionSimulator {
    * @param request - The transaction request.
    * @param entryPointArtifact - The artifact of the entry point function.
    * @param contractAddress - The address of the contract (should match request.origin)
-   * @param msgSender - The address calling the function. This can be replaced to simulate a call from another contract or a specific account.
+   * @param msgSender - The address calling the function. This can be replaced to simulate a call from another contract
+   * or a specific account.
+   * @param senderForTags - The address that is used as a tagging sender when emitting private logs. Returned from
+   * the `privateGetSenderForTags` oracle.
    * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
    * @returns The result of the execution.
    */
@@ -88,6 +90,7 @@ export class ContractFunctionSimulator {
     contractAddress: AztecAddress,
     selector: FunctionSelector,
     msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE),
+    senderForTags?: AztecAddress,
     scopes?: AztecAddress[],
   ): Promise<PrivateExecutionResult> {
     const simulatorSetupTimer = new Timer();
@@ -131,15 +134,20 @@ export class ContractFunctionSimulator {
       noteCache,
       this.executionDataProvider,
       this.simulator,
-      /*totalPublicArgsCount=*/ 0,
+      0, // totalPublicArgsCount
       startSideEffectCounter,
-      undefined,
+      undefined, // log
       scopes,
+      senderForTags,
     );
 
     const setupTime = simulatorSetupTimer.ms();
 
     try {
+      // Note: any nested private function calls are made recursively within this
+      // function call. So this execution result is the result of executing _all_
+      // private functions of this tx (the results of those executions are contained
+      // within executionResult.nestedExecutionResults).
       const executionResult = await executePrivateFunction(
         this.simulator,
         privateExecutionOracle,
@@ -151,13 +159,15 @@ export class ContractFunctionSimulator {
       const { usedTxRequestHashForNonces } = noteCache.finish();
       const firstNullifierHint = usedTxRequestHashForNonces ? Fr.ZERO : noteCache.getAllNullifiers()[0];
 
-      const publicCallRequests = collectNested([executionResult], r => [
-        ...r.publicInputs.publicCallRequests.map(r => r.inner),
-        r.publicInputs.publicTeardownCallRequest,
-      ]).filter(r => !r.isEmpty());
+      const publicCallRequests = collectNested([executionResult], r =>
+        r.publicInputs.publicCallRequests
+          .getActiveItems()
+          .map(r => r.inner)
+          .concat(r.publicInputs.publicTeardownCallRequest.isEmpty() ? [] : [r.publicInputs.publicTeardownCallRequest]),
+      );
       const publicFunctionsCalldata = await Promise.all(
         publicCallRequests.map(async r => {
-          const calldata = await privateExecutionOracle.loadFromExecutionCache(r.calldataHash);
+          const calldata = await privateExecutionOracle.privateLoadFromExecutionCache(r.calldataHash);
           return new HashedValues(calldata, r.calldataHash);
         }),
       );
@@ -169,6 +179,9 @@ export class ContractFunctionSimulator {
         executionResult.profileResult.timings.witgen += setupTime + teardownTime;
       }
 
+      // Not to be confused with a PrivateCallExecutionResult. This is a superset
+      // of the PrivateCallExecutionResult, containing also firstNullifierHint
+      // and publicFunctionsCalldata.
       return new PrivateExecutionResult(executionResult, firstNullifierHint, publicFunctionsCalldata);
     } catch (err) {
       throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
@@ -258,7 +271,7 @@ export async function generateSimulatedProvingResult(
   nonceGenerator: Fr,
   contractDataProvider: ContractDataProvider,
 ): Promise<PrivateKernelExecutionProofOutput<PrivateKernelTailCircuitPublicInputs>> {
-  const uniqueNoteHashes: OrderedSideEffect<Fr>[] = [];
+  const siloedNoteHashes: OrderedSideEffect<Fr>[] = [];
   const nullifiers: OrderedSideEffect<Fr>[] = [];
   const taggedPrivateLogs: OrderedSideEffect<PrivateLog>[] = [];
   const l2ToL1Messages: OrderedSideEffect<ScopedL2ToL1Message>[] = [];
@@ -268,29 +281,27 @@ export async function generateSimulatedProvingResult(
 
   let publicTeardownCallRequest;
 
-  let noteHashIndexInTx = 0;
   const executions = [privateExecutionResult.entrypoint];
 
   while (executions.length !== 0) {
     const execution = executions.shift()!;
-    executions.unshift(...execution!.nestedExecutions);
+    executions.unshift(...execution!.nestedExecutionResults);
 
     const { contractAddress } = execution.publicInputs.callContext;
 
     const noteHashesFromExecution = await Promise.all(
       execution.publicInputs.noteHashes
+        .getActiveItems()
         .filter(noteHash => !noteHash.isEmpty())
-        .map(async noteHash => {
-          const nonce = await computeNoteHashNonce(nonceGenerator, noteHashIndexInTx++);
-          const siloedNoteHash = await siloNoteHash(contractAddress, noteHash.value);
-          // We could defer this to the public processor, and pass this in as non-revertible.
-          return new OrderedSideEffect(await computeUniqueNoteHash(nonce, siloedNoteHash), noteHash.counter);
-        }),
+        .map(
+          async noteHash =>
+            new OrderedSideEffect(await siloNoteHash(contractAddress, noteHash.value), noteHash.counter),
+        ),
     );
 
     const nullifiersFromExecution = await Promise.all(
       execution.publicInputs.nullifiers
-        .filter(nullifier => !nullifier.isEmpty())
+        .getActiveItems()
         .map(
           async nullifier =>
             new OrderedSideEffect(await siloNullifier(contractAddress, nullifier.value), nullifier.counter),
@@ -298,25 +309,23 @@ export async function generateSimulatedProvingResult(
     );
 
     const privateLogsFromExecution = await Promise.all(
-      execution.publicInputs.privateLogs
-        .filter(privateLog => !privateLog.isEmpty())
-        .map(async metadata => {
-          metadata.log.fields[0] = await poseidon2Hash([contractAddress, metadata.log.fields[0]]);
-          return new OrderedSideEffect(metadata.log, metadata.counter);
-        }),
+      execution.publicInputs.privateLogs.getActiveItems().map(async metadata => {
+        metadata.log.fields[0] = await poseidon2Hash([contractAddress, metadata.log.fields[0]]);
+        return new OrderedSideEffect(metadata.log, metadata.counter);
+      }),
     );
 
-    uniqueNoteHashes.push(...noteHashesFromExecution);
+    siloedNoteHashes.push(...noteHashesFromExecution);
     taggedPrivateLogs.push(...privateLogsFromExecution);
     nullifiers.push(...nullifiersFromExecution);
     l2ToL1Messages.push(
       ...execution.publicInputs.l2ToL1Msgs
-        .filter(l2ToL1Message => !l2ToL1Message.isEmpty())
+        .getActiveItems()
         .map(message => new OrderedSideEffect(message.message.scope(contractAddress), message.counter)),
     );
     contractClassLogsHashes.push(
       ...execution.publicInputs.contractClassLogsHashes
-        .filter(contractClassLogsHash => !contractClassLogsHash.isEmpty())
+        .getActiveItems()
         .map(
           contractClassLogHash =>
             new OrderedSideEffect(contractClassLogHash.logHash.scope(contractAddress), contractClassLogHash.counter),
@@ -324,7 +333,7 @@ export async function generateSimulatedProvingResult(
     );
     publicCallRequests.push(
       ...execution.publicInputs.publicCallRequests
-        .filter(publicCallRequest => !publicCallRequest.isEmpty())
+        .getActiveItems()
         .map(callRequest => new OrderedSideEffect(callRequest.inner, callRequest.counter)),
     );
 
@@ -363,14 +372,27 @@ export async function generateSimulatedProvingResult(
   const getEffect = <T>(orderedSideEffect: OrderedSideEffect<T>) => orderedSideEffect.sideEffect;
 
   const sortedNullifiers = nullifiers.sort(sortByCounter).map(getEffect);
+
+  // If the tx generated no nullifiers, the nonce generator (txRequest hash)
+  // is injected as the first nullifier as per protocol rules.
   if (sortedNullifiers.length === 0) {
     sortedNullifiers.push(nonceGenerator);
   }
 
   // Private only
   if (privateExecutionResult.publicFunctionCalldata.length === 0) {
+    // In case the tx only contains private functions, we must make the note hashes unique by using the
+    // nonce generator and their index in the tx.
+    const uniqueNoteHashes = await Promise.all(
+      siloedNoteHashes.sort(sortByCounter).map(async (orderedSideEffect, i) => {
+        const siloedNoteHash = orderedSideEffect.sideEffect;
+        const nonce = await computeNoteHashNonce(nonceGenerator, i);
+        const uniqueNoteHash = await computeUniqueNoteHash(nonce, siloedNoteHash);
+        return uniqueNoteHash;
+      }),
+    );
     const accumulatedDataForRollup = new PrivateToRollupAccumulatedData(
-      padArrayEnd(uniqueNoteHashes.sort(sortByCounter).map(getEffect), Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
+      padArrayEnd(uniqueNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
       padArrayEnd(sortedNullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX),
       padArrayEnd(
         l2ToL1Messages.sort(sortByCounter).map(getEffect),
@@ -387,8 +409,18 @@ export async function generateSimulatedProvingResult(
 
     inputsForRollup = new PartialPrivateTailPublicInputsForRollup(accumulatedDataForRollup);
   } else {
-    const accumulatedDataForPublic = new PrivateToPublicAccumulatedData(
-      padArrayEnd(uniqueNoteHashes.sort(sortByCounter).map(getEffect), Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
+    const nonRevertibleData = PrivateToPublicAccumulatedData.empty();
+
+    // The nullifier array contains the nonce generator in position 0
+    // Here we remove it from the revertible data and
+    // add it as the first non-revertible nullifier (we can't have dupes!)
+    // This is because public processor will use that first non-revertible nullifier
+    // as the nonce generator for the note hashes in the revertible part of the tx.
+    const [firstNullifier] = sortedNullifiers.splice(0, 1);
+    nonRevertibleData.nullifiers[0] = firstNullifier;
+
+    const revertibleData = new PrivateToPublicAccumulatedData(
+      padArrayEnd(siloedNoteHashes.sort(sortByCounter).map(getEffect), Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
       padArrayEnd(sortedNullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX),
       padArrayEnd(
         l2ToL1Messages.sort(sortByCounter).map(getEffect),
@@ -409,19 +441,17 @@ export async function generateSimulatedProvingResult(
     );
 
     inputsForPublic = new PartialPrivateTailPublicInputsForPublic(
-      // nonrevertible
-      accumulatedDataForPublic,
-      // revertible
-      PrivateToPublicAccumulatedData.empty(),
+      nonRevertibleData,
+      revertibleData,
       publicTeardownCallRequest ?? PublicCallRequest.empty(),
     );
   }
 
   const publicInputs = new PrivateKernelTailCircuitPublicInputs(
     constantData,
-    RollupValidationRequests.empty(),
     /*gasUsed=*/ new Gas(0, 0),
     /*feePayer=*/ AztecAddress.zero(),
+    /*includeByTimestamp=*/ 0n,
     hasPublicCalls ? inputsForPublic : undefined,
     !hasPublicCalls ? inputsForRollup : undefined,
   );

package/src/contract_function_simulator/index.ts

@@ -8,3 +8,4 @@ export { PrivateExecutionOracle } from './oracle/private_execution_oracle.js';
 export { Oracle } from './oracle/oracle.js';
 export { executePrivateFunction, extractPrivateCircuitPublicInputs } from './oracle/private_execution.js';
 export { generateSimulatedProvingResult } from './contract_function_simulator.js';
+export { packAsRetrievedNote } from './oracle/note_packing_utils.js';

package/src/contract_function_simulator/noir-structs/event_validation_request.ts

@@ -8,7 +8,7 @@ import { TxHash } from '@aztec/stdlib/tx';
 const MAX_EVENT_SERIALIZED_LEN = 12;
 
 /**
- * Intermediate struct used to perform batch event validation by PXE. The `validateEnqueuedNotesAndEvents` oracle
+ * Intermediate struct used to perform batch event validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
  * expects for values of this type to be stored in a `CapsuleArray`.
  */
 export class EventValidationRequest {

package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts

@@ -3,7 +3,7 @@ import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 
 /**
- * Intermediate struct used to perform batch log retrieval by PXE. The `bulkRetrieveLogs` oracle expects values of this
+ * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle expects values of this
  * type to be stored in a `CapsuleArray`.
  */
 export class LogRetrievalRequest {

package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts

@@ -6,7 +6,7 @@ import type { TxHash } from '@aztec/stdlib/tx';
 const MAX_LOG_CONTENT_LEN = Math.max(PUBLIC_LOG_PLAINTEXT_LEN, PRIVATE_LOG_CIPHERTEXT_LEN);
 
 /**
- * Intermediate struct used to perform batch log retrieval by PXE. The `bulkRetrieveLogs` oracle stores values of this
+ * Intermediate struct used to perform batch log retrieval by PXE. The `utilityBulkRetrieveLogs` oracle stores values of this
  * type in a `CapsuleArray`.
  */
 export class LogRetrievalResponse {

package/src/contract_function_simulator/noir-structs/note_validation_request.ts

@@ -7,7 +7,7 @@ import { TxHash } from '@aztec/stdlib/tx';
 const MAX_NOTE_PACKED_LEN = 12;
 
 /**
- * Intermediate struct used to perform batch note validation by PXE. The `validateEnqueuedNotesAndEvents` oracle
+ * Intermediate struct used to perform batch note validation by PXE. The `utilityValidateEnqueuedNotesAndEvents` oracle
  * expects for values of this type to be stored in a `CapsuleArray`.
  */
 export class NoteValidationRequest {

package/src/contract_function_simulator/oracle/note_packing_utils.ts

@@ -0,0 +1,52 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { Note } from '@aztec/stdlib/note';
+
+// TS equivalent of the `NoteMetadata::from_raw_data` function in `aztec/src/note/note_metadata.nr`
+function fromRawData(nonzeroNoteHashCounter: boolean, maybeNoteNonce: Fr): { stage: number; maybeNoteNonce: Fr } {
+  if (nonzeroNoteHashCounter) {
+    if (maybeNoteNonce.equals(Fr.ZERO)) {
+      return { stage: 1, maybeNoteNonce }; // PENDING_SAME_PHASE
+    } else {
+      return { stage: 2, maybeNoteNonce }; // PENDING_PREVIOUS_PHASE
+    }
+  } else if (!maybeNoteNonce.equals(Fr.ZERO)) {
+    return { stage: 3, maybeNoteNonce }; // SETTLED
+  } else {
+    throw new Error('Note has a zero note hash counter and no nonce - existence cannot be proven');
+  }
+}
+
+/**
+ * Packs a note in a format that is compatible with the default Packable implementation of the retrieved note.
+ *
+ * @dev Unlike the default Packable implementation, this function first constructs the note metadata from the inputs
+ * and only after that it packs the retrieved note. Hence it doesn't map one to one with `RetrievedNote::pack()`.
+ *
+ * @param contractAddress - The address of the contract that owns the note
+ * @param noteNonce - The nonce injected into the note hash preimage by kernels.
+ * @param index - Optional index in the note hash tree. If undefined, indicates a transient note
+ * @param note - The note content containing the actual note data
+ * @returns The packed note as an array of field elements
+ */
+export function packAsRetrievedNote({
+  contractAddress,
+  noteNonce,
+  index,
+  note,
+}: {
+  contractAddress: AztecAddress;
+  noteNonce: Fr;
+  index?: bigint;
+  note: Note;
+}) {
+  // If index is undefined, the note is transient which implies that the nonzero_note_hash_counter has to be true
+  const noteIsTransient = index === undefined;
+  const nonzeroNoteHashCounter = noteIsTransient ? true : false;
+
+  // To pack the note as retrieved note we first need to reconstruct the note metadata.
+  const noteMetadata = fromRawData(nonzeroNoteHashCounter, noteNonce);
+
+  // Pack metadata first (stage and maybe_note_nonce), followed by the rest
+  return [...note.items, contractAddress, new Fr(noteMetadata.stage), noteMetadata.maybeNoteNonce];
+}