@aztec/pxe 0.0.1-commit.54489865 → 0.0.1-commit.592b9384

package/dest/storage/tagging_store/sender_tagging_store.js

@@ -1,4 +1,3 @@
-import { toArray } from '@aztec/foundation/iterable';
 import { TxHash } from '@aztec/stdlib/tx';
 import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.js';
 /**
@@ -53,27 +52,21 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
         return jobStagedLastFinalizedIndexes;
     }
     async #readPendingIndexes(jobId, secret) {
-        const jobStagedPendingIndexes = this.#getPendingIndexesForJob(jobId);
-        const pendingIndexes = jobStagedPendingIndexes.get(secret);
-        // We return the staged version of this if it exists, if not, we read from the DB.
-        // If the DB also has nothing, we return an empty array [].
-        return pendingIndexes !== undefined ? pendingIndexes : await this.#pendingIndexes.getAsync(secret) ?? [];
+        // Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
+        // are no pending read requests). The staged value still takes precedence if it exists.
+        const dbValue = await this.#pendingIndexes.getAsync(secret);
+        const staged = this.#getPendingIndexesForJob(jobId).get(secret);
+        return staged !== undefined ? staged : dbValue ?? [];
     }
     #writePendingIndexes(jobId, secret, pendingIndexes) {
         this.#getPendingIndexesForJob(jobId).set(secret, pendingIndexes);
     }
-    /**
-   * Returns a job view of all the secrets that have a corresponding list of pending indexes either in persistent
-   * storage or the current job.
-   */ async #readSecretsWithPendingIndexes(jobId) {
-        const storedSecrets = new Set(await toArray(this.#pendingIndexes.keysAsync()));
-        const stagedSecrets = this.#getPendingIndexesForJob(jobId).keys();
-        return [
-            ...storedSecrets.union(new Set(stagedSecrets))
-        ];
-    }
     async #readLastFinalizedIndex(jobId, secret) {
-        return this.#getLastFinalizedIndexesForJob(jobId).get(secret) ?? await this.#lastFinalizedIndexes.getAsync(secret);
+        // Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
+        // are no pending read requests). The staged value still takes precedence if it exists.
+        const dbValue = await this.#lastFinalizedIndexes.getAsync(secret);
+        const staged = this.#getLastFinalizedIndexesForJob(jobId).get(secret);
+        return staged ?? dbValue;
     }
     #writeLastFinalizedIndex(jobId, secret, lastFinalizedIndex) {
         this.#getLastFinalizedIndexesForJob(jobId).set(secret, lastFinalizedIndex);
@@ -127,49 +120,68 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
    * @throws If the newly stored pending index is lower than or equal to the last finalized index for the same secret.
    * This is enforced because this should never happen if the syncing is done correctly as we look for logs from higher
    * indexes than finalized ones.
-   */ async storePendingIndexes(preTags, txHash, jobId) {
+   */ storePendingIndexes(preTags, txHash, jobId) {
+        if (preTags.length === 0) {
+            return Promise.resolve();
+        }
         // The secrets in pre-tags should be unique because we always store just the highest index per given secret-txHash
         // pair. Below we check that this is the case.
         const secretsSet = new Set(preTags.map((preTag)=>preTag.secret.toString()));
         if (secretsSet.size !== preTags.length) {
-            throw new Error(`Duplicate secrets found when storing pending indexes`);
+            return Promise.reject(new Error(`Duplicate secrets found when storing pending indexes`));
         }
-        for (const { secret, index } of preTags){
-            // First we check that for any secret the highest used index in tx is not further than window length from
-            // the highest finalized index.
-            const finalizedIndex = await this.getLastFinalizedIndex(secret, jobId) ?? 0;
-            if (index > finalizedIndex + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN) {
-                throw new Error(`Highest used index ${index} is further than window length from the highest finalized index ${finalizedIndex}.
-          Tagging window length ${UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN} is configured too low. Contact the Aztec team
-          to increase it!`);
-            }
-            // Throw if the new pending index is lower than or equal to the last finalized index
-            const secretStr = secret.toString();
-            const lastFinalizedIndex = await this.#readLastFinalizedIndex(jobId, secretStr);
-            if (lastFinalizedIndex !== undefined && index <= lastFinalizedIndex) {
-                throw new Error(`Cannot store pending index ${index} for secret ${secretStr}: ` + `it is lower than or equal to the last finalized index ${lastFinalizedIndex}`);
-            }
-            // Check if this secret + txHash combination already exists
-            const txHashStr = txHash.toString();
-            const existingForSecret = await this.#readPendingIndexes(jobId, secretStr);
-            const existingForSecretAndTx = existingForSecret.find((entry)=>entry.txHash === txHashStr);
-            if (existingForSecretAndTx) {
-                // If it exists with a different index, throw an error
-                if (existingForSecretAndTx.index !== index) {
-                    throw new Error(`Cannot store index ${index} for secret ${secretStr} and txHash ${txHashStr}: ` + `a different index ${existingForSecretAndTx.index} already exists for this secret-txHash pair`);
+        const txHashStr = txHash.toString();
+        return this.#store.transactionAsync(async ()=>{
+            // Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
+            const preTagReadPromises = preTags.map(({ secret, index })=>{
+                const secretStr = secret.toString();
+                return {
+                    secret,
+                    secretStr,
+                    index,
+                    pending: this.#readPendingIndexes(jobId, secretStr),
+                    finalized: this.#readLastFinalizedIndex(jobId, secretStr)
+                };
+            });
+            // Await all reads together
+            const preTagData = await Promise.all(preTagReadPromises.map(async (item)=>({
+                    ...item,
+                    pendingData: await item.pending,
+                    finalizedIndex: await item.finalized
+                })));
+            // Process in memory and validate
+            for (const { secretStr, index, pendingData, finalizedIndex } of preTagData){
+                // First we check that for any secret the highest used index in tx is not further than window length from
+                // the highest finalized index.
+                if (index > (finalizedIndex ?? 0) + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN) {
+                    throw new Error(`Highest used index ${index} is further than window length from the highest finalized index ${finalizedIndex ?? 0}.
+            Tagging window length ${UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN} is configured too low. Contact the Aztec team
+            to increase it!`);
+                }
+                // Throw if the new pending index is lower than or equal to the last finalized index
+                if (finalizedIndex !== undefined && index <= finalizedIndex) {
+                    throw new Error(`Cannot store pending index ${index} for secret ${secretStr}: ` + `it is lower than or equal to the last finalized index ${finalizedIndex}`);
                 }
-            // If it exists with the same index, ignore the update (no-op)
-            } else {
-                // If it doesn't exist, add it
-                this.#writePendingIndexes(jobId, secretStr, [
-                    ...existingForSecret,
-                    {
-                        index,
-                        txHash: txHashStr
+                // Check if this secret + txHash combination already exists
+                const existingForSecretAndTx = pendingData.find((entry)=>entry.txHash === txHashStr);
+                if (existingForSecretAndTx) {
+                    // If it exists with a different index, throw an error
+                    if (existingForSecretAndTx.index !== index) {
+                        throw new Error(`Cannot store index ${index} for secret ${secretStr} and txHash ${txHashStr}: ` + `a different index ${existingForSecretAndTx.index} already exists for this secret-txHash pair`);
                     }
-                ]);
+                // If it exists with the same index, ignore the update (no-op)
+                } else {
+                    // If it doesn't exist, add it
+                    this.#writePendingIndexes(jobId, secretStr, [
+                        ...pendingData,
+                        {
+                            index,
+                            txHash: txHashStr
+                        }
+                    ]);
+                }
             }
-        }
+        });
     }
     /**
    * Returns the transaction hashes of all pending transactions that contain indexes within a specified range
@@ -179,100 +191,158 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
    * @param endIndex - The upper bound of the index range (exclusive).
    * @returns An array of unique transaction hashes for pending transactions that contain indexes in the range
    * [startIndex, endIndex). Returns an empty array if no pending indexes exist in the range.
-   */ async getTxHashesOfPendingIndexes(secret, startIndex, endIndex, jobId) {
-        const existing = await this.#readPendingIndexes(jobId, secret.toString());
-        const txHashes = existing.filter((entry)=>entry.index >= startIndex && entry.index < endIndex).map((entry)=>entry.txHash);
-        return Array.from(new Set(txHashes)).map(TxHash.fromString);
+   */ getTxHashesOfPendingIndexes(secret, startIndex, endIndex, jobId) {
+        return this.#store.transactionAsync(async ()=>{
+            const existing = await this.#readPendingIndexes(jobId, secret.toString());
+            const txHashes = existing.filter((entry)=>entry.index >= startIndex && entry.index < endIndex).map((entry)=>entry.txHash);
+            return Array.from(new Set(txHashes)).map(TxHash.fromString);
+        });
     }
     /**
    * Returns the last (highest) finalized index for a given secret.
    * @param secret - The secret to get the last finalized index for.
    * @returns The last (highest) finalized index for the given secret.
    */ getLastFinalizedIndex(secret, jobId) {
-        return this.#readLastFinalizedIndex(jobId, secret.toString());
+        return this.#store.transactionAsync(()=>this.#readLastFinalizedIndex(jobId, secret.toString()));
     }
     /**
    * Returns the last used index for a given directional app tagging secret, considering both finalized and pending
    * indexes.
    * @param secret - The directional app tagging secret to query the last used index for.
    * @returns The last used index.
-   */ async getLastUsedIndex(secret, jobId) {
+   */ getLastUsedIndex(secret, jobId) {
         const secretStr = secret.toString();
-        const pendingTxScopedIndexes = await this.#readPendingIndexes(jobId, secretStr);
-        const pendingIndexes = pendingTxScopedIndexes.map((entry)=>entry.index);
-        if (pendingTxScopedIndexes.length === 0) {
-            return this.#readLastFinalizedIndex(jobId, secretStr);
-        }
-        // As the last used index we return the highest one from the pending indexes. Note that this value will be always
-        // higher than the last finalized index because we prune lower pending indexes when a tx is finalized.
-        return Math.max(...pendingIndexes);
+        return this.#store.transactionAsync(async ()=>{
+            const pendingPromise = this.#readPendingIndexes(jobId, secretStr);
+            const finalizedPromise = this.#readLastFinalizedIndex(jobId, secretStr);
+            const [pendingTxScopedIndexes, lastFinalized] = await Promise.all([
+                pendingPromise,
+                finalizedPromise
+            ]);
+            const pendingIndexes = pendingTxScopedIndexes.map((entry)=>entry.index);
+            if (pendingTxScopedIndexes.length === 0) {
+                return lastFinalized;
+            }
+            // As the last used index we return the highest one from the pending indexes. Note that this value will be always
+            // higher than the last finalized index because we prune lower pending indexes when a tx is finalized.
+            return Math.max(...pendingIndexes);
+        });
     }
     /**
    * Drops all pending indexes corresponding to the given transaction hashes.
-   */ async dropPendingIndexes(txHashes, jobId) {
+   */ dropPendingIndexes(txHashes, jobId) {
         if (txHashes.length === 0) {
-            return;
+            return Promise.resolve();
         }
         const txHashStrings = new Set(txHashes.map((txHash)=>txHash.toString()));
-        const allSecrets = await this.#readSecretsWithPendingIndexes(jobId);
-        for (const secret of allSecrets){
-            const pendingData = await this.#readPendingIndexes(jobId, secret);
-            if (pendingData) {
-                const filtered = pendingData.filter((item)=>!txHashStrings.has(item.txHash));
-                if (filtered.length === 0) {
-                    this.#writePendingIndexes(jobId, secret, []);
-                } else if (filtered.length !== pendingData.length) {
-                    // Some items were filtered out, so update the pending data
-                    this.#writePendingIndexes(jobId, secret, filtered);
+        return this.#store.transactionAsync(async ()=>{
+            // Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
+            const secretReadPromises = new Map();
+            for await (const secret of this.#pendingIndexes.keysAsync()){
+                secretReadPromises.set(secret, this.#readPendingIndexes(jobId, secret));
+            }
+            // Add staged-only secrets (sync, no DB)
+            for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
+                if (!secretReadPromises.has(secret)) {
+                    secretReadPromises.set(secret, Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []));
                 }
-            // else: No items were filtered out (txHashes not found for this secret) --> no-op
             }
-        }
+            // Await all reads together
+            const secrets = [
+                ...secretReadPromises.keys()
+            ];
+            const pendingDataResults = await Promise.all(secretReadPromises.values());
+            // Process in memory
+            for(let i = 0; i < secrets.length; i++){
+                const secret = secrets[i];
+                const pendingData = pendingDataResults[i];
+                if (pendingData && pendingData.length > 0) {
+                    const filtered = pendingData.filter((item)=>!txHashStrings.has(item.txHash));
+                    if (filtered.length === 0) {
+                        this.#writePendingIndexes(jobId, secret, []);
+                    } else if (filtered.length !== pendingData.length) {
+                        // Some items were filtered out, so update the pending data
+                        this.#writePendingIndexes(jobId, secret, filtered);
+                    }
+                // else: No items were filtered out (txHashes not found for this secret) --> no-op
+                }
+            }
+        });
     }
     /**
    * Updates pending indexes corresponding to the given transaction hashes to be finalized and prunes any lower pending
    * indexes.
-   */ async finalizePendingIndexes(txHashes, jobId) {
+   */ finalizePendingIndexes(txHashes, jobId) {
         if (txHashes.length === 0) {
-            return;
+            return Promise.resolve();
         }
-        for (const txHash of txHashes){
-            const txHashStr = txHash.toString();
-            const allSecrets = await this.#readSecretsWithPendingIndexes(jobId);
-            for (const secret of allSecrets){
-                const pendingData = await this.#readPendingIndexes(jobId, secret);
-                if (!pendingData) {
-                    continue;
+        const txHashStrings = new Set(txHashes.map((tx)=>tx.toString()));
+        return this.#store.transactionAsync(async ()=>{
+            // Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
+            const secretDataPromises = new Map();
+            for await (const secret of this.#pendingIndexes.keysAsync()){
+                secretDataPromises.set(secret, {
+                    pending: this.#readPendingIndexes(jobId, secret),
+                    finalized: this.#readLastFinalizedIndex(jobId, secret)
+                });
+            }
+            // Add staged-only secrets (sync, no DB)
+            for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
+                if (!secretDataPromises.has(secret)) {
+                    secretDataPromises.set(secret, {
+                        pending: Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []),
+                        finalized: Promise.resolve(this.#getLastFinalizedIndexesForJob(jobId).get(secret))
+                    });
                 }
-                const matchingIndexes = pendingData.filter((item)=>item.txHash === txHashStr).map((item)=>item.index);
-                if (matchingIndexes.length === 0) {
+            }
+            // Await all reads together
+            const secrets = [
+                ...secretDataPromises.keys()
+            ];
+            const dataResults = await Promise.all(secrets.map(async (secret)=>({
+                    secret,
+                    pendingData: await secretDataPromises.get(secret).pending,
+                    lastFinalized: await secretDataPromises.get(secret).finalized
+                })));
+            // Process all txHashes for each secret in memory
+            for (const { secret, pendingData, lastFinalized } of dataResults){
+                if (!pendingData || pendingData.length === 0) {
                     continue;
                 }
-                if (matchingIndexes.length > 1) {
-                    // We should always just store the highest pending index for a given tx hash and secret because the lower
-                    // values are irrelevant.
-                    throw new Error(`Multiple pending indexes found for tx hash ${txHashStr} and secret ${secret}`);
+                let currentPending = pendingData;
+                let currentFinalized = lastFinalized;
+                // Process all txHashes for this secret
+                for (const txHashStr of txHashStrings){
+                    const matchingIndexes = currentPending.filter((item)=>item.txHash === txHashStr).map((item)=>item.index);
+                    if (matchingIndexes.length === 0) {
+                        continue;
+                    }
+                    if (matchingIndexes.length > 1) {
+                        // We should always just store the highest pending index for a given tx hash and secret because the lower
+                        // values are irrelevant.
+                        throw new Error(`Multiple pending indexes found for tx hash ${txHashStr} and secret ${secret}`);
+                    }
+                    const newFinalized = matchingIndexes[0];
+                    if (newFinalized < (currentFinalized ?? 0)) {
+                        // This should never happen because when last finalized index was finalized we should have pruned the lower
+                        // pending indexes.
+                        throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${currentFinalized}`);
+                    }
+                    currentFinalized = newFinalized;
+                    // When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
+                    // cannot control the order in which transactions are finalized, there may be pending indexes that are now
+                    // obsolete because they are lower than the most recently finalized index. For this reason, we prune these
+                    // outdated pending indexes.
+                    currentPending = currentPending.filter((item)=>item.index > currentFinalized);
                 }
-                let lastFinalized = await this.#readLastFinalizedIndex(jobId, secret);
-                const newFinalized = matchingIndexes[0];
-                if (newFinalized < (lastFinalized ?? 0)) {
-                    // This should never happen because when last finalized index was finalized we should have pruned the lower
-                    // pending indexes.
-                    throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${lastFinalized}`);
+                // Write final state if changed
+                if (currentFinalized !== lastFinalized) {
+                    this.#writeLastFinalizedIndex(jobId, secret, currentFinalized);
                 }
-                this.#writeLastFinalizedIndex(jobId, secret, newFinalized);
-                lastFinalized = newFinalized;
-                // When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
-                // cannot control the order in which transactions are finalized, there may be pending indexes that are now
-                // obsolete because they are lower than the most recently finalized index. For this reason, we prune these
-                // outdated pending indexes.
-                const remainingItemsOfHigherIndex = pendingData.filter((item)=>item.index > (lastFinalized ?? 0));
-                if (remainingItemsOfHigherIndex.length === 0) {
-                    this.#writePendingIndexes(jobId, secret, []);
-                } else {
-                    this.#writePendingIndexes(jobId, secret, remainingItemsOfHigherIndex);
+                if (currentPending !== pendingData) {
+                    this.#writePendingIndexes(jobId, secret, currentPending);
                 }
             }
-        }
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.0.1-commit.54489865",
+  "version": "0.0.1-commit.592b9384",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -61,19 +61,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.1-commit.54489865",
-    "@aztec/bb.js": "0.0.1-commit.54489865",
-    "@aztec/builder": "0.0.1-commit.54489865",
-    "@aztec/constants": "0.0.1-commit.54489865",
-    "@aztec/ethereum": "0.0.1-commit.54489865",
-    "@aztec/foundation": "0.0.1-commit.54489865",
-    "@aztec/key-store": "0.0.1-commit.54489865",
-    "@aztec/kv-store": "0.0.1-commit.54489865",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.54489865",
-    "@aztec/noir-types": "0.0.1-commit.54489865",
-    "@aztec/protocol-contracts": "0.0.1-commit.54489865",
-    "@aztec/simulator": "0.0.1-commit.54489865",
-    "@aztec/stdlib": "0.0.1-commit.54489865",
+    "@aztec/bb-prover": "0.0.1-commit.592b9384",
+    "@aztec/bb.js": "0.0.1-commit.592b9384",
+    "@aztec/builder": "0.0.1-commit.592b9384",
+    "@aztec/constants": "0.0.1-commit.592b9384",
+    "@aztec/ethereum": "0.0.1-commit.592b9384",
+    "@aztec/foundation": "0.0.1-commit.592b9384",
+    "@aztec/key-store": "0.0.1-commit.592b9384",
+    "@aztec/kv-store": "0.0.1-commit.592b9384",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.592b9384",
+    "@aztec/noir-types": "0.0.1-commit.592b9384",
+    "@aztec/protocol-contracts": "0.0.1-commit.592b9384",
+    "@aztec/simulator": "0.0.1-commit.592b9384",
+    "@aztec/stdlib": "0.0.1-commit.592b9384",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
@@ -82,8 +82,8 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "0.0.1-commit.54489865",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.54489865",
+    "@aztec/merkle-tree": "0.0.1-commit.592b9384",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.592b9384",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -73,7 +73,6 @@ import {
 } from '@aztec/stdlib/tx';
 
 import type { AddressStore } from '../storage/address_store/address_store.js';
-import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
 import type { CapsuleStore } from '../storage/capsule_store/capsule_store.js';
 import type { ContractStore } from '../storage/contract_store/contract_store.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
@@ -102,7 +101,6 @@ export class ContractFunctionSimulator {
     private keyStore: KeyStore,
     private addressStore: AddressStore,
     private aztecNode: AztecNode,
-    private anchorBlockStore: AnchorBlockStore,
     private senderTaggingStore: SenderTaggingStore,
     private recipientTaggingStore: RecipientTaggingStore,
     private senderAddressBookStore: SenderAddressBookStore,
@@ -183,7 +181,6 @@ export class ContractFunctionSimulator {
       this.keyStore,
       this.addressStore,
       this.aztecNode,
-      this.anchorBlockStore,
       this.senderTaggingStore,
       this.recipientTaggingStore,
       this.senderAddressBookStore,
@@ -279,7 +276,6 @@ export class ContractFunctionSimulator {
       this.keyStore,
       this.addressStore,
       this.aztecNode,
-      this.anchorBlockStore,
       this.recipientTaggingStore,
       this.senderAddressBookStore,
       this.capsuleStore,

package/src/contract_function_simulator/oracle/interfaces.ts

@@ -68,20 +68,20 @@ export interface IUtilityExecutionOracle {
   utilityGetKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest>;
   utilityGetContractInstance(address: AztecAddress): Promise<ContractInstance>;
   utilityGetNoteHashMembershipWitness(
-    blockHash: BlockHash,
-    leafValue: Fr,
+    anchorBlockHash: BlockHash,
+    noteHash: Fr,
   ): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined>;
-  utilityGetArchiveMembershipWitness(
+  utilityGetBlockHashMembershipWitness(
+    anchorBlockHash: BlockHash,
     blockHash: BlockHash,
-    leafValue: Fr,
   ): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined>;
   utilityGetNullifierMembershipWitness(
-    blockHash: BlockHash,
+    anchorBlockHash: BlockHash,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined>;
-  utilityGetPublicDataWitness(blockHash: BlockHash, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+  utilityGetPublicDataWitness(anchorBlockHash: BlockHash, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
   utilityGetLowNullifierMembershipWitness(
-    blockHash: BlockHash,
+    anchorBlockHash: BlockHash,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined>;
   utilityGetBlockHeader(blockNumber: BlockNumber): Promise<BlockHeader | undefined>;
@@ -111,7 +111,7 @@ export interface IUtilityExecutionOracle {
     secret: Fr,
   ): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
   utilityStorageRead(
-    blockHash: BlockHash,
+    anchorBlockHash: BlockHash,
     contractAddress: AztecAddress,
     startStorageSlot: Fr,
     numberOfElements: number,

package/src/contract_function_simulator/oracle/oracle.ts

@@ -138,29 +138,39 @@ export class Oracle {
   }
 
   async utilityGetNoteHashMembershipWitness(
-    [blockHash]: ACVMField[],
-    [leafValue]: ACVMField[],
+    [anchorBlockHash]: ACVMField[],
+    [noteHash]: ACVMField[],
   ): Promise<(ACVMField | ACVMField[])[]> {
-    const parsedBlockHash = BlockHash.fromString(blockHash);
-    const parsedLeafValue = Fr.fromString(leafValue);
+    const parsedAnchorBlockHash = BlockHash.fromString(anchorBlockHash);
+    const parsedNoteHash = Fr.fromString(noteHash);
 
-    const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(parsedBlockHash, parsedLeafValue);
+    const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(
+      parsedAnchorBlockHash,
+      parsedNoteHash,
+    );
     if (!witness) {
-      throw new Error(`Leaf ${leafValue} not found in the note hash tree at block hash ${parsedBlockHash.toString()}.`);
+      throw new Error(
+        `Note hash ${noteHash} not found in the note hash tree at anchor block hash ${parsedAnchorBlockHash.toString()}.`,
+      );
     }
     return witness.toNoirRepresentation();
   }
 
-  async utilityGetArchiveMembershipWitness(
+  async utilityGetBlockHashMembershipWitness(
+    [anchorBlockHash]: ACVMField[],
     [blockHash]: ACVMField[],
-    [leafValue]: ACVMField[],
   ): Promise<(ACVMField | ACVMField[])[]> {
+    const parsedAnchorBlockHash = BlockHash.fromString(anchorBlockHash);
     const parsedBlockHash = BlockHash.fromString(blockHash);
-    const parsedLeafValue = Fr.fromString(leafValue);
 
-    const witness = await this.handlerAsUtility().utilityGetArchiveMembershipWitness(parsedBlockHash, parsedLeafValue);
+    const witness = await this.handlerAsUtility().utilityGetBlockHashMembershipWitness(
+      parsedAnchorBlockHash,
+      parsedBlockHash,
+    );
     if (!witness) {
-      throw new Error(`Leaf ${leafValue} not found in the archive tree at block hash ${parsedBlockHash.toString()}.`);
+      throw new Error(
+        `Block hash ${parsedBlockHash.toString()} not found in the archive tree at anchor block ${parsedAnchorBlockHash.toString()}.`,
+      );
     }
     return witness.toNoirRepresentation();
   }

package/src/contract_function_simulator/oracle/private_execution_oracle.ts

@@ -33,7 +33,6 @@ import {
 import { ensureContractSynced } from '../../contract_sync/index.js';
 import { NoteService } from '../../notes/note_service.js';
 import type { AddressStore } from '../../storage/address_store/address_store.js';
-import type { AnchorBlockStore } from '../../storage/anchor_block_store/anchor_block_store.js';
 import type { CapsuleStore } from '../../storage/capsule_store/capsule_store.js';
 import type { ContractStore } from '../../storage/contract_store/contract_store.js';
 import type { NoteStore } from '../../storage/note_store/note_store.js';
@@ -89,7 +88,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
     keyStore: KeyStore,
     addressStore: AddressStore,
     aztecNode: AztecNode,
-    anchorBlockStore: AnchorBlockStore,
     private readonly senderTaggingStore: SenderTaggingStore,
     recipientTaggingStore: RecipientTaggingStore,
     senderAddressBookStore: SenderAddressBookStore,
@@ -113,7 +111,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
       keyStore,
       addressStore,
       aztecNode,
-      anchorBlockStore,
       recipientTaggingStore,
       senderAddressBookStore,
       capsuleStore,
@@ -364,7 +361,7 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
 
     const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
 
-    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
+    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
     const dbNotes = await noteService.getNotes(
       this.callContext.contractAddress,
       owner,
@@ -574,7 +571,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
       this.keyStore,
       this.addressStore,
       this.aztecNode,
-      this.anchorBlockStore,
       this.senderTaggingStore,
       this.recipientTaggingStore,
       this.senderAddressBookStore,