Add reseal-on-txs option

Author: kseo

codechain/codechain.yml

@@ -128,6 +128,15 @@ args:
         long: force-sealing
         help: Force the node to author new blocks as if it were always sealing/mining.
         takes_value: false
+    - reseal-on-txs:
+        long: reseal-on-txs
+        help: Specify which transactions should force the node to reseal a block.
+        takes_value: true
+        possible_values:
+            - none
+            - own
+            - ext
+            - all
     - reseal-min-period:
         long: reseal-min-period
         value_name: MS

codechain/config/mod.rs

@@ -45,20 +45,35 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn miner_options(&self) -> MinerOptions {
-        MinerOptions {
+    pub fn miner_options(&self) -> Result<MinerOptions, String> {
+        let (reseal_on_own_parcel, reseal_on_external_parcel) = match self.mining.reseal_on_txs.as_ref() {
+            "all" => (true, true),
+            "own" => (true, false),
+            "ext" => (false, true),
+            "none" => (false, false),
+            x => {
+                return Err(format!(
+                    "{} isn't a valid value for reseal-on-txs. Possible values are all, own, ext, none",
+                    x
+                ))
+            }
+        };
+
+        Ok(MinerOptions {
             mem_pool_size: self.mining.mem_pool_size,
             mem_pool_memory_limit: match self.mining.mem_pool_mem_limit {
                 0 => None,
                 mem_size => Some(mem_size * 1024 * 1024),
             },
             new_work_notify: self.mining.notify_work.clone(),
             force_sealing: self.mining.force_sealing,
+            reseal_on_own_parcel,
+            reseal_on_external_parcel,
             reseal_min_period: Duration::from_millis(self.mining.reseal_min_period),
             reseal_max_period: Duration::from_millis(self.mining.reseal_max_period),
             work_queue_size: self.mining.work_queue_size,
             ..MinerOptions::default()
-        }
+        })
     }
 
     pub fn rpc_http_config(&self) -> RpcHttpConfig {
@@ -142,6 +157,7 @@ pub struct Mining {
     pub mem_pool_mem_limit: usize,
     pub notify_work: Vec<String>,
     pub force_sealing: bool,
+    pub reseal_on_txs: String,
     pub reseal_min_period: u64,
     pub reseal_max_period: u64,
     pub work_queue_size: usize,
@@ -255,6 +271,9 @@ impl Mining {
         if matches.is_present("force-sealing") {
             self.force_sealing = true;
         }
+        if let Some(reseal_on_txs) = matches.value_of("reseal-on-txs") {
+            self.reseal_on_txs = reseal_on_txs.to_string();
+        }
         if let Some(reseal_min_period) = matches.value_of("reseal-min-period") {
             self.reseal_min_period = reseal_min_period.parse().map_err(|_| "Invalid period")?;
         }

codechain/config/presets/config.dev.toml

@@ -9,6 +9,7 @@ mem_pool_mem_limit = 4 # MB
 mem_pool_size = 8192
 notify_work = []
 force_sealing = false
+reseal_on_txs = "all"
 reseal_min_period = 0
 reseal_max_period = 120000
 work_queue_size = 20

codechain/run_node.rs

@@ -106,7 +106,7 @@ fn stratum_start(cfg: StratumConfig, miner: Arc<Miner>, client: Arc<Client>) ->
 }
 
 fn new_miner(config: &config::Config, scheme: &Scheme, ap: Arc<AccountProvider>) -> Result<Arc<Miner>, String> {
-    let miner = Miner::new(config.miner_options(), scheme, Some(ap.clone()));
+    let miner = Miner::new(config.miner_options()?, scheme, Some(ap.clone()));
     match miner.engine_type() {
         EngineType::PoW => match &config.mining.author {
             Some(ref author) => {