Update ark-snark to ark-algebra (#366)

* fix

* ready for review

* small change

* update serialization

* derive is not needed here

* point to the master branch of algebra

Author: onewayfunc

Cargo.toml

@@ -29,3 +29,11 @@ lto = "thin"
 incremental = true
 debug-assertions = true
 debug = true
+
+[patch.crates-io]
+ark-ff = { git = "https://github.com/arkworks-rs/algebra" }
+ark-ec = { git = "https://github.com/arkworks-rs/algebra" }
+ark-test-curves = { git = "https://github.com/arkworks-rs/algebra" }
+ark-std = { git = "https://github.com/arkworks-rs/std" }
+ark-serialize = { git = "https://github.com/arkworks-rs/algebra" }
+ark-poly = { git = "https://github.com/arkworks-rs/algebra" }

relations/Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["zero-knowledge", "cryptography", "zkSNARK", "SNARK", "constraint-sy
 categories = ["cryptography"]
 include = ["Cargo.toml", "src", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 license = "MIT/Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ark-ff = { version = "^0.3.0", default-features = false }

relations/src/r1cs/constraint_system.rs

@@ -315,7 +315,7 @@ impl<F: Field> ConstraintSystem<F> {
         ) -> (usize, Option<Vec<F>>),
     ) {
         // `transformed_lc_map` stores the transformed linear combinations.
-        let mut transformed_lc_map = BTreeMap::new();
+        let mut transformed_lc_map = BTreeMap::<_, LinearCombination<F>>::new();
         let mut num_times_used = self.lc_num_times_used(false);
 
         // This loop goes through all the LCs in the map, starting from

snark/Cargo.toml

@@ -10,9 +10,10 @@ keywords = ["zero-knowledge", "cryptography", "zkSNARK", "SNARK"]
 categories = ["cryptography"]
 include = ["Cargo.toml", "src", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 license = "MIT/Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ark-ff = { version = "^0.3.0", default-features = false }
 ark-std = { version = "^0.3.0", default-features = false }
+ark-serialize = { version = "^0.3.0", default-features = false }
 ark-relations = { version = "^0.3.0", path = "../relations", default-features = false }

snark/src/lib.rs

@@ -10,27 +10,28 @@
 )]
 #![forbid(unsafe_code)]
 
-use ark_ff::{PrimeField, ToBytes};
+use ark_ff::PrimeField;
 use ark_relations::r1cs::ConstraintSynthesizer;
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+use ark_std::fmt::Debug;
 use ark_std::rand::{CryptoRng, RngCore};
-use core::fmt::Debug;
 
 /// The basic functionality for a SNARK.
 pub trait SNARK<F: PrimeField> {
     /// The information required by the prover to produce a proof for a specific
     /// circuit *C*.
-    type ProvingKey: Clone;
+    type ProvingKey: Clone + CanonicalSerialize + CanonicalDeserialize;
 
     /// The information required by the verifier to check a proof for a specific
     /// circuit *C*.
-    type VerifyingKey: Clone + ToBytes;
+    type VerifyingKey: Clone + CanonicalSerialize + CanonicalDeserialize;
 
     /// The proof output by the prover.
-    type Proof: Clone;
+    type Proof: Clone + CanonicalSerialize + CanonicalDeserialize;
 
     /// This contains the verification key, but preprocessed to enable faster
     /// verification.
-    type ProcessedVerifyingKey: Clone;
+    type ProcessedVerifyingKey: Clone + CanonicalSerialize + CanonicalDeserialize;
 
     /// Errors encountered during setup, proving, or verification.
     type Error: 'static + ark_std::error::Error;