feat: export and import block

Cargo.toml

@@ -25,6 +25,7 @@ members = [
   "crates/dynamic-config",
   "crates/p2p-network",
   "crates/polyjuice-sender-recover",
+  "crates/godwoken-bin",
 ]
 
 [profile.release]

crates/block-producer/Cargo.toml

@@ -4,13 +4,6 @@ version = "1.3.0"
 authors = ["Nervos Network"]
 edition = "2021"
 
-[lib]
-path = "src/lib.rs"
-
-[[bin]]
-name = "godwoken"
-path = "src/main.rs"
-
 [dependencies]
 gw-challenge = { path = "../challenge" }
 gw-common = { path = "../common" }
@@ -25,20 +18,17 @@ gw-jsonrpc-types = { path = "../jsonrpc-types" }
 gw-rpc-server = { path = "../rpc-server" }
 gw-rpc-client = { path = "../rpc-client" }
 gw-utils = { path = "../utils" }
-gw-version = { path = "../version" }
 gw-ckb-hardfork = { path = "../ckb-hardfork" }
 gw-dynamic-config = { path = "../dynamic-config"}
 gw-polyjuice-sender-recover = { path = "../polyjuice-sender-recover" }
 ckb-crypto = "0.100.0"
 ckb-fixed-hash = "0.100.0"
 ckb-types = "0.100.0"
 ckb-chain-spec = "0.100.0"
-toml = "0.5"
 anyhow = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 async-channel = "1.4.2"
 async-jsonrpc-client = { version = "0.3.0", default-features = false, features = ["http-tokio"] }
-clap = "2.33.3"
 futures = "0.3.13"
 log = "0.4.14"
 serde_json = "1.0"
@@ -48,7 +38,6 @@ openssl = { version = "0.10", features = ["vendored"] }
 hex = "0.4"
 async-trait = "0.1"
 semver = "1.0"
-rayon = "1.5"
 thiserror = "1.0"
 # For latest tracing
 sentry = { git = "https://github.com/getsentry/sentry-rust", rev = "df694a49595d6890c510d80b85cfbb4b5ae6159a" }
@@ -63,10 +52,3 @@ tokio-metrics = "0.1.0"
 console-subscriber = "0.1.3"
 tentacle = "0.4.0"
 gw-p2p-network = { path = "../p2p-network" }
-num_cpus = "1.13.1"
-
-[target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies]
-tikv-jemallocator = { version = "0.4.0", features = ["unprefixed_malloc_on_supported_platforms"] }
-
-[features]
-profiling = ["tikv-jemallocator/profiling"]

crates/block-producer/src/lib.rs

@@ -2,7 +2,6 @@ pub mod block_producer;
 pub mod challenger;
 pub mod cleaner;
 pub mod custodian;
-pub mod db_block_validator;
 pub mod debugger;
 pub mod deposit;
 pub mod poller;

crates/chain/src/chain.rs

@@ -527,13 +527,15 @@ impl Chain {
                     assert_eq!(local_slice, submit_slice);
 
                     // Revert bad blocks
+                    let prev_reverted_block_root = db.get_reverted_block_smt_root()?;
                     db.revert_bad_blocks(&local_reverted_blocks)?;
                     log::debug!("bad blocks reverted");
 
                     let reverted_block_hashes =
                         local_reverted_blocks.iter().map(|b| b.hash().into());
                     db.set_reverted_block_hashes(
                         &db.get_reverted_block_smt_root()?,
+                        prev_reverted_block_root,
                         reverted_block_hashes.collect(),
                     )?;
 
@@ -703,7 +705,8 @@ impl Chain {
 
                             let reverted_block_hashes = db
                                 .get_reverted_block_hashes_by_root(&current_reverted_block_root)?
-                                .expect("reverted block hashes should exists");
+                                .expect("reverted block hashes should exists")
+                                .block_hashes;
 
                             db.rewind_reverted_block_smt(reverted_block_hashes)?;
                             current_reverted_block_root = db.get_reverted_block_smt_root()?;
@@ -768,7 +771,8 @@ impl Chain {
 
                         let reverted_block_hashes = db
                             .get_reverted_block_hashes_by_root(&current_reverted_block_root)?
-                            .expect("reverted block hashes should exists");
+                            .expect("reverted block hashes should exists")
+                            .block_hashes;
 
                         db.rewind_reverted_block_smt(reverted_block_hashes)?;
                         current_reverted_block_root = db.get_reverted_block_smt_root()?;

crates/db/src/iter.rs

@@ -1,10 +1,12 @@
 //! TODO(doc): @quake
 use crate::db::cf_handle;
+use crate::read_only_db::ReadOnlyDB;
 use crate::schema::Col;
 use crate::{
     internal_error, Result, RocksDB, RocksDBSnapshot, RocksDBTransaction,
     RocksDBTransactionSnapshot,
 };
+use rocksdb::ops::GetColumnFamilys;
 use rocksdb::{ops::IterateCF, ReadOptions};
 pub use rocksdb::{DBIterator as DBIter, Direction, IteratorMode};
 
@@ -57,3 +59,15 @@ impl DBIterator for RocksDBSnapshot {
             .map_err(internal_error)
     }
 }
+
+impl DBIterator for ReadOnlyDB {
+    fn iter_opt(&self, col: Col, mode: IteratorMode, readopts: &ReadOptions) -> Result<DBIter> {
+        let cf = self
+            .inner
+            .cf_handle(&col.to_string())
+            .ok_or_else(|| internal_error(format!("column {} not found", col)))?;
+        self.inner
+            .iterator_cf_opt(cf, mode, readopts)
+            .map_err(internal_error)
+    }
+}

crates/db/src/read_only_db.rs

@@ -7,6 +7,7 @@ use std::path::Path;
 use std::sync::Arc;
 
 /// ReadOnlyDB wrapper
+#[derive(Clone)]
 pub struct ReadOnlyDB {
     pub(crate) inner: Arc<RawReadOnlyDB>,
 }

crates/godwoken-bin/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "godwoken-bin"
+version = "1.3.0"
+authors = ["Nervos Network"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0"
+ckb-types = "0.100.0"
+clap = "2.33.3"
+indicatif = "0.16"
+gw-block-producer = { path = "../block-producer" }
+gw-chain = { path = "../chain" }
+gw-challenge = { path = "../challenge" }
+gw-common = { path = "../common" }
+gw-config = { path = "../config" }
+gw-db = { path = "../db" }
+gw-generator = { path = "../generator" }
+gw-jsonrpc-types = { path = "../jsonrpc-types" }
+gw-store = { path = "../store" }
+gw-types = { path = "../types" }
+gw-utils = { path = "../utils" }
+gw-version = { path = "../version" }
+log = "0.4.14"
+num_cpus = "1.13.1"
+rayon = "1.5"
+serde_json = "1.0"
+tokio = { version = "1.17", features = ["full", "tracing"] }
+toml = "0.5"
+
+[target.'cfg(all(not(target_env = "msvc"), not(target_os="macos")))'.dependencies]
+tikv-jemallocator = { version = "0.4.0", features = ["unprefixed_malloc_on_supported_platforms"] }
+
+[features]
+profiling = ["tikv-jemallocator/profiling"]
+
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "godwoken"
+path = "src/main.rs"

crates/godwoken-bin/src/lib.rs

@@ -0,0 +1 @@
+pub mod subcommand;