Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

eip100b #5027

Merged
merged 3 commits into from
Mar 27, 2017
Merged

eip100b #5027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2bdc27
eip100b
debris Mar 25, 2017
a233dbc
fix eip100b build and tests
debris Mar 25, 2017
830ae94
Conventional comparison order
gavofyork Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix eip100b build and tests
  • Loading branch information
@debris
debris committed Mar 25, 2017
commit a233dbc240626e5bc178be68f527b15ece5dedf5
2 changes: 1 addition & 1 deletion ethcore/src/ethereum/ethash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ impl Ethash {
panic!("Can't calculate genesis block difficulty");
}

let parent_has_uncles = &sha3::SHA3_EMPTY_LIST_RLP == parent.uncles_hash();
let parent_has_uncles = &sha3::SHA3_EMPTY_LIST_RLP != parent.uncles_hash();

let min_difficulty = self.ethash_params.minimum_difficulty;
let difficulty_hardfork = header.number() >= self.ethash_params.difficulty_hardfork_transition;
Expand Down
2 changes: 2 additions & 0 deletions ethcore/src/tests/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ pub fn get_default_ethash_params() -> EthashParams{
minimum_difficulty: U256::from(131072),
difficulty_bound_divisor: U256::from(2048),
difficulty_increment_divisor: 10,
metropolis_difficulty_increment_divisor: 9,
duration_limit: 13,
block_reward: U256::from(0),
registrar: "0000000000000000000000000000000000000001".into(),
Expand All @@ -448,6 +449,7 @@ pub fn get_default_ethash_params() -> EthashParams{
difficulty_hardfork_transition: u64::max_value(),
difficulty_hardfork_bound_divisor: U256::from(0),
bomb_defuse_transition: u64::max_value(),
eip100b_transition: u64::max_value(),
eip150_transition: u64::max_value(),
eip155_transition: u64::max_value(),
eip160_transition: u64::max_value(),
Expand Down