fixed incomplete merge
This commit is contained in:
parent
bff1c5bdcb
commit
026bfd6741
@ -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
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user