Merge pull request #12 from yugocabrio/clean1216

feat:  add proof size consts and drop unused loader

Author: yugocabrio

src/lib.rs

@@ -14,5 +14,7 @@ pub mod transcript;
 pub mod types;
 pub mod utils;
 pub mod verifier;
-pub use utils::load_proof_and_public_inputs;
+pub const PROOF_FIELDS: usize = 456;
+pub const PROOF_BYTES: usize = PROOF_FIELDS * 32;
+
 pub use verifier::UltraHonkVerifier;

src/utils.rs

@@ -347,41 +347,3 @@ pub fn load_vk_from_json(json_data: &str) -> VerificationKey {
         lagrange_last,
     }
 }
-
-/// Load a VerificationKey from a `vk` binary emitted by `bb write_vk --output_format bytes_and_fields`.
-/// This parser assumes the `vk` file contains a flat sequence of BN254 G1 affine elements (x||y),
-/// each coordinate encoded as 32-byte big-endian field element. If the length does not match an
-/// integral number of points, or on-curve checks fail, this function returns None.
-
-/// Load a proof and public inputs from a byte array.
-pub fn load_proof_and_public_inputs(bytes: &[u8]) -> (Vec<Fr>, Vec<u8>) {
-    // First 4 bytes = total number of field elements (big-endian)
-    let total_fields = u32::from_be_bytes(bytes[0..4].try_into().unwrap()) as usize;
-
-    // Proof is always 440 field elements
-    const PROOF_NUM_FIELDS: usize = 440;
-    assert!(
-        total_fields >= PROOF_NUM_FIELDS,
-        "total_fields < proof field count"
-    );
-    let num_inputs = total_fields - PROOF_NUM_FIELDS;
-
-    // Next num_inputs × 32 bytes = public inputs
-    let mut public_inputs = Vec::with_capacity(num_inputs);
-    let mut cursor = 4; // start right after the 4-byte header
-    for _ in 0..num_inputs {
-        let mut bytes32 = [0u8; 32];
-        bytes32.copy_from_slice(&bytes[cursor..cursor + 32]);
-        public_inputs.push(bytes_to_fr(&bytes32));
-        cursor += 32;
-    }
-
-    // Remaining bytes = proof (must be 440 × 32 bytes)
-    let proof_bytes = bytes[cursor..].to_vec();
-    assert!(
-        proof_bytes.len() == PROOF_NUM_FIELDS * 32,
-        "invalid proof length"
-    );
-
-    (public_inputs, proof_bytes)
-}

src/verifier.rs

@@ -61,10 +61,22 @@ impl UltraHonkVerifier {
         // 1) parse proof
         let proof = load_proof(proof_bytes);
 
-        // 2) sanity on public inputs
-        // If VK metadata is missing/zero, fall back to actual provided public inputs.
-        // Newer bb versions may omit header fields in vk_fields.json.
-        // We avoid failing hard here and instead trust caller-provided inputs.
+        // 2) sanity on public inputs (length and VK metadata if present)
+        if public_inputs_bytes.iter().any(|pi| pi.len() != 32) {
+            return Err(VerifyError::InvalidInput(
+                "public inputs must be 32 bytes each".into(),
+            ));
+        }
+        if self.vk.public_inputs_size != 0 {
+            let expected = self.vk.public_inputs_size.saturating_sub(16);
+            let provided = public_inputs_bytes.len() as u64;
+            if expected != provided {
+                return Err(VerifyError::InvalidInput(format!(
+                    "public inputs count mismatch (vk: {}, provided: {})",
+                    expected, provided
+                )));
+            }
+        }
 
         // 3) Fiat–Shamir transcript
         // In bb v0.87.0, publicInputsSize includes pairing point object (16 elements)