running...

.gitignore

@@ -22,6 +22,7 @@ prover/tests/traces/bridge/*.proof
 
 # ignore local logs
 *.log
+outputs
 *.sh
 
 # ignore local parameters

README.md

@@ -36,7 +36,6 @@ make download-setup -e degree=DEGREE params_dir=PARAMS_DIR
 And there are other tests:
 - `make test-inner-prove` could be used to test the first-level circuit.
 - `make test-batch-prove` could be used to test the final two levels.
-- `make test-batches-with-each-chunk-num-prove` could be used to test batch proving with different chunk numbers.
 
 ### Binaries
 
@@ -45,17 +44,12 @@ Could use the following command to run binaries locally.
 Run zkevm prover to generate chunk proof (work directory is `./integration`)
 ```shell
 # Params file should be located in `./integration/params`.
-cargo run --release --bin chain_prover -- --params=params --trace=tests/extra_traces/batch_34700/chunk_1236462/block_4176564.json
+cargo run --release --bin trace_prover -- --params=params --trace=tests/extra_traces/batch_34700/chunk_1236462/block_4176564.json
 ```
 
-### Dockers
-
-- `docker/chunk-prover` is used to build and run GPU chunk-prover.
-- `docker/mock-testnet` is used to build and run GPU mock-testnet (inner-prove or chunk-prove).
-
 ### Verifier Contract
 
-Both YUL and bytecode of verifier contract could be generated when running aggregation tests (`make test-e2e-prove`). After running aggregation tests, a new folder is created in `integration` folder of scroll-prover and named like `integration/outputs/agg_tests_*`. It contains below files:
+Both YUL and bytecode of verifier contract could be generated when running aggregation tests (`make test-e2e-prove`). After running aggregation tests, a new folder is created in `integration` folder of scroll-prover and named like `integration/outputs/e2e_tests_*`. It contains below files:
 
 - Chunk protocol: `chunk_chunk_0.protocol`
 - Chunk VK: `vk_chunk_0.vkey`

bin/src/chain_prover.rs

@@ -15,45 +15,45 @@ const DEFAULT_END_BATCH: i64 = i64::MAX;
 
 #[tokio::main]
 async fn main() {
-    init_env_and_log("mock_testnet");
+    init_env_and_log("chain_prover");
 
-    log::info!("mock-testnet: BEGIN");
+    log::info!("chain_prover: BEGIN");
 
     let setting = Setting::new();
-    log::info!("mock-testnet: setting = {setting:?}");
+    log::info!("chain_prover: setting = {setting:?}");
 
     prepare_circuit_capacity_checker();
-    log::info!("mock-testnet: prepared ccc");
+    log::info!("chain_prover: prepared ccc");
 
-    let l2geth = l2geth_client::Client::new("mock-testnet", &setting.l2geth_api_url)
-        .unwrap_or_else(|e| panic!("mock-testnet: failed to initialize ethers Provider: {e}"));
-    let rollupscan = rollupscan_client::Client::new("mock-testnet", &setting.rollupscan_api_url);
+    let l2geth = l2geth_client::Client::new("chain_prover", &setting.l2geth_api_url)
+        .unwrap_or_else(|e| panic!("chain_prover: failed to initialize ethers Provider: {e}"));
+    let rollupscan = rollupscan_client::Client::new("chain_prover", &setting.rollupscan_api_url);
 
     for batch_id in setting.begin_batch..=setting.end_batch {
         let chunks = rollupscan
             .get_chunk_info_by_batch_index(batch_id)
             .await
             .unwrap_or_else(|e| {
-                panic!("mock-testnet: failed to request rollupscan chunks API for batch-{batch_id}: {e}")
+                panic!("chain_prover: failed to request rollupscan chunks API for batch-{batch_id}: {e}")
             });
 
         if chunks.is_none() {
-            log::warn!("mock-testnet: no chunks in batch-{batch_id}");
+            log::warn!("chain_prover: no chunks in batch-{batch_id}");
             continue;
         }
 
         let mut chunk_proofs = vec![];
         for chunk in chunks.unwrap() {
             let chunk_id = chunk.index;
-            log::info!("mock-testnet: handling chunk {:?}", chunk_id);
+            log::info!("chain_prover: handling chunk {:?}", chunk_id);
 
             let mut block_traces: Vec<BlockTrace> = vec![];
             for block_num in chunk.start_block_number..=chunk.end_block_number {
                 let trace = l2geth
                     .get_block_trace_by_num(block_num)
                     .await
                     .unwrap_or_else(|e| {
-                        panic!("mock-testnet: failed to request l2geth block-trace API for batch-{batch_id} chunk-{chunk_id} block-{block_num}: {e}")
+                        panic!("chain_prover: failed to request l2geth block-trace API for batch-{batch_id} chunk-{chunk_id} block-{block_num}: {e}")
                     });
 
                 block_traces.push(trace);
@@ -62,7 +62,7 @@ async fn main() {
             let witness_block = match build_block(&block_traces, batch_id, chunk_id) {
                 Ok(block) => block,
                 Err(e) => {
-                    log::error!("mock-testnet: building block failed {e:?}");
+                    log::error!("chain_prover: building block failed {e:?}");
                     continue;
                 }
             };
@@ -71,7 +71,7 @@ async fn main() {
             }
 
             let chunk_proof = prove_utils::prove_chunk(
-                &format!("mock-testnet: batch-{batch_id} chunk-{chunk_id}"),
+                &format!("chain_prover: batch-{batch_id} chunk-{chunk_id}"),
                 &witness_block,
             );
 
@@ -81,10 +81,10 @@ async fn main() {
         }
 
         #[cfg(feature = "batch-prove")]
-        prove_utils::prove_batch(&format!("mock-testnet: batch-{batch_id}"), chunk_proofs);
+        prove_utils::prove_batch(&format!("chain_prover: batch-{batch_id}"), chunk_proofs);
     }
 
-    log::info!("mock-testnet: END");
+    log::info!("chain_prover: END");
 }
 
 fn build_block(block_traces: &[BlockTrace], batch_id: i64, chunk_id: i64) -> Result<WitnessBlock> {
@@ -104,7 +104,7 @@ struct Setting {
 impl Setting {
     pub fn new() -> Self {
         let l2geth_api_url =
-            env::var("L2GETH_API_URL").expect("mock-testnet: Must set env L2GETH_API_URL");
+            env::var("L2GETH_API_URL").expect("chain_prover: Must set env L2GETH_API_URL");
         let rollupscan_api_url = env::var("ROLLUPSCAN_API_URL");
         let rollupscan_api_url =
             rollupscan_api_url.unwrap_or_else(|_| "http://10.0.3.119:8560/api/chunks".to_string());

docker/chunk-prover/gpu/docker-compose.yml → docker/trace-prover/gpu/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   chunk_prover:
     image: {DOCKER_IMAGE}
     runtime: nvidia
-    container_name: chunk-prover-gpu
+    container_name: trace-prover-gpu
     environment:
       - CHAIN_ID={CHAIN_ID}
     volumes:

integration/tests/unit_tests.rs

@@ -26,7 +26,7 @@ fn test_capacity_checker() {
 
     let block_traces = load_chunk_for_test().1;
 
-    let full = false;
+    let full = true;
     let batch_id = 0;
     let chunk_id = 0;
     let avg_each_tx_time = if full {