-
Notifications
You must be signed in to change notification settings - Fork 562
fix(circuits)!: Ensure global uniqueness of side effect counters #18679
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.
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
Open
sirasistant
wants to merge
5
commits into
next
Choose a base branch
from
arv/fix_counters
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
1,078 changes: 936 additions & 142 deletions
1,078
noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml
Large diffs are not rendered by default.
Oops, something went wrong.
1,290 changes: 1,042 additions & 248 deletions
1,290
noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Prover.toml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 0 additions & 62 deletions
62
...circuits/crates/private-kernel-lib/src/accumulated_data/validate_incrementing_counters.nr
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
202 changes: 202 additions & 0 deletions
202
...te-kernel-lib/src/components/private_call_data_validator/validate_side_effect_counters.nr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| use types::{ | ||
| abis::{ | ||
| private_call_request::PrivateCallRequest, | ||
| private_circuit_public_inputs::PrivateCircuitPublicInputs, | ||
| private_kernel::private_call_data::{SideEffectCounterRange, SideEffectUniquenessHints}, | ||
| }, | ||
| constants::{ | ||
| GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET, GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET, | ||
| GLOBAL_INDEX_NOTE_HASH_OFFSET, GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET, | ||
| GLOBAL_INDEX_NULLIFIER_OFFSET, GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET, | ||
| GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET, GLOBAL_INDEX_PRIVATE_LOG_OFFSET, | ||
| GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET, TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL, | ||
| }, | ||
| side_effect::Ordered, | ||
| utils::arrays::ClaimedLengthArray, | ||
| }; | ||
|
|
||
| // Tested in tests/private_call_data_validator_builder/validate_side_effect_counters.nr | ||
| pub fn validate_unique_and_within_bounds_side_effect_counters( | ||
| public_inputs: PrivateCircuitPublicInputs, | ||
| side_effect_sorting_hints: SideEffectUniquenessHints, | ||
| ) { | ||
| let side_effect_ranges = side_effect_sorting_hints.side_effect_ranges; | ||
|
|
||
| let total_side_effects = public_inputs.note_hash_read_requests.length | ||
| + public_inputs.nullifier_read_requests.length | ||
| + public_inputs.note_hashes.length | ||
| + public_inputs.nullifiers.length | ||
| + public_inputs.private_call_requests.length | ||
| + public_inputs.public_call_requests.length | ||
| + public_inputs.l2_to_l1_msgs.length | ||
| + public_inputs.private_logs.length | ||
| + public_inputs.contract_class_logs_hashes.length; | ||
|
|
||
| validate_side_effect_range( | ||
| public_inputs.note_hash_read_requests, | ||
| side_effect_sorting_hints.note_hash_read_request_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.nullifier_read_requests, | ||
| side_effect_sorting_hints.nullifier_read_request_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.note_hashes, | ||
| side_effect_sorting_hints.note_hashes_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_NOTE_HASH_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.nullifiers, | ||
| side_effect_sorting_hints.nullifiers_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_NULLIFIER_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range_for_call_request( | ||
| public_inputs.private_call_requests, | ||
| side_effect_sorting_hints.private_call_requests_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_PRIVATE_CALL_REQUEST_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.public_call_requests, | ||
| side_effect_sorting_hints.public_call_requests_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.l2_to_l1_msgs, | ||
| side_effect_sorting_hints.l2_to_l1_msgs_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.private_logs, | ||
| side_effect_sorting_hints.private_logs_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_PRIVATE_LOG_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
| validate_side_effect_range( | ||
| public_inputs.contract_class_logs_hashes, | ||
| side_effect_sorting_hints.contract_class_logs_hashes_indices, | ||
| side_effect_ranges, | ||
| GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET, | ||
| total_side_effects, | ||
| ); | ||
|
|
||
| let counter_start = public_inputs.start_side_effect_counter; | ||
| let counter_end = public_inputs.end_side_effect_counter; | ||
|
|
||
| assert(counter_start < counter_end, "private call has incorrect counter range"); | ||
|
|
||
| validate_increasing_ranges( | ||
| side_effect_ranges, | ||
| total_side_effects, | ||
| counter_start, | ||
| counter_end, | ||
| ); | ||
| } | ||
|
|
||
| fn validate_side_effect_range<T, let N: u32>( | ||
| items: ClaimedLengthArray<T, N>, | ||
| indices: [u32; N], | ||
| side_effect_ranges: [SideEffectCounterRange; TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL], | ||
| global_index_offset: u32, | ||
| total_side_effects: u32, | ||
| ) | ||
| where | ||
| T: Ordered, | ||
| { | ||
| let mut should_check = true; | ||
| for i in 0..N { | ||
| let global_index = global_index_offset + i; | ||
| let index = indices[i]; | ||
| let range = side_effect_ranges[index]; | ||
| let counter = items.array[i].counter(); | ||
|
|
||
| should_check &= i != items.length; | ||
|
|
||
| if should_check { | ||
| // Validate index | ||
| assert(index < total_side_effects, "side effect range index out of bounds"); | ||
| // Validate that counter == range item | ||
| assert_eq(counter, range.start, "counter does not match start range item"); | ||
| assert_eq(counter, range.end, "counter does not match end range item"); | ||
| assert_eq( | ||
| global_index, | ||
| range.side_effect_global_index, | ||
| "range global index does not match side effect global index", | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn validate_side_effect_range_for_call_request<let N: u32>( | ||
| private_call_requests: ClaimedLengthArray<PrivateCallRequest, N>, | ||
| indices: [u32; N], | ||
| side_effect_ranges: [SideEffectCounterRange; TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL], | ||
| global_index_offset: u32, | ||
| total_side_effects: u32, | ||
| ) { | ||
| let mut should_check = true; | ||
| for i in 0..N { | ||
| let global_index = global_index_offset + i; | ||
| let index = indices[i]; | ||
| let range = side_effect_ranges[index]; | ||
| let item = private_call_requests.array[i]; | ||
| let start_counter = item.start_side_effect_counter; | ||
| let end_counter = item.end_side_effect_counter; | ||
|
|
||
| should_check &= i != private_call_requests.length; | ||
|
|
||
| if should_check { | ||
| // Validate index | ||
| assert(index < total_side_effects, "side effect range index out of bounds"); | ||
| // Validate that (start_counter, end_counter) == range item | ||
| assert_eq(start_counter, range.start, "start counter does not match range item"); | ||
| assert_eq(end_counter, range.end, "end counter does not match range item"); | ||
| assert(start_counter < end_counter, "nested call has incorrect counter range"); | ||
|
|
||
| assert_eq( | ||
| global_index, | ||
| range.side_effect_global_index, | ||
| "range global index does not match side effect global index", | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn validate_increasing_ranges( | ||
| side_effect_ranges: [SideEffectCounterRange; TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL], | ||
| total_side_effects: u32, | ||
| counter_start: u32, | ||
| counter_end: u32, | ||
| ) { | ||
| let mut prev_counter = counter_start; | ||
| let mut should_check = true; | ||
| for i in 0..TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL { | ||
| let range = side_effect_ranges[i]; | ||
| should_check &= i != total_side_effects; | ||
|
|
||
| if should_check { | ||
| assert( | ||
| range.start > prev_counter, | ||
| "start counter must be greater than previous counter", | ||
| ); | ||
| prev_counter = range.end; | ||
| } | ||
| } | ||
| assert(prev_counter < counter_end, "end counter must be less than the end counter of the call"); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this check is redundant since it'd fail on validate_increasing_ranges, but it's cheap and we'd get a better error message