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

Fixed comments after review and test after rebase

Browse Source
This commit is contained in:
Anton Gavrilov 2017-07-31 18:10:06 +02:00
parent 8826fdb03a
commit 141c2fd34a
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/res/null_morden_with_reward.json
View File

@ -4,6 +4,7 @@
"null": null "null": null
}, },
"params": { "params": {
"gasLimitBoundDivisor": "0x0400",
"accountStartNonce": "0x0", "accountStartNonce": "0x0",
"maximumExtraDataSize": "0x20", "maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388", "minGasLimit": "0x1388",

2
ethcore/src/block.rs
View File

@ -206,7 +206,7 @@ pub trait IsBlock {
fn uncles(&self) -> &[Header] { &self.block().uncles } fn uncles(&self) -> &[Header] { &self.block().uncles }
/// Get tracing enabled flag for this block. /// Get tracing enabled flag for this block.
fn tracing_enabled(&self) -> &bool { &self.block().tracing_enabled } fn tracing_enabled(&self) -> bool { self.block().tracing_enabled }
} }
/// Trait for a object that has a state database. /// Trait for a object that has a state database.

2
ethcore/src/engines/authority_round/mod.rs
View File

@ -555,7 +555,7 @@ impl Engine for AuthorityRound {
// Trace it // Trace it
let block_miner = fields.header.author().clone(); let block_miner = fields.header.author().clone();
tracer.trace_reward(block_miner, self.block_reward, RewardType::Block); tracer.trace_reward(block_miner, self.params().block_reward, RewardType::Block);
// Commit state so that we can actually figure out the state root. // Commit state so that we can actually figure out the state root.
if let Err(ref e) = res { if let Err(ref e) = res {

4
ethcore/src/engines/null_engine.rs
View File

@ -17,8 +17,8 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use util::Address; use util::Address;
use builtin::Builtin; use builtin::Builtin;
use block::*; use block::{ExecutedBlock, };
use util::*; use util::U256;
use engines::{Engine, CloseOutcome}; use engines::{Engine, CloseOutcome};
use spec::CommonParams; use spec::CommonParams;
use evm::Schedule; use evm::Schedule;

2
ethcore/src/engines/tendermint/mod.rs
View File

@ -550,7 +550,7 @@ impl Engine for Tendermint {
// Trace it // Trace it
let block_miner = fields.header.author().clone(); let block_miner = fields.header.author().clone();
tracer.trace_reward(block_miner, self.block_reward, RewardType::Block); tracer.trace_reward(block_miner, self.params().block_reward, RewardType::Block);
// Commit state so that we can actually figure out the state root. // Commit state so that we can actually figure out the state root.
if let Err(ref e) = res { if let Err(ref e) = res {

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

@ -301,14 +301,14 @@ impl Engine for Arc<Ethash> {
result_uncle_reward = reward * U256::from(8 + u.number() - current_number) / U256::from(8); result_uncle_reward = reward * U256::from(8 + u.number() - current_number) / U256::from(8);
fields.state.add_balance( fields.state.add_balance(
u.author(), u.author(),
&(result_uncle_reward), &result_uncle_reward,
CleanupMode::NoEmpty CleanupMode::NoEmpty
) )
} else { } else {
result_uncle_reward = reward / U256::from(32); result_uncle_reward = reward / U256::from(32);
fields.state.add_balance( fields.state.add_balance(
u.author(), u.author(),
&(result_uncle_reward), &result_uncle_reward,
CleanupMode::NoEmpty CleanupMode::NoEmpty
) )
}?; }?;

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

@ -168,17 +168,10 @@ 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
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),
registrar: p.registrar.map_or_else(Address::new, Into::into), registrar: p.registrar.map_or_else(Address::new, Into::into),
=======
apply_reward: p.apply_reward.unwrap_or(true), apply_reward: p.apply_reward.unwrap_or(true),
>>>>>>> 7312803... Working test with block reward added
=======
apply_reward: p.apply_reward.unwrap_or(true),
>>>>>>> bb043ba2fdcc2b5d049ca8c5f5db233cc5f82aaf
} }
} }
} }