From ffa123c949cc5ac68f2a430df142d1133ae4612c Mon Sep 17 00:00:00 2001 From: arkpar Date: Fri, 25 Nov 2016 15:12:57 +0100 Subject: [PATCH] Set default tx price to 0.0025 USD --- ethcore/res/ethereum/tests | 2 +- parity/cli/config.full.toml | 2 +- parity/cli/mod.rs | 4 ++-- parity/params.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests index e8f4624b7..d509c7593 160000 --- a/ethcore/res/ethereum/tests +++ b/ethcore/res/ethereum/tests @@ -1 +1 @@ -Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be +Subproject commit d509c75936ec6cbba683ee1916aa0bca436bc376 diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml index 841cf5f24..fcd9a9712 100644 --- a/parity/cli/config.full.toml +++ b/parity/cli/config.full.toml @@ -66,7 +66,7 @@ reseal_on_txs = "all" reseal_min_period = 4000 work_queue_size = 20 relay_set = "cheap" -usd_per_tx = "0" +usd_per_tx = "0.0025" usd_per_eth = "auto" price_update_period = "hourly" gas_floor_target = "4700000" diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index cfe4c4d29..93373c383 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -190,7 +190,7 @@ usage! { or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some), flag_relay_set: String = "cheap", or |c: &Config| otry!(c.mining).relay_set.clone(), - flag_usd_per_tx: String = "0", + flag_usd_per_tx: String = "0.0025", or |c: &Config| otry!(c.mining).usd_per_tx.clone(), flag_usd_per_eth: String = "auto", or |c: &Config| otry!(c.mining).usd_per_eth.clone(), @@ -568,7 +568,7 @@ mod tests { flag_tx_gas_limit: Some("6283184".into()), flag_tx_time_limit: Some(100u64), flag_relay_set: "cheap".into(), - flag_usd_per_tx: "0".into(), + flag_usd_per_tx: "0.0025".into(), flag_usd_per_eth: "auto".into(), flag_price_update_period: "hourly".into(), flag_gas_floor_target: "4700000".into(), diff --git a/parity/params.rs b/parity/params.rs index 8af70b91d..28233400e 100644 --- a/parity/params.rs +++ b/parity/params.rs @@ -177,7 +177,7 @@ pub enum GasPricerConfig { impl Default for GasPricerConfig { fn default() -> Self { GasPricerConfig::Calibrated { - usd_per_tx: 0f32, + usd_per_tx: 0.0025f32, recalibration_period: Duration::from_secs(3600), } }