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

Merge pull request #3884 from ethcore/fix-diff-adj

Browse Source 
Fix difficulty adjustment.
This commit is contained in:
Gav Wood 2016-12-17 16:35:20 +01:00 committed by GitHub
commit e755c09446
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethcore/src/ethereum/ethash.rs
View File

@ -178,15 +178,15 @@ impl Engine for Ethash {
let gas_limit = { let gas_limit = {
let gas_limit = parent.gas_limit().clone(); let gas_limit = parent.gas_limit().clone();
let bound_divisor = self.ethash_params.gas_limit_bound_divisor; let bound_divisor = self.ethash_params.gas_limit_bound_divisor;
let lower_limit = gas_limit - gas_limit / bound_divisor + 1.into();
let upper_limit = gas_limit + gas_limit / bound_divisor - 1.into();
if gas_limit < gas_floor_target { if gas_limit < gas_floor_target {
min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into()) min(gas_floor_target, upper_limit)
} else if gas_limit > gas_ceil_target { } else if gas_limit > gas_ceil_target {
max(gas_ceil_target, gas_limit - gas_limit / bound_divisor + 1.into()) max(gas_ceil_target, lower_limit)
} else { } else {
min(gas_ceil_target, max(gas_floor_target, min(min(gas_ceil_target, upper_limit),
max(gas_floor_target, lower_limit + (header.gas_used().clone() * 6.into() / 5.into()) / bound_divisor))
gas_limit - gas_limit / bound_divisor + 1.into() +
(header.gas_used().clone() * 6.into() / 5.into()) / bound_divisor))
} }
}; };
header.set_difficulty(difficulty); header.set_difficulty(difficulty);