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

Fix output from eth_call. (#6538)

Browse Source
This commit is contained in:
Tomasz Drwięga 2017-09-18 12:09:52 +02:00 committed by Arkadiy Paronyan
parent be6fe6b005
commit 9f47909edf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,7 +1134,7 @@ impl Client {
T: trace::Tracer, T: trace::Tracer,
V: trace::VMTracer, V: trace::VMTracer,
{ {
let options = options.dont_check_nonce(); let options = options.dont_check_nonce().save_output_from_contract();
let original_state = if state_diff { Some(state.clone()) } else { None }; let original_state = if state_diff { Some(state.clone()) } else { None };
let mut ret = Executive::new(state, env_info, engine).transact_virtual(transaction, options)?; let mut ret = Executive::new(state, env_info, engine).transact_virtual(transaction, options)?;

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

@ -743,10 +743,10 @@ impl MinerService for Miner {
.map_err(ExecutionError::from)?; .map_err(ExecutionError::from)?;
} }
let mut ret = match (analytics.transaction_tracing, analytics.vm_tracing) { let mut ret = match (analytics.transaction_tracing, analytics.vm_tracing) {
(true, true) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_tracing_and_vm_tracing())?, (true, true) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_tracing_and_vm_tracing().save_output_from_contract())?,
(true, false) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_tracing())?, (true, false) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_tracing().save_output_from_contract())?,
(false, true) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_vm_tracing())?, (false, true) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_vm_tracing().save_output_from_contract())?,
(false, false) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_no_tracing())?, (false, false) => Executive::new(&mut state, &env_info, &*self.engine).transact(t, TransactOptions::with_no_tracing().save_output_from_contract())?,
}; };
// TODO gav move this into Executive. // TODO gav move this into Executive.