Merge branch 'master' into new-jsonrpc

parity/cli/config.full.toml

@@ -85,6 +85,7 @@ engine_signer = "0xdeadbeefcafe0000000000000000000000000001"
 force_sealing = true
 reseal_on_txs = "all"
 reseal_min_period = 4000
+reseal_max_period = 60000
 work_queue_size = 20
 relay_set = "cheap"
 usd_per_tx = "0.0025"

parity/cli/config.toml

@@ -50,6 +50,7 @@ engine_signer = "0xdeadbeefcafe0000000000000000000000000001"
 force_sealing = true
 reseal_on_txs = "all"
 reseal_min_period = 4000
+reseal_max_period = 60000
 price_update_period = "hourly"
 tx_queue_size = 1024
 tx_queue_gas = "auto"

parity/cli/mod.rs

@@ -224,6 +224,8 @@ usage! {
 			or |c: &Config| otry!(c.mining).reseal_on_txs.clone(),
 		flag_reseal_min_period: u64 = 2000u64,
 			or |c: &Config| otry!(c.mining).reseal_min_period.clone(),
+		flag_reseal_max_period: u64 = 120000u64,
+			or |c: &Config| otry!(c.mining).reseal_max_period.clone(),
 		flag_work_queue_size: usize = 20usize,
 			or |c: &Config| otry!(c.mining).work_queue_size.clone(),
 		flag_tx_gas_limit: Option<String> = None,
@@ -460,6 +462,7 @@ struct Mining {
 	force_sealing: Option<bool>,
 	reseal_on_txs: Option<String>,
 	reseal_min_period: Option<u64>,
+	reseal_max_period: Option<u64>,
 	work_queue_size: Option<usize>,
 	tx_gas_limit: Option<String>,
 	tx_time_limit: Option<u64>,
@@ -701,6 +704,7 @@ mod tests {
 			flag_force_sealing: true,
 			flag_reseal_on_txs: "all".into(),
 			flag_reseal_min_period: 4000u64,
+			flag_reseal_max_period: 60000u64,
 			flag_work_queue_size: 20usize,
 			flag_tx_gas_limit: Some("6283184".into()),
 			flag_tx_time_limit: Some(100u64),
@@ -900,6 +904,7 @@ mod tests {
 				force_sealing: Some(true),
 				reseal_on_txs: Some("all".into()),
 				reseal_min_period: Some(4000),
+				reseal_max_period: Some(60000),
 				work_queue_size: None,
 				relay_set: None,
 				usd_per_tx: None,

parity/cli/usage.txt

@@ -224,6 +224,9 @@ Sealing/Mining Options:
   --reseal-min-period MS         Specify the minimum time between reseals from
                                  incoming transactions. MS is time measured in
                                  milliseconds (default: {flag_reseal_min_period}).
+  --reseal-max-period MS         Specify the maximum time since last block to enable
+                                 force-sealing. MS is time measured in
+                                 milliseconds (default: {flag_reseal_max_period}).
   --work-queue-size ITEMS        Specify the number of historical work packages
                                  which are kept cached lest a solution is found for
                                  them later. High values take more memory but result

parity/configuration.rs

@@ -522,6 +522,7 @@ impl Configuration {
 			tx_queue_strategy: to_queue_strategy(&self.args.flag_tx_queue_strategy)?,
 			pending_set: to_pending_set(&self.args.flag_relay_set)?,
 			reseal_min_period: Duration::from_millis(reseal_min_period),
+			reseal_max_period: Duration::from_millis(self.args.flag_reseal_max_period),
 			work_queue_size: self.args.flag_work_queue_size,
 			enable_resubmission: !self.args.flag_remove_solved,
 			tx_queue_banning: match self.args.flag_tx_time_limit {