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

fixed incomplete merge

Browse Source
This commit is contained in:
debris 2016-06-19 02:09:17 +02:00
parent bff1c5bdcb
commit 026bfd6741
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ impl Engine for Ethash {
Schedule::new_frontier() Schedule::new_frontier()
} else { } else {
let mut s = Schedule::new_homestead(); let mut s = Schedule::new_homestead();
s.block_dao_transactions = env_info.dao_rescue_block_gas_limit.map(|x| x <= 4_000_000.into()).unwrap_or(false); s.reject_dao_transactions = env_info.dao_rescue_block_gas_limit.map(|x| x <= 4_000_000.into()).unwrap_or(false);
s s
} }
} }