Execute before prove

anylots · anylots · commit 62365771a8fc · 2025-11-27T00:47:38.000+08:00
diff --git a/prover/Cargo.lock b/prover/Cargo.lock
diff --git a/prover/bin/server/src/queue.rs b/prover/bin/server/src/queue.rs
@@ -120,8 +120,9 @@ fn save_batch_header(blocks: &mut Vec<BlockTrace>, batch_index: u64) -> bool {
     let proof_dir = PROVER_PROOF_DIR.to_string() + format!("/batch_{}", batch_index).as_str();
     std::fs::create_dir_all(&proof_dir).expect("failed to create proof path");
     blocks.iter_mut().for_each(|blobk| blobk.flatten());
+    let verify_result = EVMVerifier::verify(blocks);
 
-    if let Ok(batch_info) = EVMVerifier::verify(blocks) {
+    if let Ok(batch_info) = verify_result {
         let blob_info = morph_executor_host::get_blob_info(blocks).unwrap();
         let (versioned_hash, _) = BlobVerifier::verify(&blob_info, blocks.len()).unwrap();
 
@@ -137,7 +138,7 @@ fn save_batch_header(blocks: &mut Vec<BlockTrace>, batch_index: u64) -> bool {
         batch_file.write_all(&batch_header[..]).expect("failed to batch_header");
         true
     } else {
-        let e = EVMVerifier::verify(blocks).unwrap_err();
+        let e = verify_result.unwrap_err();
         let error_data = serde_json::json!({
             "error_code": "EVM_EXECUTE_NOT_EXPECTED",
             "error_msg": e.to_string()
@@ -209,3 +210,19 @@ fn save_trace(batch_index: u64, chunk_traces: &Vec<BlockTrace>) {
     serde_json::to_writer_pretty(writer, &chunk_traces).unwrap();
     log::info!("chunk_traces of batch_index = {:#?} saved", batch_index);
 }
+
+#[test]
+fn test_save_execute() {
+    let batch_index = 102u64;
+
+    let mut blocks = load_trace("../../testdata/viridian/eip7702_traces.json");
+    println!("blocks.len(): {:?}", blocks.len());
+    let traces = blocks.first_mut().unwrap();
+
+    if !save_batch_header(traces, batch_index) {
+        save_trace(batch_index, traces);
+        println!("save_batch_header error");
+    } else {
+        println!("save_batch_header success");
+    }
+}
diff --git a/prover/crates/core/Cargo.toml b/prover/crates/core/Cargo.toml
@@ -21,6 +21,7 @@ tiny-keccak.workspace = true
 
 sbv-primitives.workspace = true
 sbv-utils.workspace = true
+cfg-if =  { workspace = true }
 
 [dev-dependencies]
 ctor.workspace = true
diff --git a/prover/crates/core/src/database.rs b/prover/crates/core/src/database.rs
@@ -193,12 +193,17 @@ impl DatabaseRef for ReadOnlyDB {
         // then the upcoming trace contains code (meaning the code is used in this new block),
         // we can't directly update the CacheDB, so we offer the code by hash here.
         // However, if the code still cannot be found, this is an error.
-        self.code_db.get(&hash).cloned().ok_or_else(|| {
-            unreachable!(
-                "Code is either loaded or not needed (like EXTCODESIZE), code hash: {:?}",
-                hash
-            );
-        })
+        // self.code_db.get(&hash).cloned().ok_or_else(|| {
+        //     unreachable!(
+        //         "Code is either loaded or not needed (like EXTCODESIZE), code hash: {:?}",
+        //         hash
+        //     );
+        // })
+
+        Ok(self.code_db.get(&hash).cloned().unwrap_or_else(|| {
+            println!("---------------->code_by_hash_ref error: {:?}", hash);
+            Bytecode::default()
+        }))
     }
 
     /// Get storage value of address at index.
diff --git a/prover/crates/core/src/executor/mod.rs b/prover/crates/core/src/executor/mod.rs
@@ -92,6 +92,12 @@ impl EvmExecutor<'_> {
         };
 
         for (idx, tx) in l2_trace.transactions().enumerate() {
+            cfg_if::cfg_if! {
+                if #[cfg(not(target_os = "zkvm"))] {
+                    println!("handle block: {:?}, handle tx: {:?}th", l2_trace.number(), idx);
+                }
+            }
+
             cycle_tracker_start!("handle tx {}", idx);
 
             dev_trace!("handle {idx}th tx");
@@ -277,9 +283,11 @@ impl EvmExecutor<'_> {
                 poseidon_code_hash.0,
             ];
             cycle_track!(
-                zktrie
-                    .update_account(addr.as_slice(), &acc_data)
-                    .unwrap_or_else(|_| panic!("failed to update account: {}", addr)),
+                zktrie.update_account(addr.as_slice(), &acc_data).unwrap_or_else(|e| println!(
+                    "---------------->failed to update account: {:?}, address: {:?}",
+                    addr,
+                    e.to_string()
+                )),
                 "Zktrie::update_account"
             );
 
