@aztec/simulator 0.69.1 → 0.71.0

package/dest/client/client_execution_context.d.ts

@@ -1,10 +1,11 @@
-import { type AuthWitness, type AztecNode, CountedContractClassLog, CountedPublicExecutionRequest, NoteAndSlot, type NoteStatus, type PrivateExecutionResult, PublicExecutionRequest, type UnencryptedL2Log } from '@aztec/circuit-types';
+import { type AuthWitness, type AztecNode, CountedContractClassLog, CountedPublicExecutionRequest, NoteAndSlot, type NoteStatus, type PrivateCallExecutionResult, PublicExecutionRequest, type UnencryptedL2Log } from '@aztec/circuit-types';
 import { type BlockHeader, CallContext, FunctionSelector, type TxContext } from '@aztec/circuits.js';
 import { type FunctionAbi, type NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type NoteData } from '../acvm/index.js';
-import { type PackedValuesCache } from '../common/packed_values_cache.js';
+import { type HashedValuesCache } from '../common/hashed_values_cache.js';
+import { type SimulationProvider } from '../server.js';
 import { type DBOracle } from './db_oracle.js';
 import { type ExecutionNoteCache } from './execution_note_cache.js';
 import { ViewDataOracle } from './view_data_oracle.js';
@@ -18,9 +19,10 @@ export declare class ClientExecutionContext extends ViewDataOracle {
     private readonly callContext;
     /** Header of a block whose state is used during private execution (not the block the transaction is included in). */
     protected readonly historicalHeader: BlockHeader;
-    private readonly packedValuesCache;
+    private readonly executionCache;
     private readonly noteCache;
     private node;
+    private provider;
     protected sideEffectCounter: number;
     /**
      * New notes created during this execution.
@@ -49,7 +51,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
     /** Header of a block whose state is used during private execution (not the block the transaction is included in). */
     historicalHeader: BlockHeader, 
     /** List of transient auth witnesses to be used during this simulation */
-    authWitnesses: AuthWitness[], packedValuesCache: PackedValuesCache, noteCache: ExecutionNoteCache, db: DBOracle, node: AztecNode, sideEffectCounter?: number, log?: import("@aztec/foundation/log").Logger, scopes?: AztecAddress[]);
+    authWitnesses: AuthWitness[], executionCache: HashedValuesCache, noteCache: ExecutionNoteCache, db: DBOracle, node: AztecNode, provider: SimulationProvider, sideEffectCounter?: number, log?: import("@aztec/foundation/log").Logger, scopes?: AztecAddress[]);
     /**
      * Writes the function inputs to the initial witness.
      * @param abi - The function ABI.
@@ -73,7 +75,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
     /**
      * Return the nested execution results during this execution.
      */
-    getNestedExecutions(): PrivateExecutionResult[];
+    getNestedExecutions(): PrivateCallExecutionResult[];
     /**
      * Return the enqueued public function calls during this execution.
      */
@@ -83,20 +85,22 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      */
     getPublicTeardownFunctionCall(): PublicExecutionRequest;
     /**
-     * Pack the given array of arguments.
-     * @param args - Arguments to pack
+     * Store values in the execution cache.
+     * @param values - Values to store.
      */
-    packArgumentsArray(args: Fr[]): Promise<Fr>;
+    storeArrayInExecutionCache(args: Fr[]): Promise<Fr>;
     /**
-     * Pack the given returns.
-     * @param returns - Returns to pack
+     * Store values in the execution cache.
+     * @param values - Values to store.
+     * @returns The hash of the values.
      */
-    packReturns(returns: Fr[]): Promise<Fr>;
+    storeInExecutionCache(values: Fr[]): Promise<Fr>;
     /**
-     * Unpack the given returns.
-     * @param returnsHash - Returns hash to unpack
+     * Gets values from the execution cache.
+     * @param hash - Hash of the values.
+     * @returns The values.
      */
-    unpackReturns(returnsHash: Fr): Promise<Fr[]>;
+    loadFromExecutionCache(hash: Fr): Promise<Fr[]>;
     /**
      * Gets some notes for a storage slot.
      *
@@ -136,6 +140,13 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      * @param noteHash - A hash of the new note.
      */
     notifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number): Promise<void>;
+    /**
+     * Adding a siloed nullifier into the current set of all pending nullifiers created
+     * within the current transaction/execution.
+     * @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
+     * @param noteHash - A hash of the new note.
+     */
+    notifyCreatedNullifier(innerNullifier: Fr): Promise<void>;
     /**
      * Emit a contract class unencrypted log.
      * This fn exists because sha hashing the preimage
@@ -148,7 +159,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      * Calls a private function as a nested execution.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The execution result.
@@ -161,7 +172,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      * Creates a PublicExecutionRequest object representing the request to call a public function.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.
@@ -173,7 +184,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      * of the execution are empty.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.
@@ -185,7 +196,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
      * of the execution are empty.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.

package/dest/client/client_execution_context.d.ts.map

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

package/dest/client/client_execution_context.js

@@ -19,16 +19,17 @@ export class ClientExecutionContext extends ViewDataOracle {
     /** Header of a block whose state is used during private execution (not the block the transaction is included in). */
     historicalHeader, 
     /** List of transient auth witnesses to be used during this simulation */
-    authWitnesses, packedValuesCache, noteCache, db, node, sideEffectCounter = 0, log = createLogger('simulator:client_execution_context'), scopes) {
+    authWitnesses, executionCache, noteCache, db, node, provider, sideEffectCounter = 0, log = createLogger('simulator:client_execution_context'), scopes) {
         super(callContext.contractAddress, authWitnesses, db, node, log, scopes);
         _ClientExecutionContext_instances.add(this);
         this.argsHash = argsHash;
         this.txContext = txContext;
         this.callContext = callContext;
         this.historicalHeader = historicalHeader;
-        this.packedValuesCache = packedValuesCache;
+        this.executionCache = executionCache;
         this.noteCache = noteCache;
         this.node = node;
+        this.provider = provider;
         this.sideEffectCounter = sideEffectCounter;
         /**
          * New notes created during this execution.
@@ -63,7 +64,7 @@ export class ClientExecutionContext extends ViewDataOracle {
      */
     getInitialWitness(abi) {
         const argumentsSize = countArgumentsSize(abi);
-        const args = this.packedValuesCache.unpack(this.argsHash);
+        const args = this.executionCache.getPreimage(this.argsHash);
         if (args.length !== argumentsSize) {
             throw new Error('Invalid arguments size');
         }
@@ -116,25 +117,27 @@ export class ClientExecutionContext extends ViewDataOracle {
         return this.publicTeardownFunctionCall;
     }
     /**
-     * Pack the given array of arguments.
-     * @param args - Arguments to pack
+     * Store values in the execution cache.
+     * @param values - Values to store.
      */
-    packArgumentsArray(args) {
-        return Promise.resolve(this.packedValuesCache.pack(args));
+    storeArrayInExecutionCache(args) {
+        return Promise.resolve(this.executionCache.store(args));
     }
     /**
-     * Pack the given returns.
-     * @param returns - Returns to pack
+     * Store values in the execution cache.
+     * @param values - Values to store.
+     * @returns The hash of the values.
      */
-    packReturns(returns) {
-        return Promise.resolve(this.packedValuesCache.pack(returns));
+    storeInExecutionCache(values) {
+        return Promise.resolve(this.executionCache.store(values));
     }
     /**
-     * Unpack the given returns.
-     * @param returnsHash - Returns hash to unpack
+     * Gets values from the execution cache.
+     * @param hash - Hash of the values.
+     * @returns The values.
      */
-    unpackReturns(returnsHash) {
-        return Promise.resolve(this.packedValuesCache.unpack(returnsHash));
+    loadFromExecutionCache(hash) {
+        return Promise.resolve(this.executionCache.getPreimage(hash));
     }
     /**
      * Gets some notes for a storage slot.
@@ -222,6 +225,16 @@ export class ClientExecutionContext extends ViewDataOracle {
         }
         return Promise.resolve();
     }
+    /**
+     * Adding a siloed nullifier into the current set of all pending nullifiers created
+     * within the current transaction/execution.
+     * @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
+     * @param noteHash - A hash of the new note.
+     */
+    notifyCreatedNullifier(innerNullifier) {
+        this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
+        return Promise.resolve();
+    }
     /**
      * Emit a contract class unencrypted log.
      * This fn exists because sha hashing the preimage
@@ -239,7 +252,7 @@ export class ClientExecutionContext extends ViewDataOracle {
      * Calls a private function as a nested execution.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The execution result.
@@ -250,8 +263,8 @@ export class ClientExecutionContext extends ViewDataOracle {
         const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
         const derivedTxContext = this.txContext.clone();
         const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
-        const context = new ClientExecutionContext(argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.packedValuesCache, this.noteCache, this.db, this.node, sideEffectCounter, this.log, this.scopes);
-        const childExecutionResult = await executePrivateFunction(context, targetArtifact, targetContractAddress, functionSelector);
+        const context = new ClientExecutionContext(argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.executionCache, this.noteCache, this.db, this.node, this.provider, sideEffectCounter, this.log, this.scopes);
+        const childExecutionResult = await executePrivateFunction(this.provider, context, targetArtifact, targetContractAddress, functionSelector);
         if (isStaticCall) {
             __classPrivateFieldGet(this, _ClientExecutionContext_instances, "m", _ClientExecutionContext_checkValidStaticCall).call(this, childExecutionResult);
         }
@@ -266,7 +279,7 @@ export class ClientExecutionContext extends ViewDataOracle {
      * Creates a PublicExecutionRequest object representing the request to call a public function.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.
@@ -274,7 +287,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     async createPublicExecutionRequest(callType, targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
         const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
         const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
-        const args = this.packedValuesCache.unpack(argsHash);
+        const args = this.executionCache.getPreimage(argsHash);
         this.log.verbose(`Created ${callType} public execution request to ${targetArtifact.name}@${targetContractAddress}`, {
             sideEffectCounter,
             isStaticCall,
@@ -299,7 +312,7 @@ export class ClientExecutionContext extends ViewDataOracle {
      * of the execution are empty.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.
@@ -307,13 +320,13 @@ export class ClientExecutionContext extends ViewDataOracle {
     async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
         // WARNING: This is insecure and should be temporary!
-        // The oracle repacks the arguments and returns a new args_hash.
+        // The oracle re-hashes the arguments and returns a new args_hash.
         // new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
         // We don't validate or compute it in the circuit because a) it's harder to do with slices, and
         // b) this is only temporary.
-        const newArgsHash = this.packedValuesCache.pack([
+        const newArgsHash = this.executionCache.store([
             functionSelector.toField(),
-            ...this.packedValuesCache.unpack(argsHash),
+            ...this.executionCache.getPreimage(argsHash),
         ]);
         await this.createPublicExecutionRequest('enqueued', targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), newArgsHash, sideEffectCounter, isStaticCall);
         return newArgsHash;
@@ -324,7 +337,7 @@ export class ClientExecutionContext extends ViewDataOracle {
      * of the execution are empty.
      * @param targetContractAddress - The address of the contract to call.
      * @param functionSelector - The function selector of the function to call.
-     * @param argsHash - The packed arguments to pass to the function.
+     * @param argsHash - The arguments hash to pass to the function.
      * @param sideEffectCounter - The side effect counter at the start of the call.
      * @param isStaticCall - Whether the call is a static call.
      * @returns The public call stack item with the request information.
@@ -332,13 +345,13 @@ export class ClientExecutionContext extends ViewDataOracle {
     async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
         // WARNING: This is insecure and should be temporary!
-        // The oracle repacks the arguments and returns a new args_hash.
+        // The oracle rehashes the arguments and returns a new args_hash.
         // new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
         // We don't validate or compute it in the circuit because a) it's harder to do with slices, and
         // b) this is only temporary.
-        const newArgsHash = this.packedValuesCache.pack([
+        const newArgsHash = this.executionCache.store([
             functionSelector.toField(),
-            ...this.packedValuesCache.unpack(argsHash),
+            ...this.executionCache.getPreimage(argsHash),
         ]);
         await this.createPublicExecutionRequest('teardown', targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), newArgsHash, sideEffectCounter, isStaticCall);
         return newArgsHash;
@@ -379,4 +392,4 @@ _ClientExecutionContext_instances = new WeakSet(), _ClientExecutionContext_check
         throw new Error(`Static call cannot update the state, emit L2->L1 messages or generate logs`);
     }
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}

package/dest/client/db_oracle.d.ts

@@ -1,4 +1,4 @@
-import { type L2Block, type L2BlockNumber, type MerkleTreeId, type NoteStatus, type NullifierMembershipWitness, type PublicDataWitness, type TxScopedL2Log } from '@aztec/circuit-types';
+import { type L2Block, type MerkleTreeId, type NoteStatus, type NullifierMembershipWitness, type PublicDataWitness, type TxScopedL2Log } from '@aztec/circuit-types';
 import { type BlockHeader, type CompleteAddress, type ContractInstance, type IndexedTaggingSecret, type KeyValidationRequest } from '@aztec/circuits.js';
 import { type FunctionArtifact, type FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -103,21 +103,13 @@ export interface DBOracle extends CommitmentsDB {
      */
     getBlockHeader(): Promise<BlockHeader>;
     /**
-     * Fetch the index of the leaf in the respective tree
-     * @param blockNumber - The block number at which to get the leaf index.
-     * @param treeId - The id of the tree to search.
-     * @param leafValue - The leaf value buffer.
-     * @returns - The index of the leaf. Undefined if it does not exist in the tree.
+     * Fetches the index and sibling path of a leaf at a given block from a given tree.
+     * @param blockNumber - The block number at which to get the membership witness.
+     * @param treeId - Id of the tree to get the sibling path from.
+     * @param leafValue - The leaf value
+     * @returns The index and sibling path concatenated [index, sibling_path]
      */
-    findLeafIndex(blockNumber: L2BlockNumber, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
-    /**
-     * Fetch the sibling path of the leaf in the respective tree
-     * @param blockNumber - The block number at which to get the sibling path.
-     * @param treeId - The id of the tree to search.
-     * @param leafIndex - The index of the leaf.
-     * @returns - The sibling path of the leaf.
-     */
-    getSiblingPath(blockNumber: number, treeId: MerkleTreeId, leafIndex: bigint): Promise<Fr[]>;
+    getMembershipWitness(blockNumber: number, treeId: MerkleTreeId, leafValue: Fr): Promise<Fr[]>;
     /**
      * Returns a nullifier membership witness for a given nullifier at a given block.
      * @param blockNumber - The block number at which to get the index.
@@ -169,7 +161,7 @@ export interface DBOracle extends CommitmentsDB {
      */
     incrementAppTaggingSecretIndexAsSender(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress): Promise<void>;
     /**
-     * Synchronizes the logs tagged with the recipient's address and all the senders in the addressbook.
+     * Synchronizes the logs tagged with the recipient's address and all the senders in the address book.
      * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
      * @param contractAddress - The address of the contract that the logs are tagged for
      * @param recipient - The address of the recipient
@@ -182,9 +174,56 @@ export interface DBOracle extends CommitmentsDB {
      * @param recipient - The recipient of the logs.
      */
     processTaggedLogs(logs: TxScopedL2Log[], recipient: AztecAddress): Promise<void>;
+    /**
+     * Delivers the preimage and metadata of a committed note so that it can be later requested via the `getNotes`
+     * oracle.
+     *
+     * @param contractAddress - The address of the contract that created the note (i.e. the siloing contract)
+     * @param storageSlot - The storage slot of the note - used for indexing in `getNotes`
+     * @param nonce - The nonce of the note used by the kernel to compute the unique note hash
+     * @param content - The note's content: this is the primary item to return in `getNotes`
+     * @param noteHash - The non-unique non-siloed note hash
+     * @param nullifier - The inner (non-siloed) note nullifier
+     * @param txHash - The transaction in which the note was added to the note hash tree
+     * @param recipient - The account that discovered the note
+     */
+    deliverNote(contractAddress: AztecAddress, storageSlot: Fr, nonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: Fr, recipient: AztecAddress): Promise<void>;
     /**
      * Removes all of a contract's notes that have been nullified from the note database.
      */
     removeNullifiedNotes(contractAddress: AztecAddress): Promise<void>;
+    /**
+     * Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `dbLoad`.
+     * * If data was already stored at this slot, it is overwrriten.
+     * @param contractAddress - The contract address to scope the data under.
+     * @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
+     * @param values - The data to store.
+     */
+    dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void>;
+    /**
+     * Returns data previously stored via `dbStore` in the per-contract non-volatile database.
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param slot - The slot in the database to read.
+     * @returns The stored data or `null` if no data is stored under the slot.
+     */
+    dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
+    /**
+     * Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param slot - The slot in the database to delete.
+     */
+    dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void>;
+    /**
+     * Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
+     * structures by avoiding repeated calls to `dbLoad` and `dbStore`.
+     * Supports overlapping source and destination regions (which will result in the overlapped source values being
+     * overwritten). All copied slots must exist in the database (i.e. have been stored and not deleted)
+     *
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param srcSlot - The first slot to copy from.
+     * @param dstSlot - The first slot to copy to.
+     * @param numEntries - The number of entries to copy.
+     */
+    dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
 }
 //# sourceMappingURL=db_oracle.d.ts.map

package/dest/client/db_oracle.d.ts.map

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

package/dest/client/db_oracle.js

@@ -14,4 +14,4 @@ export class ContractClassNotFoundError extends Error {
         super(`DB has no contract class with id ${contractClassId}`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGJfb3JhY2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9kYl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBdUJBOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHFCQUFzQixTQUFRLEtBQUs7SUFDOUMsWUFBWSxlQUF1QjtRQUNqQyxLQUFLLENBQUMsbUNBQW1DLGVBQWUsRUFBRSxDQUFDLENBQUM7SUFDOUQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTJCLFNBQVEsS0FBSztJQUNuRCxZQUFZLGVBQXVCO1FBQ2pDLEtBQUssQ0FBQyxvQ0FBb0MsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUMvRCxDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGJfb3JhY2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9kYl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBc0JBOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHFCQUFzQixTQUFRLEtBQUs7SUFDOUMsWUFBWSxlQUF1QjtRQUNqQyxLQUFLLENBQUMsbUNBQW1DLGVBQWUsRUFBRSxDQUFDLENBQUM7SUFDOUQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTJCLFNBQVEsS0FBSztJQUNuRCxZQUFZLGVBQXVCO1FBQ2pDLEtBQUssQ0FBQyxvQ0FBb0MsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUMvRCxDQUFDO0NBQ0YifQ==

package/dest/client/execution_note_cache.d.ts

@@ -11,7 +11,7 @@ interface PendingNote {
  */
 export declare class ExecutionNoteCache {
     #private;
-    private readonly txHash;
+    private readonly txRequestHash;
     /**
      * New notes created in this transaction.
      * They are pushed to this array in the same order as they are emitted.
@@ -22,15 +22,31 @@ export declare class ExecutionNoteCache {
      */
     private noteMap;
     /**
-     * The list of nullifiers created in this transaction.
-     * This mapping maps from a contract address to the nullifiers emitted from the contract.
+     * This maps from a contract address to the nullifiers emitted from the contract.
      * The note which is nullified might be new or not (i.e., was generated in a previous transaction).
      * Note that their value (bigint representation) is used because Frs cannot be looked up in Sets.
      */
     private nullifierMap;
+    /**
+     * All nullifiers emitted in this transaction.
+     */
+    private allNullifiers;
     private minRevertibleSideEffectCounter;
-    constructor(txHash: Fr);
+    private inRevertiblePhase;
+    /**
+     * We don't need to use the tx request hash for nonces if another non revertible nullifier is emitted.
+     * In that case we disable injecting the tx request hash as a nullifier.
+     */
+    private usedTxRequestHashForNonces;
+    constructor(txRequestHash: Fr);
+    /**
+     * Enters the revertible phase of the transaction.
+     * @param minRevertibleSideEffectCounter - The counter at which the transaction enters the revertible phase.
+     */
     setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): void;
+    finish(): {
+        usedTxRequestHashForNonces: boolean;
+    };
     /**
      * Add a new note to cache.
      * @param note - New note created during execution.
@@ -44,6 +60,12 @@ export declare class ExecutionNoteCache {
      * transaction (and thus not a new note).
      */
     nullifyNote(contractAddress: AztecAddress, innerNullifier: Fr, noteHash: Fr): number | undefined;
+    /**
+     * Adds a nullifier to the cache. Note cache needs to track all nullifiers to decide which nullifier to use for note siloing.
+     * @param contractAddress - Contract address that emitted the nullifier.
+     * @param innerNullifier
+     */
+    nullifierCreated(contractAddress: AztecAddress, innerNullifier: Fr): void;
     /**
      * Return notes created up to current point in execution.
      * If a nullifier for a note in this list is emitted, the note will be deleted.
@@ -65,6 +87,7 @@ export declare class ExecutionNoteCache {
     getNullifiers(contractAddress: AztecAddress): Set<bigint>;
     getAllNotes(): PendingNote[];
     getAllNullifiers(): Fr[];
+    recordNullifier(contractAddress: AztecAddress, siloedNullifier: Fr): void;
 }
 export {};
 //# sourceMappingURL=execution_note_cache.d.ts.map

package/dest/client/execution_note_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/client/execution_note_cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;IAqBjB,OAAO,CAAC,QAAQ,CAAC,MAAM;IApBnC;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAqB;IAClC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAyC;IAExD;;;;;OAKG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D,OAAO,CAAC,8BAA8B,CAAK;gBAEd,MAAM,EAAE,EAAE;IAEhC,iCAAiC,CAAC,8BAA8B,EAAE,MAAM;IA4B/E;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;IAWjD;;;;;;OAMG;IACI,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IAuBlF;;;;;QAKI;IACG,QAAQ,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;IAK9D;;;;;QAKI;IACG,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAKlE;;;OAGG;IACI,aAAa,CAAC,eAAe,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;IAYhE,WAAW,IAAI,WAAW,EAAE;IAI5B,gBAAgB,IAAI,EAAE,EAAE;CAKzB"}
+{"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/client/execution_note_cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;IAiCjB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAhC1C;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAqB;IAClC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAyC;IAExD;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D;;OAEG;IACH,OAAO,CAAC,aAAa,CAA0B;IAE/C,OAAO,CAAC,8BAA8B,CAAK;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAElC;;;OAGG;IACH,OAAO,CAAC,0BAA0B,CAAQ;gBAEb,aAAa,EAAE,EAAE;IAE9C;;;OAGG;IACI,iCAAiC,CAAC,8BAA8B,EAAE,MAAM;IAmCxE,MAAM;;;IAWb;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;IAWjD;;;;;;OAMG;IACI,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IA2BlF;;;;OAIG;IACI,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;IAKzE;;;;;QAKI;IACG,QAAQ,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;IAK9D;;;;;QAKI;IACG,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAKlE;;;OAGG;IACI,aAAa,CAAC,eAAe,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;IAYhE,WAAW,IAAI,WAAW,EAAE;IAI5B,gBAAgB,IAAI,EAAE,EAAE;IAIxB,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE;CAMnE"}