Skip to content

fix(circuits.js): fix nullifier non existent hints #6346

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
fcarreiro merged 2 commits into from
May 10, 2024
Merged

fix(circuits.js): fix nullifier non existent hints #6346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9c3aed
fix(public-kernel): fix nullifier non existent hints
fcarreiro May 10, 2024
34cb2c9
fix test
fcarreiro May 10, 2024
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
4 changes: 3 additions & 1 deletion yarn-project/circuits.js/src/hints/build_nullifier_non_existent_read_request_hints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ describe('buildNullifierNonExistentReadRequestHints', () => {

nonExistentReadRequests[0] = makeReadRequest(innerNullifier(2));

await expect(() => buildHints()).rejects.toThrow('Nullifier exists in the pending set.');
await expect(() => buildHints()).rejects.toThrow(
'Nullifier DOES exists in the pending set at the time of reading, but there is a NonExistentReadRequest for it.',
);
});
});
9 changes: 7 additions & 2 deletions yarn-project/circuits.js/src/hints/build_nullifier_non_existent_read_request_hints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,13 @@ export async function buildNullifierNonExistentReadRequestHints(
let nextPendingValueIndex = sortedValues.findIndex(v => !v.value.lt(siloedValue));
if (nextPendingValueIndex == -1) {
nextPendingValueIndex = numPendingNullifiers;
} else if (sortedValues[nextPendingValueIndex].value.equals(siloedValue)) {
throw new Error('Nullifier exists in the pending set.');
} else if (
sortedValues[nextPendingValueIndex].value.equals(siloedValue) &&
sortedValues[nextPendingValueIndex].counter < readRequest.counter
) {
throw new Error(
'Nullifier DOES exists in the pending set at the time of reading, but there is a NonExistentReadRequest for it.',
);
}

builder.addHint(membershipWitness, leafPreimage, nextPendingValueIndex);
Expand Down