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

Merge with head

Browse Source
This commit is contained in:
Anton Gavrilov 2017-07-31 13:49:44 +02:00
commit 8826fdb03a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/spec/spec.rs
View File

@ -168,6 +168,7 @@ impl From<ethjson::spec::Params> for CommonParams {
nonce_cap_increment: p.nonce_cap_increment.map_or(64, Into::into), nonce_cap_increment: p.nonce_cap_increment.map_or(64, Into::into),
remove_dust_contracts: p.remove_dust_contracts.unwrap_or(false), remove_dust_contracts: p.remove_dust_contracts.unwrap_or(false),
wasm: p.wasm.unwrap_or(false), wasm: p.wasm.unwrap_or(false),
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
gas_limit_bound_divisor: p.gas_limit_bound_divisor.into(), gas_limit_bound_divisor: p.gas_limit_bound_divisor.into(),
block_reward: p.block_reward.map_or_else(U256::zero, Into::into), block_reward: p.block_reward.map_or_else(U256::zero, Into::into),
@ -175,6 +176,9 @@ impl From<ethjson::spec::Params> for CommonParams {
======= =======
apply_reward: p.apply_reward.unwrap_or(true), apply_reward: p.apply_reward.unwrap_or(true),
>>>>>>> 7312803... Working test with block reward added >>>>>>> 7312803... Working test with block reward added
=======
apply_reward: p.apply_reward.unwrap_or(true),
>>>>>>> bb043ba2fdcc2b5d049ca8c5f5db233cc5f82aaf
} }
} }
} }