@@ -124,14 +124,10 @@ let x_i_plus_1_sq =
         x_i_plus_1.square(cs.namespace(|| format!("x_i_plus_1_sq_iter_{}", i)))?;
       let x_i_plus_1_quad =
         x_i_plus_1_sq.square(cs.namespace(|| format!("x_i_plus_1_quad_{}", i)))?;
-      let x_i_plus_1_pow_5 = x_i_plus_1_quad.mul(
-        cs.namespace(|| format!("x_i_plus_1_pow_5_{}", i)),
-        &x_i_plus_1,
-      )?;
       cs.enforce(
-        || format!("x_i_plus_1_pow_5 = x_i + y_i_iter_{}", i),
-        |lc| lc + x_i_plus_1_pow_5.get_variable(),
-        |lc| lc + CS::one(),
+        || format!("x_i_plus_1_quad * x_i_plus_1 = x_i + y_i_iter_{}", i),
+        |lc| lc + x_i_plus_1_quad.get_variable(),
+        |lc| lc + x_i_plus_1.get_variable(),
         |lc| lc + x_i.get_variable() + y_i.get_variable(),
       );
 
@@ -209,6 +205,15 @@ );
   println!(
     "Number of constraints per step (secondary circuit): {}",
     pp.num_constraints().1
+  );
+
+  println!(
+    "Number of variables per step (primary circuit): {}",
+    pp.num_variables().0
+  );
+  println!(
+    "Number of variables per step (secondary circuit): {}",
+    pp.num_variables().1
   );
 
   // produce non-deterministic advice

@@ -134,6 +134,12 @@ }
   }
 }
 
+impl<G: Group> Default for Commitment<G> {
+  fn default() -> Self {
+    Commitment { comm: G::zero() }
+  }
+}
+
 impl<C: CompressedGroup> CompressedCommitment<C> {
   pub fn decompress(&self) -> Result<Commitment<C::GroupElement>, NovaError> {
     let comm = self.comm.decompress();

@@ -135,6 +135,14 @@ self.r1cs_shape_primary.num_cons,
       self.r1cs_shape_secondary.num_cons,
     )
   }
+
+  /// Returns the number of variables in the primary and secondary circuits
+  pub fn num_variables(&self) -> (usize, usize) {
+    (
+      self.r1cs_shape_primary.num_vars,
+      self.r1cs_shape_secondary.num_vars,
+    )
+  }
 }
 
 /// A SNARK that proves the correct execution of an incremental computation

@@ -11,7 +11,7 @@ use num_traits::Num;
 use pasta_curves::{
   self,
   arithmetic::{CurveAffine, CurveExt, Group as OtherGroup},
-  group::{Curve, GroupEncoding},
+  group::{Curve, Group as AnotherGroup, GroupEncoding},
   pallas, vesta, Ep, Eq,
 };
 use rand::SeedableRng;
@@ -96,6 +96,14 @@ 16,
     )
     .unwrap()
   }
+
+  fn zero() -> Self {
+    pallas::Point::group_zero()
+  }
+
+  fn get_generator() -> Self {
+    pallas::Point::generator()
+  }
 }
 
 impl ChallengeTrait for pallas::Scalar {
@@ -193,6 +201,14 @@ "40000000000000000000000000000000224698fc094cf91b992d30ed00000001",
       16,
     )
     .unwrap()
+  }
+
+  fn zero() -> Self {
+    vesta::Point::group_zero()
+  }
+
+  fn get_generator() -> Self {
+    vesta::Point::generator()
   }
 }
 

@@ -577,8 +577,8 @@ }
 
 impl<G: Group> RelaxedR1CSInstance<G> {
   /// Produces a default RelaxedR1CSInstance given R1CSGens and R1CSShape
-  pub fn default(gens: &R1CSGens<G>, S: &R1CSShape<G>) -> RelaxedR1CSInstance<G> {
-    let (comm_W, comm_E) = RelaxedR1CSWitness::default(S).commit(gens);
+  pub fn default(_gens: &R1CSGens<G>, S: &R1CSShape<G>) -> RelaxedR1CSInstance<G> {
+    let (comm_W, comm_E) = (Commitment::default(), Commitment::default());
     RelaxedR1CSInstance {
       comm_W,
       comm_E,

@@ -64,6 +64,12 @@ fn to_coordinates(&self) -> (Self::Base, Self::Base, bool);
 
   /// Returns the order of the group as a big integer
   fn get_order() -> BigInt;
+
+  /// Returns an element that is the additive identity of the group
+  fn zero() -> Self;
+
+  /// Returns the generator of the group
+  fn get_generator() -> Self;
 }
 
 /// Represents a compressed version of a group element