fix issues in merge

scroll-tech · Jul 11, 2024 · db541f1 · db541f1
1 parent 413a456
commit db541f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common/libzkp/impl/src/batch.rs b/common/libzkp/impl/src/batch.rs
@@ -15,6 +15,7 @@ use prover_v4::{
     BatchHeader, BatchProof as BatchProofV4, BatchProvingTask, BlockTrace, BundleProof,
     BundleProvingTask, ChunkInfo, ChunkProof, MAX_AGG_SNARKS,
 };
+use snark_verifier_sdk::verify_evm_calldata;
 use std::{cell::OnceCell, env, ptr::null};
 
 static mut PROVER: OnceCell<Prover> = OnceCell::new();
@@ -171,7 +172,10 @@ pub unsafe extern "C" fn gen_batch_proof(
 
 /// # Safety
 #[no_mangle]
-pub unsafe extern "C" fn verify_batch_proof(proof: *const c_char) -> c_char {
+pub unsafe extern "C" fn verify_batch_proof(
+    proof: *const c_char,
+    fork_name: *const c_char,
+) -> c_char {
     let proof = c_char_to_vec(proof);
     let fork_name_str = c_char_to_str(fork_name);
     let fork_id = match fork_name_str {

diff --git a/common/libzkp/interface/libzkp.h b/common/libzkp/interface/libzkp.h
@@ -23,4 +23,4 @@ char* gen_chunk_proof(char* block_traces);
 char verify_chunk_proof(char* proof, char* fork_name);
 
 char* block_traces_to_chunk_info(char* block_traces);
-void free_c_chars(char* ptr);
+void free_c_chars(char* ptr);