Merge branch 'main' into dependabot/github_actions/actions/upload-art…

…ifact-4.5.0
Bitcoin-Wildlife-Sanctuary · Dec 26, 2024 · 3662a09 · 3662a09
2 parents e545412 + 68982ac
commit 3662a09
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ lazy_static = "1.4.0"
 ctor = "0.2.9"
 itertools = "0.13.0"
 hex = "0.4.3"
-anyhow = "1.0.86"
+anyhow = "1.0.95"
 bitcoin-script-dsl = { git = "https://github.com/Bitcoin-Wildlife-Sanctuary/dsl", tag = "0.2.0" }
 covenants-gadgets = { git = "https://github.com/Bitcoin-Wildlife-Sanctuary/covenants-gadgets" }
 clap = { version = "4.5.23", features = ["derive"] }

diff --git a/src/dsl/plonk/part2_fiat_shamir2_and_constraint_num.rs b/src/dsl/plonk/part2_fiat_shamir2_and_constraint_num.rs
@@ -90,9 +90,9 @@ pub fn generate_cs(hints: &Hints, ldm: &mut LDM) -> Result<ConstraintSystemRef>
 
     let a_val_times_b_val = &a_val_var * (&table, &b_val_var);
 
-    let mut res1 = &(&(&op_var * (&table, &(&(&a_val_var + &b_val_var) - &a_val_times_b_val)))
-        + &a_val_times_b_val)
-        - &c_val_var;
+    let mut res1 = &c_val_var
+        - (&(&(&op_var * (&table, &(&(&a_val_var + &b_val_var) - &a_val_times_b_val)))
+            + &a_val_times_b_val));
 
     let composition_fold_random_coeff_var: QM31Var = ldm.read("composition_fold_random_coeff")?;
     let composition_fold_random_coeff_squared_var =