[WIP] Integrate aggregation circuit #160
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,27 +1,44 @@ | ||||||
| use crate::utils::{c_char_to_str, c_char_to_vec, vec_to_c_char}; | ||||||
| use libc::c_char; | ||||||
| use prover::{aggregator, config::ALL_AGG_DEGREES, utils::init_env_and_log, zkevm}; | ||||||
| use std::cell::OnceCell; | ||||||
| use types::eth::BlockTrace; | ||||||
|
|
||||||
| static mut CHUNK_PROVER: OnceCell<zkevm::Prover> = OnceCell::new(); | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. Sorry, should we also need zkevm-prover (suppose to delete it when update)? Since both two-layer-compression proof (inner-snark -> compression-wide -> compression-thin) and aggregation-proof are generated by aggregator-prover. There was a problem hiding this comment. Or There was a problem hiding this comment. Update to ZKEVM_PROVER in commit fc94edf. |
||||||
| static mut AGG_PROVER: OnceCell<aggregator::Prover> = OnceCell::new(); | ||||||
| static mut AGG_CHUNK_TRACES: OnceCell<Vec<Vec<BlockTrace>>> = OnceCell::new(); | ||||||
|
There was a problem hiding this comment. Delete it in commit fc94edf. |
||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn init_chunk_prover(params_dir: *const c_char) { | ||||||
| init_env_and_log("ffi_chunk_prove"); | ||||||
|
|
||||||
| let params_dir = c_char_to_str(params_dir); | ||||||
| let prover = zkevm::Prover::from_params_dir(params_dir); | ||||||
| CHUNK_PROVER.set(prover).unwrap(); | ||||||
| } | ||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn init_agg_prover(params_dir: *const c_char) { | ||||||
| init_env_and_log("ffi_agg_prove"); | ||||||
|
|
||||||
| let params_dir = c_char_to_str(params_dir); | ||||||
|
|
||||||
| let prover = aggregator::Prover::from_params_dir(params_dir, &ALL_AGG_DEGREES); | ||||||
| AGG_PROVER.set(prover).unwrap(); | ||||||
| } | ||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn create_block_proof(trace_char: *const c_char) -> *const c_char { | ||||||
| let trace_vec = c_char_to_vec(trace_char); | ||||||
| let trace = serde_json::from_slice::<BlockTrace>(&trace_vec).unwrap(); | ||||||
| let proof = CHUNK_PROVER | ||||||
| .get_mut() | ||||||
| .unwrap() | ||||||
| .gen_chunk_proof(&[trace]) | ||||||
| .unwrap(); | ||||||
| let proof_bytes = serde_json::to_vec(&proof).unwrap(); | ||||||
| vec_to_c_char(proof_bytes) | ||||||
| } | ||||||
|
|
@@ -31,11 +48,51 @@ pub unsafe extern "C" fn create_block_proof(trace_char: *const c_char) -> *const | |||||
| pub unsafe extern "C" fn create_chunk_proof(trace_char: *const c_char) -> *const c_char { | ||||||
| let trace_vec = c_char_to_vec(trace_char); | ||||||
| let traces = serde_json::from_slice::<Vec<BlockTrace>>(&trace_vec).unwrap(); | ||||||
| let proof = CHUNK_PROVER | ||||||
| .get_mut() | ||||||
| .unwrap() | ||||||
| .gen_chunk_proof(traces.as_slice()) | ||||||
| .unwrap(); | ||||||
| let proof_bytes = serde_json::to_vec(&proof).unwrap(); | ||||||
| vec_to_c_char(proof_bytes) | ||||||
| } | ||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn add_agg_chunk_trace(trace_char: *const c_char) { | ||||||
|
There was a problem hiding this comment. we should not make a stateful API. You should just create a single API There was a problem hiding this comment. Yes. There is no this API for final FFI (have not finished updated FFI). Will update as two FFI functions:
Is it right? Thanks. There was a problem hiding this comment. Updated (in-progress) functions gen_chunk_proof and gen_agg_proof in There was a problem hiding this comment. Update FFI prove to gen_chunk_proof and gen_agg_proof in commit fc94edf. |
||||||
| let trace_vec = c_char_to_vec(trace_char); | ||||||
| let trace = serde_json::from_slice::<Vec<_>>(&trace_vec).unwrap(); | ||||||
|
|
||||||
| AGG_CHUNK_TRACES | ||||||
| .get_mut() | ||||||
| .or_else(|| { | ||||||
| AGG_CHUNK_TRACES.set(vec![]).unwrap(); | ||||||
| AGG_CHUNK_TRACES.get_mut() | ||||||
| }) | ||||||
| .unwrap() | ||||||
| .push(trace); | ||||||
| } | ||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn clear_agg_chunk_traces() { | ||||||
| if let Some(chunk_traces) = AGG_CHUNK_TRACES.get_mut() { | ||||||
| chunk_traces.clear(); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| /// # Safety | ||||||
| #[no_mangle] | ||||||
| pub unsafe extern "C" fn create_agg_proof() -> *const c_char { | ||||||
| // Consume the chunk traces (take and clear). | ||||||
| let chunk_traces = AGG_CHUNK_TRACES.take().unwrap(); | ||||||
|
|
||||||
| let proof = AGG_PROVER | ||||||
| .get_mut() | ||||||
| .unwrap() | ||||||
| .gen_agg_proof(chunk_traces, None) | ||||||
| .unwrap(); | ||||||
|
|
||||||
| let proof_bytes = serde_json::to_vec(&proof).unwrap(); | ||||||
| vec_to_c_char(proof_bytes) | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,64 @@ | ||
| use crate::utils::{c_char_to_str, c_char_to_vec}; | ||
| use libc::c_char; | ||
| use prover::{aggregator, config::AGG_LAYER4_DEGREE, utils::init_env_and_log, zkevm, Proof}; | ||
| use std::{fs::File, io::Read}; | ||
|
|
||
| static mut CHUNK_VERIFIER: Option<&zkevm::Verifier> = None; | ||
| static mut AGG_VERIFIER: Option<&aggregator::Verifier> = None; | ||
|
|
||
| /// # Safety | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn init_chunk_verifier(params_dir: *const c_char, vk_path: *const c_char) { | ||
| init_env_and_log("ffi_chunk_verify"); | ||
|
|
||
| let vk_path = c_char_to_str(vk_path); | ||
| let mut f = File::open(vk_path).unwrap(); | ||
| let mut vk = vec![]; | ||
| f.read_to_end(&mut vk).unwrap(); | ||
|
|
||
| let params_dir = c_char_to_str(params_dir); | ||
| let verifier = Box::new(zkevm::Verifier::from_params_dir(params_dir, Some(vk))); | ||
|
|
||
| CHUNK_VERIFIER = Some(Box::leak(verifier)); | ||
| } | ||
|
|
||
| /// # Safety | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn init_agg_verifier(params_dir: *const c_char, vk_path: *const c_char) { | ||
| init_env_and_log("ffi_agg_verify"); | ||
|
|
||
| let vk_path = c_char_to_str(vk_path); | ||
| let mut f = File::open(vk_path).unwrap(); | ||
| let mut vk = vec![]; | ||
| f.read_to_end(&mut vk).unwrap(); | ||
|
|
||
| let params_dir = c_char_to_str(params_dir); | ||
| let verifier = Box::new(aggregator::Verifier::from_params_dir( | ||
| params_dir, | ||
| *AGG_LAYER4_DEGREE, | ||
| Some(vk), | ||
| )); | ||
|
|
||
| AGG_VERIFIER = Some(Box::leak(verifier)); | ||
| } | ||
|
|
||
| /// # Safety | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn verify_chunk_proof(proof: *const c_char) -> c_char { | ||
| let proof_vec = c_char_to_vec(proof); | ||
| let proof = serde_json::from_slice::<Proof>(proof_vec.as_slice()).unwrap(); | ||
| let verified = CHUNK_VERIFIER.unwrap().verify_chunk_proof(proof).is_ok(); | ||
|
|
||
| verified as c_char | ||
| } | ||
|
|
||
| /// # Safety | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn verify_agg_proof(proof: *const c_char) -> c_char { | ||
| let proof_vec = c_char_to_vec(proof); | ||
| let proof = serde_json::from_slice::<Proof>(proof_vec.as_slice()).unwrap(); | ||
|
|
||
| let verified = AGG_VERIFIER.unwrap().verify_agg_proof(proof).is_ok(); | ||
|
|
||
| verified as c_char | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel it's better to organize the files as
zkevm.rsandaggregator.rswhere each file contains both its prover and verifier.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-organize FFI to
zkevm.rsandaggregator.rsin commit d23c3e7.