Restrict the first two variables in the Constraint system (#324)

* Fix equal gate * add * clean * clean
FindoraNetwork · Oct 31, 2023 · 4223e38 · 4223e38
1 parent 6b6c022
commit 4223e38
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 16 deletions.
diff --git a/accumulators/src/lib.rs b/accumulators/src/lib.rs
@@ -1,6 +1,6 @@
 //! The crate for the Merkle tree that stores the records used in the anonymous payment
 #![deny(unused_import_braces, unused_qualifications, trivial_casts)]
-#![deny(trivial_numeric_casts, private_in_public)]
+#![deny(trivial_numeric_casts)]
 #![deny(stable_features, unreachable_pub, non_shorthand_field_patterns)]
 #![deny(unused_attributes, unused_imports, unused_mut, missing_docs)]
 #![deny(renamed_and_removed_lints, stable_features, unused_allocation)]

diff --git a/algebra/src/lib.rs b/algebra/src/lib.rs
@@ -1,7 +1,7 @@
 //! The crate for algebra for the Noah library, which unifies the interfaces of different curves
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(unused_import_braces, unused_qualifications, trivial_casts)]
-#![deny(trivial_numeric_casts, private_in_public)]
+#![deny(trivial_numeric_casts)]
 #![deny(stable_features, unreachable_pub, non_shorthand_field_patterns)]
 #![deny(unused_attributes, unused_imports, unused_mut, missing_docs)]
 #![deny(renamed_and_removed_lints, stable_features, unused_allocation)]

diff --git a/api/parameters/abar-to-ar-vk-ed25519.bin b/api/parameters/abar-to-ar-vk-ed25519.bin
diff --git a/api/parameters/abar-to-ar-vk-secp256k1.bin b/api/parameters/abar-to-ar-vk-secp256k1.bin
diff --git a/api/parameters/abar-to-bar-vk-ed25519.bin b/api/parameters/abar-to-bar-vk-ed25519.bin
diff --git a/api/parameters/abar-to-bar-vk-secp256k1.bin b/api/parameters/abar-to-bar-vk-secp256k1.bin
diff --git a/api/parameters/ar-to-abar-vk.bin b/api/parameters/ar-to-abar-vk.bin
diff --git a/api/parameters/bar-to-abar-vk.bin b/api/parameters/bar-to-abar-vk.bin
diff --git a/api/parameters/transfer-vk-ed25519-specific.bin b/api/parameters/transfer-vk-ed25519-specific.bin
diff --git a/api/parameters/transfer-vk-secp256k1-specific.bin b/api/parameters/transfer-vk-secp256k1-specific.bin
diff --git a/api/src/lib.rs b/api/src/lib.rs
@@ -1,7 +1,7 @@
 //! The API interfaces of the Noah library
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(unused, unused_import_braces, unused_qualifications, trivial_casts)]
-#![deny(trivial_numeric_casts, private_in_public)]
+#![deny(trivial_numeric_casts)]
 #![deny(stable_features, unreachable_pub, non_shorthand_field_patterns)]
 #![deny(unused_attributes, unused_imports, unused_mut)]
 #![deny(missing_docs)]

diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs
@@ -2,7 +2,7 @@
 //! including Bulletproofs.
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(unused_import_braces, unused_qualifications, trivial_casts)]
-#![deny(trivial_numeric_casts, private_in_public)]
+#![deny(trivial_numeric_casts)]
 #![deny(stable_features, unreachable_pub, non_shorthand_field_patterns)]
 #![deny(unused_attributes, unused_imports, unused_mut, missing_docs)]
 #![deny(renamed_and_removed_lints, stable_features, unused_allocation)]

diff --git a/plonk/src/lib.rs b/plonk/src/lib.rs
@@ -1,7 +1,7 @@
 //! The crate for Plonk and polynomial commitment for the Noah library
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(unused_import_braces, unused_qualifications, trivial_casts)]
-#![deny(trivial_numeric_casts, private_in_public)]
+#![deny(trivial_numeric_casts)]
 #![deny(stable_features, unreachable_pub, non_shorthand_field_patterns)]
 #![deny(unused_attributes, unused_imports, unused_mut, missing_docs)]
 #![deny(renamed_and_removed_lints, stable_features, unused_allocation)]

diff --git a/plonk/src/plonk/constraint_system/turbo.rs b/plonk/src/plonk/constraint_system/turbo.rs
@@ -258,7 +258,7 @@ impl<F: Scalar> TurboCS<F> {
     /// With default witness [F::zero(), F::one()].
     pub fn new() -> TurboCS<F> {
         let selectors: Vec<Vec<F>> = core::iter::repeat(vec![]).take(N_SELECTORS).collect();
-        Self {
+        let mut cs = Self {
             selectors,
             wiring: [vec![], vec![], vec![], vec![], vec![]],
             anemoi_preprocessed_round_keys_x: [[F::zero(); 2]; 14],
@@ -276,7 +276,12 @@ impl<F: Scalar> TurboCS<F> {
 
             #[cfg(feature = "debug")]
             witness_backtrace: HashMap::new(),
-        }
+        };
+
+        cs.insert_constant_gate(cs.zero_var(), F::zero());
+        cs.insert_constant_gate(cs.one_var(), F::one());
+
+        cs
     }
 
     /// 0-index is Zero

diff --git a/smoke-tests/src/tests/smoke_axfr_compatibility.rs b/smoke-tests/src/tests/smoke_axfr_compatibility.rs