diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs index d89499872..a4291796a 100644 --- a/ethcore/src/ethereum/ethash.rs +++ b/ethcore/src/ethereum/ethash.rs @@ -103,7 +103,7 @@ impl Engine for Ethash { } else { let mut s = Schedule::new_homestead(); // TODO: make dependent on gaslimit > 4000000 of block 1760000. - s.block_dao_transactions = env_info.number >= 1760000; + s.reject_dao_transactions = env_info.number >= 1760000; s } } diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs index 59f30e7d3..188e72373 100644 --- a/ethcore/src/evm/schedule.rs +++ b/ethcore/src/evm/schedule.rs @@ -81,7 +81,7 @@ pub struct Schedule { /// Gas price for copying memory pub copy_gas: usize, /// DAO Rescue softfork block - pub block_dao_transactions: bool, + pub reject_dao_transactions: bool, } impl Schedule { @@ -128,7 +128,7 @@ impl Schedule { tx_data_zero_gas: 4, tx_data_non_zero_gas: 68, copy_gas: 3, - block_dao_transactions: false, + reject_dao_transactions: false, } } } diff --git a/ethcore/src/state.rs b/ethcore/src/state.rs index bdf754f3a..c5bfe09cd 100644 --- a/ethcore/src/state.rs +++ b/ethcore/src/state.rs @@ -225,7 +225,7 @@ impl State { let broken_dao = H256::from("7278d050619a624f84f51987149ddb439cdaadfba5966f7cfaea7ad44340a4ba"); // dao attack soft fork - if engine.schedule(&env_info).block_dao_transactions { + if engine.schedule(&env_info).reject_dao_transactions { // collect all the addresses which have changed. let addresses = self.cache.borrow().iter().map(|(addr, _)| addr.clone()).collect::>(); diff --git a/parity/cli.rs b/parity/cli.rs index 954df7640..6fe38224a 100644 --- a/parity/cli.rs +++ b/parity/cli.rs @@ -121,7 +121,7 @@ Sealing/Mining Options: web service in turn and fallback on the last known good value [default: auto]. --gas-floor-target GAS Amount of gas per block to target when sealing a new - block [default: 4712388]. + block [default: 3141592]. --author ADDRESS Specify the block author (aka "coinbase") address for sending block rewards from sealed blocks [default: 0037a6b811ffeb6e072da21179d11b1406371c63]. diff --git a/sync/src/chain.rs b/sync/src/chain.rs index 54e4aa7a6..8f7367501 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -458,12 +458,12 @@ impl ChainSync { // Disable the peer for this syncing round if it gives invalid chain if !valid_response { trace!(target: "sync", "{} Deactivated for invalid headers response", peer_id); - self.deactivate_peer(io, peer_id); + self.deactivate_peer(io, peer_id); } if headers.is_empty() { // Peer does not have any new subchain heads, deactivate it nd try with another trace!(target: "sync", "{} Deactivated for no data", peer_id); - self.deactivate_peer(io, peer_id); + self.deactivate_peer(io, peer_id); } match self.state { SyncState::ChainHead => {