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

Merge branch 'diffing' into switchrpcns

Browse Source
This commit is contained in:
Gav Wood 2016-06-05 21:35:03 +02:00
commit ec61c7534c
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/src/client/client.rs
View File

@ -463,6 +463,7 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
} }
let options = TransactOptions { tracing: false, vm_tracing: analytics.vm_tracing, check_nonce: false }; let options = TransactOptions { tracing: false, vm_tracing: analytics.vm_tracing, check_nonce: false };
let mut ret = Executive::new(&mut state, &env_info, self.engine.deref().deref(), &self.vm_factory).transact(t, options); let mut ret = Executive::new(&mut state, &env_info, self.engine.deref().deref(), &self.vm_factory).transact(t, options);
// TODO gav move this into Executive. // TODO gav move this into Executive.
if analytics.state_diffing { if analytics.state_diffing {
if let Ok(ref mut x) = ret { if let Ok(ref mut x) = ret {

12
ethcore/src/miner/miner.rs
View File

@ -255,6 +255,8 @@ impl MinerService for Miner {
match sealing_work.peek_last_ref() { match sealing_work.peek_last_ref() {
Some(work) => { Some(work) => {
let block = work.block(); let block = work.block();
// TODO: merge this code with client.rs's fn call somwhow.
let header = block.header(); let header = block.header();
let last_hashes = chain.last_hashes(); let last_hashes = chain.last_hashes();
let env_info = EnvInfo { let env_info = EnvInfo {
@ -273,12 +275,14 @@ impl MinerService for Miner {
ExecutionError::TransactionMalformed(message) ExecutionError::TransactionMalformed(message)
})); }));
let balance = state.balance(&sender); let balance = state.balance(&sender);
// give the sender max balance let needed_balance = t.value + t.gas * t.gas_price;
state.sub_balance(&sender, &balance); if balance < needed_balance {
state.add_balance(&sender, &U256::max_value()); // give the sender a sufficient balance
state.add_balance(&sender, &(needed_balance - balance));
}
let options = TransactOptions { tracing: false, vm_tracing: analytics.vm_tracing, check_nonce: false }; let options = TransactOptions { tracing: false, vm_tracing: analytics.vm_tracing, check_nonce: false };
let mut ret = Executive::new(&mut state, &env_info, self.engine(), chain.vm_factory()).transact(t, options); let mut ret = Executive::new(&mut state, &env_info, self.engine(), chain.vm_factory()).transact(t, options);
// TODO gav move this into Executive. // TODO gav move this into Executive.
if analytics.state_diffing { if analytics.state_diffing {
if let Ok(ref mut x) = ret { if let Ok(ref mut x) = ret {

8
ethcore/src/state.rs
View File

@ -285,13 +285,13 @@ impl State {
} }
fn query_pod(&mut self, query: &PodState) { fn query_pod(&mut self, query: &PodState) {
query.get().iter().foreach(|(ref address, ref pod_account)| { for (ref address, ref pod_account) in query.get() {
if self.get(address, true).is_some() { if self.get(address, true).is_some() {
pod_account.storage.iter().foreach(|(ref key, _)| { for (ref key, _) in &pod_account.storage {
self.storage_at(address, key); self.storage_at(address, key);
});
} }
}); }
}
} }
/// Returns a `StateDiff` describing the difference from `orig` to `self`. /// Returns a `StateDiff` describing the difference from `orig` to `self`.