grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3617 from ethcore/default-gas-price 

Set default min tx price to $0.0025
This commit is contained in:
Gav Wood 2016-11-25 18:46:29 +01:00 committed by GitHub
parent a51066bdca ffa123c949
commit 699f462d56
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/res/ethereum/tests

@ -1 +1 @@
Subproject commit e8f4624b7f1a15c63674eecf577c7ab76c3b16be Subproject commit d509c75936ec6cbba683ee1916aa0bca436bc376

2
parity/cli/config.full.toml
View File

@ -66,7 +66,7 @@ reseal_on_txs = "all"
reseal_min_period = 4000 reseal_min_period = 4000
work_queue_size = 20 work_queue_size = 20
relay_set = "cheap" relay_set = "cheap"
usd_per_tx = "0" usd_per_tx = "0.0025"
usd_per_eth = "auto" usd_per_eth = "auto"
price_update_period = "hourly" price_update_period = "hourly"
gas_floor_target = "4700000" gas_floor_target = "4700000"

4
parity/cli/mod.rs
View File

@ -190,7 +190,7 @@ usage! {
or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some), or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some),
flag_relay_set: String = "cheap", flag_relay_set: String = "cheap",
or |c: &Config| otry!(c.mining).relay_set.clone(), 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(), or |c: &Config| otry!(c.mining).usd_per_tx.clone(),
flag_usd_per_eth: String = "auto", flag_usd_per_eth: String = "auto",
or |c: &Config| otry!(c.mining).usd_per_eth.clone(), 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_gas_limit: Some("6283184".into()),
flag_tx_time_limit: Some(100u64), flag_tx_time_limit: Some(100u64),
flag_relay_set: "cheap".into(), 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_usd_per_eth: "auto".into(),
flag_price_update_period: "hourly".into(), flag_price_update_period: "hourly".into(),
flag_gas_floor_target: "4700000".into(), flag_gas_floor_target: "4700000".into(),

2
parity/params.rs
View File

@ -177,7 +177,7 @@ pub enum GasPricerConfig {
impl Default for GasPricerConfig { impl Default for GasPricerConfig {
fn default() -> Self { fn default() -> Self {
GasPricerConfig::Calibrated { GasPricerConfig::Calibrated {
usd_per_tx: 0f32, usd_per_tx: 0.0025f32,
recalibration_period: Duration::from_secs(3600), recalibration_period: Duration::from_secs(3600),
} }
} }