From 026bfd6741bdca63ad14000f55c67086dad254d6 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 19 Jun 2016 02:09:17 +0200 Subject: [PATCH] fixed incomplete merge --- ethcore/src/ethereum/ethash.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs index 22df30399..4c92d1083 100644 --- a/ethcore/src/ethereum/ethash.rs +++ b/ethcore/src/ethereum/ethash.rs @@ -102,7 +102,7 @@ impl Engine for Ethash { Schedule::new_frontier() } else { 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 } }