Skip to content

feat: validate notes in a single node roundtrip #14650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nventuro merged 2 commits into from
Jun 2, 2025
Merged

feat: validate notes in a single node roundtrip #14650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c6a6e
feat: validate notes in a single node roundtrip
nventuro May 30, 2025
601d152
Merge branch 'master' into nv/single-trip-note-validation
nventuro Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions yarn-project/pxe/src/contract_function_simulator/pxe_oracle_interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,12 +641,13 @@ export class PXEOracleInterface implements ExecutionDataProvider {
const siloedNullifier = await siloNullifier(contractAddress, nullifier);

// We store notes by their index in the global note hash tree, which has the convenient side effect of validating
// note existence in said tree.
const [uniqueNoteHashTreeIndexInBlock] = await this.aztecNode.findLeavesIndexes(
syncedBlockNumber,
MerkleTreeId.NOTE_HASH_TREE,
[uniqueNoteHash],
);
// note existence in said tree. We concurrently also check if the note's nullifier exists, performing all node
// queries in a single round-trip.
const [[uniqueNoteHashTreeIndexInBlock], [nullifierIndex]] = await Promise.all([
this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [uniqueNoteHash]),
this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NULLIFIER_TREE, [siloedNullifier]),
]);

if (uniqueNoteHashTreeIndexInBlock === undefined) {
throw new Error(
`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present on the tree at block ${syncedBlockNumber} (from tx ${txHash})`,
Expand Down Expand Up @@ -676,9 +677,6 @@ export class PXEOracleInterface implements ExecutionDataProvider {
nullifier: noteDao.siloedNullifier.toString(),
});

const [nullifierIndex] = await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NULLIFIER_TREE, [
siloedNullifier,
]);
if (nullifierIndex !== undefined) {
const { data: _, ...blockHashAndNum } = nullifierIndex;
await this.noteDataProvider.removeNullifiedNotes([{ data: siloedNullifier, ...blockHashAndNum }], recipient);
Expand Down