apply review suggestions from @ed255

Author: arnaucube

src/backends/plonky2/circuits/mainpod.rs

@@ -1231,6 +1231,9 @@ impl MainPodVerifyGadget {
             }
             .eval(builder);
 
+            // ensure that mt_proof is enabled
+            let true_targ = builder._true();
+            builder.connect(vd_mt_proof.enabled.target, true_targ.target);
             // connect the vd_mt_proof's root to the actual vds_root, to ensure that the mt proof
             // verifies against the vds_root
             builder.connect_hashes(vds_root, vd_mt_proof.root);

src/backends/plonky2/mainpod/mod.rs

@@ -701,7 +701,7 @@ pub mod tests {
             {self},
         },
         middleware,
-        middleware::{CustomPredicateRef, NativePredicate as NP, RawValue, DEFAULT_VD_SET},
+        middleware::{CustomPredicateRef, NativePredicate as NP, DEFAULT_VD_SET},
         op,
     };
 

src/frontend/mod.rs

@@ -10,8 +10,7 @@ use serialization::{SerializedMainPod, SerializedSignedPod};
 use crate::middleware::{
     self, check_st_tmpl, hash_str, hash_values, AnchoredKey, Hash, Key, MainPodInputs,
     NativeOperation, NativePredicate, OperationAux, OperationType, Params, PodId, PodProver,
-    PodSigner, Predicate, Statement, StatementArg, VDSet, Value, WildcardValue, DEFAULT_VD_SET,
-    KEY_TYPE, SELF,
+    PodSigner, Predicate, Statement, StatementArg, VDSet, Value, WildcardValue, KEY_TYPE, SELF,
 };
 
 mod custom;
@@ -565,7 +564,7 @@ impl MainPodBuilder {
             statements: &statements,
             operations: &operations,
             public_statements: &public_statements,
-            vds_root: DEFAULT_VD_SET.root(),
+            vds_root: self.vd_set.root(),
         };
         let pod = prover.prove(&self.params, &self.vd_set, inputs)?;
 
@@ -841,7 +840,7 @@ pub mod tests {
             eth_dos_pod_builder, eth_friend_signed_pod_builder, great_boy_pod_full_flow,
             tickets_pod_full_flow, zu_kyc_pod_builder, zu_kyc_sign_pod_builders,
         },
-        middleware::{containers::Dictionary, Value},
+        middleware::{containers::Dictionary, Value, DEFAULT_VD_SET},
     };
 
     // Check that frontend public statements agree with those

src/frontend/serialization.rs

@@ -112,7 +112,7 @@ mod tests {
         middleware::{
             self,
             containers::{Array, Dictionary, Set},
-            Params, RawValue, TypedValue, DEFAULT_VD_SET,
+            Params, TypedValue, DEFAULT_VD_SET,
         },
     };