Skip to content
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

Jump to bottom

fix: Validation requests #5236

Merged
merged 5 commits into from
Mar 15, 2024
Merged

fix: Validation requests #5236

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
532d190
Move requests to validation requests.
LeilaWang Mar 15, 2024
20ea4a6
Update slither output.
LeilaWang Mar 15, 2024
976b825
Fixes.
LeilaWang Mar 15, 2024
06303ef
Update fixtures.
LeilaWang Mar 15, 2024
51932cf
Merge remote-tracking branch 'origin/master' into lw/validation_requests
LeilaWang Mar 15, 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
8 changes: 4 additions & 4 deletions l1-contracts/slither_output.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,15 @@ src/core/messagebridge/Inbox.sol#L148-L153
Impact: Informational
Confidence: Medium
- [ ] ID-34
Variable [Constants.LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L132) is too similar to [Constants.NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L125)
Variable [Constants.LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L130) is too similar to [Constants.NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L123)

src/core/libraries/ConstantsGen.sol#L132
src/core/libraries/ConstantsGen.sol#L130


- [ ] ID-35
Variable [Constants.L1_TO_L2_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L112) is too similar to [Constants.L2_TO_L1_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L113)
Variable [Constants.L1_TO_L2_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L110) is too similar to [Constants.L2_TO_L1_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L111)

src/core/libraries/ConstantsGen.sol#L112
src/core/libraries/ConstantsGen.sol#L110


- [ ] ID-36
Expand Down
2 changes: 0 additions & 2 deletions l1-contracts/src/core/libraries/ConstantsGen.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ library Constants {
uint256 internal constant MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
uint256 internal constant MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 32;
uint256 internal constant MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
uint256 internal constant MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
Expand Down
18 changes: 9 additions & 9 deletions noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/common.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use dep::types::{
kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputsBuilder,
membership_witness::NoteHashReadRequestMembershipWitness,
private_circuit_public_inputs::PrivateCircuitPublicInputs,
private_kernel::private_call_data::PrivateCallData,
kernel_data::{PrivateKernelInnerData, PrivateKernelTailData},
private_kernel::private_call_data::PrivateCallData, kernel_data::{PrivateKernelInnerData},
side_effect::{SideEffect, SideEffectLinkedToNoteHash}
},
address::{AztecAddress, EthAddress, PartialAddress, compute_initialization_hash},
Expand Down Expand Up @@ -94,14 +93,15 @@ pub fn initialize_end_values(
public_inputs.constants = previous_kernel.public_inputs.constants;
public_inputs.min_revertible_side_effect_counter = previous_kernel.public_inputs.min_revertible_side_effect_counter;

let start = previous_kernel.public_inputs.validation_requests;
public_inputs.validation_requests.note_hash_read_requests = array_to_bounded_vec(start.note_hash_read_requests);
public_inputs.validation_requests.nullifier_read_requests = array_to_bounded_vec(start.nullifier_read_requests);
public_inputs.validation_requests.nullifier_key_validation_requests = array_to_bounded_vec(start.nullifier_key_validation_requests);

// Ensure the arrays are the same as previously, before we start pushing more data onto them in other
// functions within this circuit:
let start = previous_kernel.public_inputs.end;

public_inputs.end.note_hash_read_requests = array_to_bounded_vec(start.note_hash_read_requests);
public_inputs.end.nullifier_read_requests = array_to_bounded_vec(start.nullifier_read_requests);
public_inputs.end.nullifier_key_validation_requests = array_to_bounded_vec(start.nullifier_key_validation_requests);

public_inputs.end.new_note_hashes = array_to_bounded_vec(start.new_note_hashes);
public_inputs.end.new_nullifiers = array_to_bounded_vec(start.new_nullifiers);

Expand Down Expand Up @@ -196,14 +196,14 @@ pub fn update_end_values(
)
}
}
public_inputs.end.note_hash_read_requests.extend_from_bounded_vec(siloed_read_requests);
public_inputs.validation_requests.note_hash_read_requests.extend_from_bounded_vec(siloed_read_requests);

// Nullifier read request.
let nullifier_read_requests = private_call_public_inputs.nullifier_read_requests;
for i in 0..MAX_NULLIFIER_READ_REQUESTS_PER_CALL {
let request = nullifier_read_requests[i];
if !is_empty(request) {
public_inputs.end.nullifier_read_requests.push(request.to_context(storage_contract_address));
public_inputs.validation_requests.nullifier_read_requests.push(request.to_context(storage_contract_address));
}
}

Expand All @@ -212,7 +212,7 @@ pub fn update_end_values(
for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL {
let request = nullifier_key_validation_requests[i];
if !is_empty(request) {
public_inputs.end.nullifier_key_validation_requests.push(request.to_context(storage_contract_address));
public_inputs.validation_requests.nullifier_key_validation_requests.push(request.to_context(storage_contract_address));
}
}

Expand Down
20 changes: 10 additions & 10 deletions noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -425,7 +425,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -440,7 +440,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -455,7 +455,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -470,7 +470,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 1);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
}

#[test]
Expand All @@ -486,7 +486,7 @@ mod tests {
assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 1);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
}

#[test]
Expand All @@ -502,7 +502,7 @@ mod tests {

// non-transient read requests are NOT forwarded
assert_eq(
array_length(public_inputs.end.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
array_length(public_inputs.validation_requests.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
);
}

Expand All @@ -518,7 +518,7 @@ mod tests {

let public_inputs = builder.execute();

let end_nullifier_read_requests = public_inputs.end.nullifier_read_requests;
let end_nullifier_read_requests = public_inputs.validation_requests.nullifier_read_requests;
assert_eq(array_length(end_nullifier_read_requests), 2);

let request_context = end_nullifier_read_requests[0];
Expand All @@ -541,9 +541,9 @@ mod tests {

let public_inputs = builder.execute();

assert_eq(array_length(public_inputs.end.nullifier_key_validation_requests), 1);
assert_eq(array_length(public_inputs.validation_requests.nullifier_key_validation_requests), 1);

let request_context = public_inputs.end.nullifier_key_validation_requests[0];
let request_context = public_inputs.validation_requests.nullifier_key_validation_requests[0];
assert_eq(request_context.public_key, request.public_key);
assert_eq(request_context.secret_key, request.secret_key);
assert_eq(
Expand Down
14 changes: 7 additions & 7 deletions noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -595,7 +595,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -607,7 +607,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -619,7 +619,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 0);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
}

#[test]
Expand All @@ -631,7 +631,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 1);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
}

#[test]
Expand All @@ -645,7 +645,7 @@ mod tests {
let public_inputs = builder.execute();

// non-transient read requests are NOT forwarded
assert_eq(array_length(public_inputs.end.note_hash_read_requests), 1);
assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
}

#[test]
Expand All @@ -658,7 +658,7 @@ mod tests {

// non-transient read requests are NOT forwarded
assert_eq(
array_length(public_inputs.end.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
array_length(public_inputs.validation_requests.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
);
}

Expand Down
24 changes: 12 additions & 12 deletions noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use dep::reset_kernel_lib::{NullifierReadRequestHints, reset_read_requests};
use dep::types::{
abis::{
call_request::CallRequest, nullifier_key_validation_request::NullifierKeyValidationRequestContext,
kernel_data::{PrivateKernelInnerData, PrivateKernelTailData},
kernel_data::PrivateKernelInnerData,
kernel_circuit_public_inputs::{PrivateKernelCircuitPublicInputsBuilder, PrivateKernelTailCircuitPublicInputs},
side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered}
},
Expand Down Expand Up @@ -38,15 +38,15 @@ impl PrivateKernelTailCircuitPrivateInputs {
}

fn validate_nullifier_read_requests(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
let requests = self.previous_kernel.public_inputs.end.nullifier_read_requests;
let requests = self.previous_kernel.public_inputs.validation_requests.nullifier_read_requests;

let pending_nullifiers = self.previous_kernel.public_inputs.end.new_nullifiers;

let hints = self.nullifier_read_request_hints;

let nullifier_tree_root = public_inputs.constants.historical_header.state.partial.nullifier_tree.root;

public_inputs.end.nullifier_read_requests = reset_read_requests(
public_inputs.validation_requests.nullifier_read_requests = reset_read_requests(
requests,
pending_nullifiers,
hints.read_request_statuses,
Expand All @@ -58,12 +58,12 @@ impl PrivateKernelTailCircuitPrivateInputs {
// corresponding values are added to public inputs in nested executions.
// But right now, all the request must be cleared in one go.
assert(
public_inputs.end.nullifier_read_requests.len() == 0, "All nullifier read requests must be verified"
public_inputs.validation_requests.nullifier_read_requests.len() == 0, "All nullifier read requests must be verified"
);
}

fn validate_nullifier_keys(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
let requests = self.previous_kernel.public_inputs.end.nullifier_key_validation_requests;
let requests = self.previous_kernel.public_inputs.validation_requests.nullifier_key_validation_requests;
for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX {
let request = requests[i];
if !is_empty(request) {
Expand All @@ -81,12 +81,12 @@ impl PrivateKernelTailCircuitPrivateInputs {
}

// Empty out nullifier key validation requests after verifying them.
public_inputs.end.nullifier_key_validation_requests = BoundedVec::new();
public_inputs.validation_requests.nullifier_key_validation_requests = BoundedVec::new();
}

fn match_reads_to_commitments(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
let new_note_hashes = public_inputs.end.new_note_hashes;
let read_requests = public_inputs.end.note_hash_read_requests;
let read_requests = public_inputs.validation_requests.note_hash_read_requests;

// match reads to commitments from the previous call(s)
for rr_idx in 0..MAX_NOTE_HASH_READ_REQUESTS_PER_TX {
Expand All @@ -103,7 +103,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
}

// Empty out read requests after matching them to commitments
public_inputs.end.note_hash_read_requests = BoundedVec::new();
public_inputs.validation_requests.note_hash_read_requests = BoundedVec::new();
}

fn assert_sorted_counters<T, N>(original: [T; N], sorted: [T; N], indexes: [u64; N]) where T: Eq + Ordered + Empty {
Expand Down Expand Up @@ -447,8 +447,8 @@ mod tests {
builder.append_transient_commitments(1);
builder.add_transient_read(0);
// Tweak the read request so that it does not match the hash at index 0;
let read_request = builder.previous_kernel.end.note_hash_read_requests.pop();
builder.previous_kernel.end.note_hash_read_requests.push(SideEffect { value: read_request.value + 1, counter: 0 });
let read_request = builder.previous_kernel.validation_requests.note_hash_read_requests.pop();
builder.previous_kernel.validation_requests.note_hash_read_requests.push(SideEffect { value: read_request.value + 1, counter: 0 });
builder.failed();
}

Expand Down Expand Up @@ -494,9 +494,9 @@ mod tests {
builder.append_nullifiers(3);
builder.add_nullifier_pending_read(1);
let nullifier_being_read = builder.get_new_nullifiers()[2];
let mut read_request = builder.previous_kernel.end.nullifier_read_requests.pop();
let mut read_request = builder.previous_kernel.validation_requests.nullifier_read_requests.pop();
read_request.counter = nullifier_being_read.counter - 1;
builder.previous_kernel.end.nullifier_read_requests.push(read_request);
builder.previous_kernel.validation_requests.nullifier_read_requests.push(read_request);

builder.failed();
}
Expand Down
Loading
Loading