Implement circuit asserting that points aren't at infinity and public key isn't the neg generator point

beacon-light-client/plonky2/.gitignore

@@ -3,3 +3,4 @@ gnark_plonky2_verifier/DendrETH
 gnark_plonky2_verifier/circuit/srs_setup
 gnark_plonky2_verifier/circuit/solidity_bytes.bin
 gnark_plonky2_verifier/public_witness.bin
+circuits_executables/

beacon-light-client/plonky2/crates/circuit_executables/Cargo.toml

@@ -8,14 +8,20 @@ edition.workspace = true
 [dependencies]
 circuit = { path = "../circuit" }
 circuits = { path = "../circuits" }
-redis = { version = "0.23", features = ["aio", "async-std-comp", "connection-manager", "json"] }
+redis = { version = "0.23", features = [
+    "aio",
+    "async-std-comp",
+    "connection-manager",
+    "json",
+] }
 num = { version = "0.4.0", features = ["serde"] }
 plonky2 = { git = "https://github.com/metacraft-labs/plonky2" }
 starky = { git = "https://github.com/metacraft-labs/plonky2" }
 plonky2-circuit-serializer = { git = "https://github.com/metacraft-labs/plonky2-circuit-serializer" }
 starky_bls12_381 = { git = "https://github.com/metacraft-labs/starky_bls12_381" }
 serde = "1.0.164"
 serde_json = "1.0.96"
+serde_yaml = "0.9.34"
 anyhow = "1.0.71"
 hex = "0.4.3"
 redis-work-queue = "0.1.3"

beacon-light-client/plonky2/crates/circuit_executables/bin/bls12_381.rs

@@ -1,6 +1,7 @@
 use anyhow::Result;
 use circuit::SerdeCircuitTarget;
 use circuit_executables::{
+    bls_components::{set_bls_witness, BlsComponents, BlsProofs, Input},
     constants::SERIALIZED_CIRCUITS_DIR,
     crud::{
         common::{load_circuit_data_starky, load_common_circuit_data_starky, read_from_file},
@@ -12,8 +13,8 @@ use circuits::bls_verification::bls12_381_circuit::BlsCircuitTargets;
 use futures_lite::future;
 
 use plonky2::{
-    field::{goldilocks_field::GoldilocksField, types::Field},
-    iop::witness::{PartialWitness, WitnessWrite},
+    field::goldilocks_field::GoldilocksField,
+    iop::witness::PartialWitness,
     plonk::{config::PoseidonGoldilocksConfig, proof::ProofWithPublicInputs},
     util::serialization::Buffer,
 };
@@ -41,44 +42,33 @@ async fn async_main() -> Result<()> {
 
     let mut proof_storage = create_proof_storage(&matches).await;
 
-    let mut pw = PartialWitness::<GoldilocksField>::new();
-
-    pw.set_target_arr(
-        &targets.pubkey,
-        &hex::decode(pubkey)
-            .unwrap()
-            .iter()
-            .map(|x| GoldilocksField::from_canonical_usize(*x as usize))
-            .collect::<Vec<GoldilocksField>>(),
-    );
-    pw.set_target_arr(
-        &targets.sig,
-        &hex::decode(signature)
-            .unwrap()
-            .iter()
-            .map(|x| GoldilocksField::from_canonical_usize(*x as usize))
-            .collect::<Vec<GoldilocksField>>(),
-    );
-    pw.set_target_arr(
-        &targets.msg,
-        &hex::decode(msg)
-            .unwrap()
-            .iter()
-            .map(|x| GoldilocksField::from_canonical_usize(*x as usize))
-            .collect::<Vec<GoldilocksField>>(),
-    );
-
-    let (pp1, pp2) = get_pairing_precomp_proofs(&mut proof_storage).await;
-    let (ml1, ml2) = get_miller_loop_proofs(&mut proof_storage).await;
+    let (pairing_prec_proof1, pairing_prec_proof2) =
+        get_pairing_precomp_proofs(&mut proof_storage).await;
+    let (miller_loop_proof1, miller_loop_proof2) = get_miller_loop_proofs(&mut proof_storage).await;
     let fp12_mul_proof = get_fp12_mul_proof(&mut proof_storage).await;
     let final_exp_proof = get_final_exp_proof(&mut proof_storage).await;
 
-    pw.set_proof_with_pis_target(&targets.pt_pp1, &pp1);
-    pw.set_proof_with_pis_target(&targets.pt_pp2, &pp2);
-    pw.set_proof_with_pis_target(&targets.pt_ml1, &ml1);
-    pw.set_proof_with_pis_target(&targets.pt_ml2, &ml2);
-    pw.set_proof_with_pis_target(&targets.pt_fp12m, &fp12_mul_proof);
-    pw.set_proof_with_pis_target(&targets.pt_fe, &final_exp_proof);
+    let mut pw = PartialWitness::<GoldilocksField>::new();
+    set_bls_witness(
+        &mut pw,
+        &targets,
+        &BlsComponents {
+            input: Input {
+                pubkey: pubkey.to_string(),
+                signature: signature.to_string(),
+                message: msg.to_string(),
+            },
+            output: true,
+        },
+        &BlsProofs {
+            pairing_prec_proof1,
+            pairing_prec_proof2,
+            miller_loop_proof2,
+            miller_loop_proof1,
+            fp12_mul_proof,
+            final_exp_proof,
+        },
+    );
 
     println!("Starting proof generation");