add --skip-script-verify and --skip-all-verify for ckb import

Signed-off-by: Eval EXEC <[email protected]>

Author: eval-exec

Cargo.lock

@@ -35,6 +35,10 @@ pub const ARG_FORMAT: &str = "format";
 pub const ARG_TARGET: &str = "target";
 /// Command line argument `--source`.
 pub const ARG_SOURCE: &str = "source";
+/// Command line flag: `--skip-script-verify`.
+pub const ARG_SKIP_SCRIPT_VERIFY: &str = "skip-script-verify";
+/// Command line flag: `--skip-all-verify`.
+pub const ARG_SKIP_ALL_VERIFY: &str = "skip-all-verify";
 /// Command line argument `--data`.
 pub const ARG_DATA: &str = "data";
 /// Command line argument `--list-chains`.
@@ -385,14 +389,30 @@ fn export() -> Command {
 }
 
 fn import() -> Command {
-    Command::new(CMD_IMPORT).about("Import CKB data").arg(
-        Arg::new(ARG_SOURCE)
-            .index(1)
-            .value_name("path")
-            .value_parser(clap::builder::PathBufValueParser::new())
-            .required(true)
-            .help("Specify the exported data path"),
-    )
+    Command::new(CMD_IMPORT)
+        .about("Import CKB data")
+        .arg(
+            Arg::new(ARG_SOURCE)
+                .index(1)
+                .value_name("path")
+                .value_parser(clap::builder::PathBufValueParser::new())
+                .required(true)
+                .help("Specify the exported data path"),
+        )
+        .arg(
+            //
+            Arg::new(ARG_SKIP_SCRIPT_VERIFY)
+                .required(false)
+                .action(clap::ArgAction::SetTrue)
+                .help("Skip script verification during import"),
+        )
+        .arg(
+            //
+            Arg::new(ARG_SKIP_ALL_VERIFY)
+                .action(clap::ArgAction::SetTrue)
+                .required(false)
+                .help("Skip all verifications during import"),
+        )
 }
 
 fn migrate() -> Command {

ckb-bin/src/cli.rs

@@ -9,6 +9,7 @@ use ckb_chain_spec::{ChainSpec, consensus::Consensus};
 use ckb_jsonrpc_types::{Either, ScriptHashType};
 use ckb_logger::{error, info};
 use ckb_types::{H256, U256, u256};
+use ckb_verification_traits::Switch;
 use clap::ArgMatches;
 use std::{path::PathBuf, str::FromStr};
 
@@ -222,10 +223,21 @@ H256::from_str(&target[2..]).expect("default assume_valid_target for testnet mus
             })?
             .clone();
 
+        let switch = {
+            if matches.get_flag(cli::ARG_SKIP_ALL_VERIFY) {
+                Switch::DISABLE_ALL
+            } else if matches.get_flag(cli::ARG_SKIP_SCRIPT_VERIFY) {
+                Switch::DISABLE_SCRIPT
+            } else {
+                Switch::NONE
+            }
+        };
+
         Ok(ImportArgs {
             config,
             consensus,
             source,
+            switch,
         })
     }
 

ckb-bin/src/setup.rs

@@ -20,7 +20,7 @@ pub fn import(args: ImportArgs, async_handle: Handle) -> Result<(), ExitCode> {
     pack.take_tx_pool_builder();
     pack.take_relay_tx_receiver();
 
-    Import::new(chain_controller, args.source)
+    Import::new(chain_controller, args.source, args.switch)
         .execute()
         .map_err(|err| {
             eprintln!("Import error: {err:?}");

ckb-bin/src/subcommand/import.rs

@@ -16,6 +16,7 @@ path-clean.workspace = true
 ckb-logger.workspace = true
 ckb-logger-config.workspace = true
 ckb-metrics-config.workspace = true
+ckb-verification-traits.workspace = true
 ckb-chain-spec.workspace = true
 ckb-jsonrpc-types.workspace = true
 ckb-pow.workspace = true

util/app-config/Cargo.toml

@@ -4,6 +4,7 @@ use ckb_jsonrpc_types::{Either, ScriptHashType};
 use ckb_pow::PowEngine;
 use ckb_systemtime::unix_time_as_millis;
 use ckb_types::packed::Byte32;
+use ckb_verification_traits::Switch;
 use std::path::PathBuf;
 use std::sync::Arc;
 
@@ -40,6 +41,8 @@ pub struct ImportArgs {
     pub consensus: Consensus,
     /// The path to the file to be imported.
     pub source: PathBuf,
+    /// The switch to control the verification behavior.
+    pub switch: Switch,
 }
 
 /// Parsed command line arguments for `ckb run`.

util/app-config/src/args.rs

@@ -15,6 +15,7 @@ ckb-store.workspace = true
 ckb-chain-iter.workspace = true
 ckb-shared.workspace = true
 ckb-jsonrpc-types.workspace = true
+ckb-verification-traits.workspace = true
 serde_json.workspace = true
 indicatif = { workspace = true, optional = true }
 

util/instrument/Cargo.toml

@@ -1,6 +1,7 @@
 use ckb_chain::ChainController;
 use ckb_jsonrpc_types::BlockView as JsonBlock;
 use ckb_types::core;
+use ckb_verification_traits::Switch;
 #[cfg(feature = "progress_bar")]
 use indicatif::{ProgressBar, ProgressStyle};
 use std::error::Error;
@@ -15,12 +16,17 @@ pub struct Import {
     /// source file contains block data
     source: PathBuf,
     chain: ChainController,
+    switch: Switch,
 }
 
 impl Import {
     /// Creates a new import job.
-    pub fn new(chain: ChainController, source: PathBuf) -> Self {
-        Import { chain, source }
+    pub fn new(chain: ChainController, source: PathBuf, switch: Switch) -> Self {
+        Import {
+            chain,
+            source,
+            switch,
+        }
     }
 
     /// Executes the import job.
@@ -64,7 +70,7 @@ impl Import {
             let block: Arc<core::BlockView> = Arc::new(block.into());
             if !block.is_genesis() {
                 self.chain
-                    .blocking_process_block(block)
+                    .blocking_process_block_with_switch(block, self.switch)
                     .expect("import occur malformation data");
             }
             progress_bar.inc(s.len() as u64);