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

Merge pull request #1324 from ethcore/renamefield

Browse Source 
Update default gas limit, rename field
This commit is contained in:
Marek Kotewicz 2016-06-18 20:22:05 +02:00 committed by GitHub
commit 3617923d3c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ impl Engine for Ethash {
} else { } else {
let mut s = Schedule::new_homestead(); let mut s = Schedule::new_homestead();
// TODO: make dependent on gaslimit > 4000000 of block 1760000. // 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 s
} }
} }

4
ethcore/src/evm/schedule.rs
View File

@ -81,7 +81,7 @@ pub struct Schedule {
/// Gas price for copying memory /// Gas price for copying memory
pub copy_gas: usize, pub copy_gas: usize,
/// DAO Rescue softfork block /// DAO Rescue softfork block
pub block_dao_transactions: bool, pub reject_dao_transactions: bool,
} }
impl Schedule { impl Schedule {
@ -128,7 +128,7 @@ impl Schedule {
tx_data_zero_gas: 4, tx_data_zero_gas: 4,
tx_data_non_zero_gas: 68, tx_data_non_zero_gas: 68,
copy_gas: 3, copy_gas: 3,
block_dao_transactions: false, reject_dao_transactions: false,
} }
} }
} }

2
ethcore/src/state.rs
View File

@ -225,7 +225,7 @@ impl State {
let broken_dao = H256::from("7278d050619a624f84f51987149ddb439cdaadfba5966f7cfaea7ad44340a4ba"); let broken_dao = H256::from("7278d050619a624f84f51987149ddb439cdaadfba5966f7cfaea7ad44340a4ba");
// dao attack soft fork // 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. // collect all the addresses which have changed.
let addresses = self.cache.borrow().iter().map(|(addr, _)| addr.clone()).collect::<Vec<_>>(); let addresses = self.cache.borrow().iter().map(|(addr, _)| addr.clone()).collect::<Vec<_>>();

2
parity/cli.rs
View File

@ -121,7 +121,7 @@ Sealing/Mining Options:
web service in turn and fallback on the last known web service in turn and fallback on the last known
good value [default: auto]. good value [default: auto].
--gas-floor-target GAS Amount of gas per block to target when sealing a new --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 --author ADDRESS Specify the block author (aka "coinbase") address
for sending block rewards from sealed blocks for sending block rewards from sealed blocks
[default: 0037a6b811ffeb6e072da21179d11b1406371c63]. [default: 0037a6b811ffeb6e072da21179d11b1406371c63].

4
sync/src/chain.rs
View File

@ -458,12 +458,12 @@ impl ChainSync {
// Disable the peer for this syncing round if it gives invalid chain // Disable the peer for this syncing round if it gives invalid chain
if !valid_response { if !valid_response {
trace!(target: "sync", "{} Deactivated for invalid headers response", peer_id); 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() { if headers.is_empty() {
// Peer does not have any new subchain heads, deactivate it nd try with another // Peer does not have any new subchain heads, deactivate it nd try with another
trace!(target: "sync", "{} Deactivated for no data", peer_id); trace!(target: "sync", "{} Deactivated for no data", peer_id);
self.deactivate_peer(io, peer_id); self.deactivate_peer(io, peer_id);
} }
match self.state { match self.state {
SyncState::ChainHead => { SyncState::ChainHead => {