clean up

Author: ed255

Cargo.toml

@@ -24,9 +24,9 @@ serde_json = "1.0.140"
 base64 = "0.22.1"
 schemars = "1.0.0-alpha.17"
 
-# Uncomment for debugging with https://github.com/ed255/plonky2/tree/feat/debug
-[patch."https://github.com/0xPolygonZero/plonky2"]
-plonky2 = { path = "../plonky2/plonky2" }
+# Uncomment for debugging with https://github.com/ed255/plonky2/ at branch `feat/debug`.  The repo directory needs to be checked out next to the pod2 repo directory.
+# [patch."https://github.com/0xPolygonZero/plonky2"]
+# plonky2 = { path = "../plonky2/plonky2" }
 
 [features]
 default = ["backend_plonky2"]

src/backends/plonky2/circuits/mainpod.rs

@@ -269,8 +269,8 @@ impl OperationVerifyGate {
             op_code_ok,
             op_arg_types_ok,
             op_arg_range_ok,
-            op_args_eq, // FAILING
-            st_ok,      // FAILING
+            op_args_eq,
+            st_ok,
         ])
     }
 
@@ -465,8 +465,6 @@ impl MainPodVerifyGate {
             .collect();
         let id = builder.hash_n_to_hash_no_pad::<PoseidonHash>(pub_statements_flattened);
 
-        // 3. TODO check that all `input_statements` of type `ValueOf` with origin=SELF have unique keys (no duplicates).  Maybe we can do this via the NewEntry operation (check that the key doesn't exist in a previous statement with ID=SELF)
-
         // 4. Verify type
         let type_statement = &pub_statements[0];
         // TODO: Store this hash in a global static with lazy init so that we don't have to
@@ -480,6 +478,8 @@ impl MainPodVerifyGate {
         );
         builder.connect_flattenable(type_statement, &expected_type_statement);
 
+        // 3. check that all `input_statements` of type `ValueOf` with origin=SELF have unique keys
+        // (no duplicates).  We do this in the verification of NewEntry operation.
         // 5. Verify input statements
         let mut op_verifications = Vec::new();
         for (i, (st, op)) in input_statements.iter().zip(operations.iter()).enumerate() {
@@ -645,29 +645,6 @@ mod tests {
         Ok(())
     }
 
-    #[test]
-    fn test_operation_verify_eq_from_entries() -> Result<()> {
-        let st1: mainpod::Statement =
-            Statement::ValueOf(AnchoredKey(SELF, "hello".into()), 55.into()).into();
-        let st2: mainpod::Statement = Statement::ValueOf(
-            AnchoredKey(PodId(Value::from(75).into()), "world".into()),
-            55.into(),
-        )
-        .into();
-        let st: mainpod::Statement = Statement::Equal(
-            AnchoredKey(SELF, "hello".into()),
-            AnchoredKey(PodId(Value::from(75).into()), "world".into()),
-        )
-        .into();
-        let op = mainpod::Operation(
-            OperationType::Native(NativeOperation::EqualFromEntries),
-            vec![OperationArg::Index(0), OperationArg::Index(1)],
-            OperationAux::None,
-        );
-        let prev_statements = vec![st1.clone(), st2];
-        operation_verify(st, op, prev_statements)
-    }
-
     #[test]
     fn test_operation_verify() -> Result<()> {
         // None

src/backends/plonky2/mainpod.rs

@@ -51,18 +51,14 @@ impl PodProver for Prover {
         let operations = MockMainPod::process_private_statements_operations(
             params,
             &statements,
-            &[], // TODO: fill in the merkle proofs
+            &[], // TODO: fill in the merkle proofs for Contains/NotContains ops
             inputs.operations,
         )
         .unwrap();
         let operations =
             MockMainPod::process_public_statements_operations(params, &statements, operations)
                 .unwrap();
 
-        // for (i, op) in statements.iter().enumerate() {
-        //     println!("DBG st {}: {:?}", i, op);
-        // }
-
         let public_statements =
             statements[statements.len() - params.max_public_statements..].to_vec();
         // get the id out of the public statements
@@ -75,12 +71,6 @@ impl PodProver for Prover {
         };
         main_pod.set_targets(&mut pw, &input)?;
 
-        // for (target, name) in &builder.target_names {
-        //     if let Some(v) = pw.target_values.get(target) {
-        //         println!("DBG {}={}", name, v);
-        //     }
-        // }
-
         // generate & verify proof
         let data = builder.build::<C>();
         let proof = data.prove(pw)?;