Merge branch 'master' into akilesh/native-ecdsa

circuit/src/circuit.rs

@@ -616,6 +616,7 @@ mod test {
 		assert!(res);
 	}
 
+	#[ignore = "Smart contract verifier is too big to run"]
 	#[test]
 	fn test_closed_graph_circut_evm() {
 		let s = vec![Scalar::from_u128(INITIAL_SCORE); NUM_NEIGHBOURS];

circuit/src/dynamic_sets/ecdsa_native.rs

@@ -15,6 +15,8 @@ use std::collections::HashMap;
 pub type ECDSAPublicKey = secp256k1::PublicKey;
 /// ECDSA signature
 pub type ECDSASignature = ecdsa::RecoverableSignature;
+/// Rational score
+pub type RationalScore = BigRational;
 
 /// Construct an Ethereum address for the given ECDSA public key
 pub fn address_from_pub_key(pub_key: &ECDSAPublicKey) -> Result<[u8; 20], &'static str> {
@@ -277,7 +279,7 @@ impl<const NUM_NEIGHBOURS: usize, const NUM_ITERATIONS: usize, const INITIAL_SCO
 	}
 
 	/// Compute the EigenTrust score using BigRational numbers
-	pub fn converge_rational(&self) -> Vec<BigRational> {
+	pub fn converge_rational(&self) -> Vec<RationalScore> {
 		let mut filtered_ops: HashMap<Fr, Vec<Fr>> = self.filter_peers_ops();
 
 		let mut ops = Vec::new();

circuit/src/dynamic_sets/mod.rs

@@ -792,7 +792,7 @@ mod test {
 			ops,
 		);
 
-		let k = 15;
+		let k = 14;
 		let prover = match MockProver::<Scalar>::run(k, &et, vec![res.to_vec()]) {
 			Ok(prover) => prover,
 			Err(e) => panic!("{}", e),
@@ -851,13 +851,14 @@ mod test {
 			ops,
 		);
 
-		let k = 15;
+		let k = 14;
 		let rng = &mut rand::thread_rng();
 		let params = generate_params(k);
 		let res = prove_and_verify::<Bn256, _, _>(params, et, &[&res], rng).unwrap();
 		assert!(res);
 	}
 
+	#[ignore = "Smart contract verifier is too big to run"]
 	#[test]
 	fn test_closed_graph_circut_evm() {
 		let ops: Vec<Vec<Scalar>> = vec![
@@ -908,7 +909,7 @@ mod test {
 			ops,
 		);
 
-		let k = 15;
+		let k = 14;
 		let params = read_params(k);
 		let pk = gen_pk(&params, &et);
 		let deployment_code = gen_evm_verifier(&params, pk.get_vk(), vec![NUM_NEIGHBOURS]);

circuit/src/ecc/generic/native.rs

@@ -193,7 +193,7 @@ where
 	) -> Vec<Self> {
 		let sliding_window_size = EC::window_size();
 		// AuxGens from article.
-		let (mut aux_init, mut aux_fin) = Self::aux(EC::window_size());
+		let (mut aux_init, mut aux_fin) = Self::aux(sliding_window_size);
 
 		let mut aux_inits: Vec<EcPoint<C, N, NUM_LIMBS, NUM_BITS, P, EC>> = Vec::new();
 		for _ in 0..points.len() {