Update ark-circom for arkworks 0.4.0 (#43)

src/witness/memory.rs

@@ -1,10 +1,12 @@
 //! Safe-ish interface for reading and writing specific types to the WASM runtime's memory
+use ark_serialize::CanonicalDeserialize;
 use num_traits::ToPrimitive;
 use wasmer::{Memory, MemoryView};
 
 // TODO: Decide whether we want Ark here or if it should use a generic BigInt package
-use ark_bn254::FrParameters;
-use ark_ff::{BigInteger, BigInteger256, FpParameters, FromBytes, Zero};
+use ark_bn254::FrConfig;
+use ark_ff::MontConfig;
+use ark_ff::{BigInteger, BigInteger256, Zero};
 
 use num_bigint::{BigInt, BigUint};
 
@@ -38,7 +40,7 @@ impl SafeMemory {
         let short_max = BigInt::from(0x8000_0000u64);
         let short_min = BigInt::from_biguint(
             num_bigint::Sign::NoSign,
-            BigUint::try_from(FrParameters::MODULUS).unwrap(),
+            BigUint::try_from(FrConfig::MODULUS).unwrap(),
         ) - &short_max;
         let r_inv = BigInt::from_str(
             "9915499612839321149637521777990102151350674507940716049588462388200839649614",
@@ -188,7 +190,7 @@ impl SafeMemory {
         let buf = &buf[ptr..ptr + num_bytes * 32];
 
         // TODO: Is there a better way to read big integers?
-        let big = BigInteger256::read(buf).unwrap();
+        let big = BigInteger256::deserialize_uncompressed(buf).unwrap();
         let big = BigUint::try_from(big).unwrap();
         Ok(big.into())
     }

src/witness/witness_calculator.rs

@@ -255,16 +255,16 @@ impl WitnessCalculator {
     }
 
     pub fn calculate_witness_element<
-        E: ark_ec::PairingEngine,
+        E: ark_ec::pairing::Pairing,
         I: IntoIterator<Item = (String, Vec<BigInt>)>,
     >(
         &mut self,
         inputs: I,
         sanity_check: bool,
-    ) -> Result<Vec<E::Fr>> {
-        use ark_ff::{FpParameters, PrimeField};
+    ) -> Result<Vec<E::ScalarField>> {
+        use ark_ff::PrimeField;
         let witness = self.calculate_witness(inputs, sanity_check)?;
-        let modulus = <<E::Fr as PrimeField>::Params as FpParameters>::MODULUS;
+        let modulus = <E::ScalarField as PrimeField>::MODULUS;
 
         // convert it to field elements
         use num_traits::Signed;
@@ -277,7 +277,7 @@ impl WitnessCalculator {
                 } else {
                     w.to_biguint().unwrap()
                 };
-                E::Fr::from(w)
+                E::ScalarField::from(w)
             })
             .collect::<Vec<_>>();
 
@@ -421,7 +421,7 @@ mod tests {
     #[test]
     fn safe_multipler() {
         let witness =
-            std::fs::read_to_string(&root_path("test-vectors/safe-circuit-witness.json")).unwrap();
+            std::fs::read_to_string(root_path("test-vectors/safe-circuit-witness.json")).unwrap();
         let witness: Vec<String> = serde_json::from_str(&witness).unwrap();
         let witness = &witness.iter().map(|x| x.as_ref()).collect::<Vec<_>>();
         run_test(TestCase {
@@ -436,7 +436,7 @@ mod tests {
     #[test]
     fn smt_verifier() {
         let witness =
-            std::fs::read_to_string(&root_path("test-vectors/smtverifier10-witness.json")).unwrap();
+            std::fs::read_to_string(root_path("test-vectors/smtverifier10-witness.json")).unwrap();
         let witness: Vec<String> = serde_json::from_str(&witness).unwrap();
         let witness = &witness.iter().map(|x| x.as_ref()).collect::<Vec<_>>();
 
@@ -466,8 +466,8 @@ mod tests {
             wtns.memory.prime.to_str_radix(16),
             "30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000001".to_lowercase()
         );
-        assert_eq!(wtns.instance.get_n_vars().unwrap() as u32, case.n_vars);
-        assert_eq!(wtns.n64 as u32, case.n64);
+        assert_eq!({ wtns.instance.get_n_vars().unwrap() }, case.n_vars);
+        assert_eq!({ wtns.n64 }, case.n64);
 
         let inputs_str = std::fs::read_to_string(case.inputs_path).unwrap();
         let inputs: std::collections::HashMap<String, serde_json::Value> =