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

Fix bug.

Browse Source
This commit is contained in:
Gav Wood 2016-01-16 18:46:23 +01:00
parent d8efbb2173
commit 60f0ff8e9e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ethereum/ethash.rs
View File

@ -22,12 +22,12 @@ impl Ethash {
} }
fn u64_param(&self, name: &str) -> u64 { fn u64_param(&self, name: &str) -> u64 {
*self.u64_params.write().unwrap().entry("name".to_string()).or_insert_with(|| *self.u64_params.write().unwrap().entry(name.to_string()).or_insert_with(||
self.spec().engine_params.get(name).map(|a| decode(&a)).unwrap_or(0u64)) self.spec().engine_params.get(name).map(|a| decode(&a)).unwrap_or(0u64))
} }
fn u256_param(&self, name: &str) -> U256 { fn u256_param(&self, name: &str) -> U256 {
*self.u256_params.write().unwrap().entry("name".to_string()).or_insert_with(|| *self.u256_params.write().unwrap().entry(name.to_string()).or_insert_with(||
self.spec().engine_params.get(name).map(|a| decode(&a)).unwrap_or(x!(0))) self.spec().engine_params.get(name).map(|a| decode(&a)).unwrap_or(x!(0)))
} }
} }
@ -132,7 +132,6 @@ impl Ethash {
let difficulty_bound_divisor = self.u256_param("difficultyBoundDivisor"); let difficulty_bound_divisor = self.u256_param("difficultyBoundDivisor");
let duration_limit = self.u64_param("durationLimit"); let duration_limit = self.u64_param("durationLimit");
let frontier_limit = self.u64_param("frontierCompatibilityModeLimit"); let frontier_limit = self.u64_param("frontierCompatibilityModeLimit");
info!("Frontier limit: {}", frontier_limit);
let mut target = if header.number < frontier_limit { let mut target = if header.number < frontier_limit {
if header.timestamp >= parent.timestamp + duration_limit { if header.timestamp >= parent.timestamp + duration_limit {
parent.difficulty - (parent.difficulty / difficulty_bound_divisor) parent.difficulty - (parent.difficulty / difficulty_bound_divisor)