feat: verifier crate checks vk root (#1085)

* works

* groth cleanup

* also do plonk

* refac

* reuse verifier_vks

* cleanup;

* fmt and clipy

Author: yuwen01

Cargo.lock

@@ -8,7 +8,6 @@ license = { workspace = true }
 repository = { workspace = true }
 keywords = { workspace = true }
 categories = { workspace = true }
-exclude = ["src/vk_map.bin"]
 
 [dependencies]
 sp1-recursion-compiler = { workspace = true }

crates/prover/Cargo.toml

@@ -80,8 +80,8 @@ fi
 # fi
 
 # # Copy Groth16 and Plonk vks to verifier crate
-cp ./build/groth16/groth16_vk.bin ../verifier/bn254-vk/groth16_vk.bin
-cp ./build/plonk/plonk_vk.bin ../verifier/bn254-vk/plonk_vk.bin
+cp ./build/groth16/groth16_vk.bin ../verifier/vk-artifacts/groth16_vk.bin
+cp ./build/plonk/plonk_vk.bin ../verifier/vk-artifacts/plonk_vk.bin
 
 echo "Successfully uploaded build artifacts to S3:"
 echo "- s3://$S3_BUCKET/$GROTH16_ARCHIVE"

crates/prover/build.rs

@@ -2,7 +2,7 @@
 
 use itertools::Itertools;
 use sha2::{Digest, Sha256};
-use slop_algebra::{AbstractField, PrimeField, PrimeField32};
+use slop_algebra::{AbstractField, PrimeField32};
 use slop_bn254::Bn254Fr;
 use sp1_hypercube::{koalabears_to_bn254, MachineVerifyingKey, SP1PcsProofOuter, ShardProof};
 use sp1_primitives::{io::sha256_hash, SP1Field, SP1OuterGlobalContext};
@@ -21,6 +21,7 @@ use sp1_recursion_gnark_ffi::{
     ffi::{build_groth16_bn254, build_plonk_bn254},
     GnarkWitness,
 };
+use sp1_verifier::VK_ROOT_BYTES;
 use std::{
     borrow::Borrow,
     fs::File,
@@ -41,9 +42,7 @@ use {
 
 use crate::{
     components::{CpuSP1ProverComponents, SP1ProverComponents},
-    recursion::RecursionVks,
     utils::words_to_bytes,
-    worker::DEFAULT_MAX_COMPOSE_ARITY,
     SP1_CIRCUIT_VERSION,
 };
 
@@ -213,11 +212,9 @@ pub fn get_groth16_vkey_hash(build_dir: &Path) -> [u8; 32] {
     Sha256::digest(vk_bin_bytes).into()
 }
 
-/// Get the vk root.
+/// Get the vk root as a hex string.
 pub fn get_vk_root() -> String {
-    let root_field = RecursionVks::new(None, DEFAULT_MAX_COMPOSE_ARITY, true).root();
-    let bigint = koalabears_to_bn254(&root_field).as_canonical_biguint();
-    bigint.to_str_radix(16)
+    hex::encode(*VK_ROOT_BYTES)
 }
 
 /// Build the Plonk contracts.

crates/prover/release.sh

@@ -5,17 +5,14 @@ use crate::{
 };
 use anyhow::{anyhow, Result};
 use num_bigint::BigUint;
-use serde::{Deserialize, Serialize};
 use slop_algebra::{AbstractField, PrimeField};
-use slop_challenger::IopCtx;
 use sp1_core_executor::SP1RecursionProof;
 use sp1_core_machine::riscv::MAX_LOG_NUMBER_OF_SHARDS;
 use sp1_hypercube::{
     air::{PublicValues, POSEIDON_NUM_WORDS, PV_DIGEST_NUM_WORDS},
-    koalabears_to_bn254, verify_merkle_proof, HashableKey, MachineVerifier,
-    MachineVerifierConfigError, MachineVerifierError, MachineVerifyingKey, MerkleProof,
-    SP1InnerPcs, SP1OuterPcs, SP1PcsProofInner, SP1PcsProofOuter, SP1VerifyingKey, SP1WrapProof,
-    PROOF_MAX_NUM_PVS,
+    koalabears_to_bn254, HashableKey, MachineVerifier, MachineVerifierConfigError,
+    MachineVerifierError, MachineVerifyingKey, SP1InnerPcs, SP1OuterPcs, SP1PcsProofInner,
+    SP1PcsProofOuter, SP1VerifyingKey, SP1WrapProof, PROOF_MAX_NUM_PVS,
 };
 use sp1_primitives::{
     io::{blake3_hash, SP1PublicValues},
@@ -26,6 +23,7 @@ use sp1_recursion_executor::RecursionPublicValues;
 use sp1_recursion_gnark_ffi::{
     Groth16Bn254Proof, Groth16Bn254Prover, PlonkBn254Proof, PlonkBn254Prover,
 };
+pub use sp1_verifier::VerifierRecursionVks;
 use sp1_verifier::{Groth16Verifier, PlonkVerifier, GROTH16_VK_BYTES, PLONK_VK_BYTES};
 use std::{borrow::Borrow, str::FromStr};
 use thiserror::Error;
@@ -62,46 +60,6 @@ bn254 proof"
 /// The verifying key for the program wrapping an SP1 proof into a SNARK friendly format.
 pub const WRAP_VK_BYTES: &[u8] = include_bytes!("../wrap_vk.bin");
 
-/// The recursion verifying keys used by the SP1 verifier.
-pub const VERIFIER_VK_DATA_BYTES: &[u8] = include_bytes!("../verifier_vks.bin");
-
-#[derive(Clone, Serialize, Debug, PartialEq, Eq, Deserialize)]
-pub struct VerifierRecursionVks {
-    pub root: <SP1GlobalContext as IopCtx>::Digest,
-    pub vk_verification: bool,
-    pub num_keys: usize,
-}
-
-impl Default for VerifierRecursionVks {
-    fn default() -> Self {
-        bincode::deserialize(VERIFIER_VK_DATA_BYTES).unwrap()
-    }
-}
-
-impl VerifierRecursionVks {
-    pub fn vk_verification(&self) -> bool {
-        self.vk_verification
-    }
-    pub fn root(&self) -> <SP1GlobalContext as IopCtx>::Digest {
-        self.root
-    }
-
-    pub fn num_keys(&self) -> usize {
-        self.num_keys
-    }
-
-    pub fn verify(
-        &self,
-        proof: &MerkleProof<SP1GlobalContext>,
-        vk: &MachineVerifyingKey<SP1GlobalContext>,
-    ) -> bool {
-        if !self.vk_verification {
-            return true;
-        }
-        verify_merkle_proof(proof, vk.hash_koalabear(), self.root).is_ok()
-    }
-}
-
 #[derive(Clone)]
 pub struct SP1Verifier {
     pub core: MachineVerifier<SP1GlobalContext, CoreSC>,

crates/prover/src/build.rs

@@ -30,6 +30,7 @@ sp1-primitives = { workspace = true }
 sp1-recursion-machine = { workspace = true, default-features = false }
 sp1-recursion-executor = { workspace = true, default-features = false }
 slop-algebra = { workspace = true }
+slop-challenger = { workspace = true }
 slop-primitives = { workspace = true }
 slop-symmetric = { workspace = true }
 

crates/prover/src/verify.rs

@@ -16,7 +16,7 @@ SP1 zkVM context is patched, in order to make use of the
 
 ### Pre-generated verification keys
 
-Verification keys for Groth16 and Plonk are stored in the [`bn254-vk`](./bn254-vk/) directory. These
+Verification keys for Groth16 and Plonk are stored in the [`vk-artifacts`](./vk-artifacts/) directory. These
 vkeys are used to verify all SP1 proofs.
 
 These vkeys are the same as those found locally in

crates/verifier/Cargo.toml

@@ -13,7 +13,11 @@ use sp1_primitives::{fri_params::recursion_fri_config, poseidon2_hasher, SP1Fiel
 use sp1_recursion_executor::{RecursionPublicValues, NUM_PV_ELMS_TO_HASH};
 
 use super::CompressedError;
-use crate::{blake3_hash, hash_public_inputs, hash_public_inputs_with_fn};
+use crate::{
+    blake3_hash,
+    compressed::{RECURSION_LOG_STACKING_HEIGHT, RECURSION_MAX_LOG_ROW_COUNT},
+    hash_public_inputs, hash_public_inputs_with_fn,
+};
 
 /// The finite field used for compress proofs.
 type GC = sp1_primitives::SP1GlobalContext;
@@ -25,9 +29,6 @@ pub const COMPRESS_DEGREE: usize = 3;
 
 pub type CompressAir<SP1Field> = sp1_recursion_machine::RecursionAir<SP1Field, COMPRESS_DEGREE, 2>;
 
-pub const RECURSION_LOG_STACKING_HEIGHT: u32 = 20;
-pub const RECURSION_MAX_LOG_ROW_COUNT: usize = 21;
-
 // // The rest of the functions in this file have been copied from elsewhere with slight
 // modifications.