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

Fix bugfix hard fork logic (#9138)

Browse Source 
* Fix bugfix hard fork logic

* Remove dustProtectionTransition from bugfix category

EIP-168 is not enabled by default

* Remove unnecessary 'static
This commit is contained in:
Wei Tang 2018-07-19 22:43:41 +08:00 committed by Marek Kotewicz
parent 0ce04845de
commit b914912c06
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/miner/miner.rs
View File

@ -1088,11 +1088,13 @@ impl miner::MinerService for Miner {
// refuse to seal the first block of the chain if it contains hard forks // refuse to seal the first block of the chain if it contains hard forks
// which should be on by default. // which should be on by default.
if block.block().header().number() == 1 && self.engine.params().contains_bugfix_hard_fork() { if block.block().header().number() == 1 {
if let Some(name) = self.engine.params().nonzero_bugfix_hard_fork() {
warn!("Your chain specification contains one or more hard forks which are required to be \ warn!("Your chain specification contains one or more hard forks which are required to be \
on by default. Please remove these forks and start your chain again."); on by default. Please remove these forks and start your chain again: {}.", name);
return; return;
} }
}
match self.engine.seals_internally() { match self.engine.seals_internally() {
Some(true) => { Some(true) => {

24
ethcore/src/spec/spec.rs
View File

@ -57,7 +57,7 @@ fn fmt_err<F: ::std::fmt::Display>(f: F) -> String {
/// Parameters common to ethereum-like blockchains. /// Parameters common to ethereum-like blockchains.
/// NOTE: when adding bugfix hard-fork parameters, /// NOTE: when adding bugfix hard-fork parameters,
/// add to `contains_bugfix_hard_fork` /// add to `nonzero_bugfix_hard_fork`
/// ///
/// we define a "bugfix" hard fork as any hard fork which /// we define a "bugfix" hard fork as any hard fork which
/// you would put on-by-default in a new chain. /// you would put on-by-default in a new chain.
@ -188,13 +188,21 @@ impl CommonParams {
} }
} }
/// Whether these params contain any bug-fix hard forks. /// Return Some if the current parameters contain a bugfix hard fork not on block 0.
pub fn contains_bugfix_hard_fork(&self) -> bool { pub fn nonzero_bugfix_hard_fork(&self) -> Option<&str> {
self.eip98_transition != 0 && self.eip155_transition != 0 && if self.eip155_transition != 0 {
self.validate_receipts_transition != 0 && self.eip86_transition != 0 && return Some("eip155Transition");
self.eip140_transition != 0 && self.eip210_transition != 0 && }
self.eip211_transition != 0 && self.eip214_transition != 0 &&
self.validate_chain_id_transition != 0 && self.dust_protection_transition != 0 if self.validate_receipts_transition != 0 {
return Some("validateReceiptsTransition");
}
if self.validate_chain_id_transition != 0 {
return Some("validateChainIdTransition");
}
None
} }
} }