Skip to content

fix: swap_constraint bug #124

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
alxkzmn merged 1 commit into from
Aug 4, 2023
Merged

fix: swap_constraint bug #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions zk_prover/src/chips/merkle_sum_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ pub struct MerkleSumTreeConfig {
/// Chip that performs various constraints related to a Merkle Sum Tree data structure such as:
///
/// * `s * swap_bit * (1 - swap_bit) = 0` (if `bool_and_swap_selector` is toggled). It basically enforces that swap_bit is either a 0 or 1.
/// * `s * swap_bit * ((elelment_l_next - elelment_l_cur) - (elelment_r_cur - elelment_r_next))`. Enforces that if the swap_bit is equal to 1, the values will be swapped on the next row (if `bool_and_swap_selector` is toggled).
/// * `s * (swap_bit * 2 * (elelment_r_cur - elelment_l_cur) - (elelment_l_next - elelment_l_cur) - (elelment_r_cur - elelment_r_next)) = 0`. Enforces that if the swap_bit is equal to 1, the values will be swapped on the next row (if `bool_and_swap_selector` is toggled).
/// If the swap_bit is equal to 0, the values will remain the same on the next row (if `bool_and_swap_selector` is toggled).
/// * `s * (left_balance + right_balance - computed_sum)`. It constraints the computed sum to be equal to the sum of the left and right balances (if `sum_selector` is toggled).
#[derive(Debug, Clone)]
pub struct MerkleSumTreeChip<const N_ASSETS: usize> {
Expand Down Expand Up @@ -59,8 +60,11 @@ impl<const N_ASSETS: usize> MerkleSumTreeChip<N_ASSETS> {
let elelment_r_next = meta.query_advice(col_b, Rotation::next());

let swap_constraint = s
* swap_bit
* ((elelment_l_next - elelment_l_cur) - (elelment_r_cur - elelment_r_next));
* ((swap_bit
* Expression::Constant(Fp::from(2))
* (elelment_r_cur.clone() - elelment_l_cur.clone())
Copy link
Copy Markdown
Contributor

@alxkzmn alxkzmn Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a typo in "element"

- (elelment_l_next - elelment_l_cur))
- (elelment_r_cur - elelment_r_next));

vec![swap_constraint]
});
Expand Down
58 changes: 58 additions & 0 deletions zk_prover/src/circuits/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,64 @@ mod test {
},
cell_values: vec![(((Any::advice(), 2).into(), 0).into(), "0x2".to_string()),]
},
VerifyFailure::ConstraintNotSatisfied {
constraint: ((4, "swap constraint").into(), 0, "").into(),
location: FailureLocation::InRegion {
region: (3, "assign nodes hashes per merkle tree level").into(),
offset: 0
},
cell_values: vec![
(
((Any::advice(), 0).into(), 0).into(),
"0xe113acd03b98f0bab0ef6f577245d5d008cbcc19ef2dab3608aa4f37f72a407"
.to_string()
),
(
((Any::advice(), 0).into(), 1).into(),
"0x17ef9d8ee0e2c8470814651413b71009a607a020214f749687384a7b7a7eb67a"
.to_string()
),
(
((Any::advice(), 1).into(), 0).into(),
"0x17ef9d8ee0e2c8470814651413b71009a607a020214f749687384a7b7a7eb67a"
.to_string()
),
(
((Any::advice(), 1).into(), 1).into(),
"0xe113acd03b98f0bab0ef6f577245d5d008cbcc19ef2dab3608aa4f37f72a407"
.to_string()
),
(((Any::advice(), 2).into(), 0).into(), "0x2".to_string()),
]
},
VerifyFailure::ConstraintNotSatisfied {
constraint: ((4, "swap constraint").into(), 0, "").into(),
location: FailureLocation::InRegion {
region: (4, "assign nodes balances per asset").into(),
offset: 0
},
cell_values: vec![
(((Any::advice(), 0).into(), 0).into(), "0x2e70".to_string()),
(((Any::advice(), 0).into(), 1).into(), "0x108ef".to_string()),
(((Any::advice(), 1).into(), 0).into(), "0x108ef".to_string()),
(((Any::advice(), 1).into(), 1).into(), "0x2e70".to_string()),
(((Any::advice(), 2).into(), 0).into(), "0x2".to_string()),
]
},
VerifyFailure::ConstraintNotSatisfied {
constraint: ((4, "swap constraint").into(), 0, "").into(),
location: FailureLocation::InRegion {
region: (7, "assign nodes balances per asset").into(),
offset: 0
},
cell_values: vec![
(((Any::advice(), 0).into(), 0).into(), "0xa0cb".to_string()),
(((Any::advice(), 0).into(), 1).into(), "0x48db".to_string()),
(((Any::advice(), 1).into(), 0).into(), "0x48db".to_string()),
(((Any::advice(), 1).into(), 1).into(), "0xa0cb".to_string()),
(((Any::advice(), 2).into(), 0).into(), "0x2".to_string()),
]
},
VerifyFailure::Permutation {
column: (Any::advice(), 0).into(),
location: FailureLocation::InRegion {
Expand Down