Merge pull request #791 from ethcore/tracing

Comprehensive tests for tracing transactions
openethereum · Mar 20, 2016 · 8a5aa35 · 8a5aa35
2 parents dcb23de + c2933e0
commit 8a5aa35
Show file tree

Hide file tree

Showing 5 changed files with 492 additions and 31 deletions.
diff --git a/ethcore/src/evm/factory.rs b/ethcore/src/evm/factory.rs
@@ -25,7 +25,7 @@ use evm::Evm;
 /// Type of EVM to use.
 pub enum VMType {
 	/// JIT EVM
-	#[cfg(feature="jit")]
+	#[cfg(feature = "jit")]
 	Jit,
 	/// RUST EVM
 	Interpreter
@@ -52,26 +52,26 @@ impl fmt::Display for VMType {
 #[cfg(feature = "json-tests")]
 impl VMType {
 	/// Return all possible VMs (JIT, Interpreter)
-	#[cfg(feature="jit")]
+	#[cfg(feature = "jit")]
 	pub fn all() -> Vec<VMType> {
 		vec![VMType::Jit, VMType::Interpreter]
 	}
 
 	/// Return all possible VMs (Interpreter)
-	#[cfg(not(feature="jit"))]
+	#[cfg(not(feature = "jit"))]
 	pub fn all() -> Vec<VMType> {
 		vec![VMType::Interpreter]
 	}
 }
 
 /// Evm factory. Creates appropriate Evm.
 pub struct Factory {
-	evm : VMType
+	evm: VMType
 }
 
 impl Factory {
 	/// Create fresh instance of VM
-	#[cfg(feature="jit")]
+	#[cfg(feature = "jit")]
 	pub fn create(&self) -> Box<Evm> {
 		match self.evm {
 			VMType::Jit => {
@@ -84,7 +84,7 @@ impl Factory {
 	}
 
 	/// Create fresh instance of VM
-	#[cfg(not(feature="jit"))]
+	#[cfg(not(feature = "jit"))]
 	pub fn create(&self) -> Box<Evm> {
 		match self.evm {
 			VMType::Interpreter => {

diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
@@ -261,16 +261,14 @@ impl<'a> Executive<'a> {
 
 			// if there's tracing, make up trace_info's result with trace_output and some arithmetic.
 			if let Some((TraceAction::Call(ref mut c), _)) = trace_info {
-				if let Some(output) = trace_output {
-					c.result = res.as_ref().ok().map(|gas_left| (c.gas - *gas_left, output));
-				}
+				c.result = res.as_ref().ok().map(|gas_left| (c.gas - *gas_left, trace_output.expect("trace_info is Some: qed")));
 			}
 
-			trace!("exec: sstore-clears={}\n", unconfirmed_substate.sstore_clears_count);
-			trace!("exec: substate={:?}; unconfirmed_substate={:?}\n", substate, unconfirmed_substate);
+			trace!(target: "executive", "sstore-clears={}\n", unconfirmed_substate.sstore_clears_count);
+			trace!(target: "executive", "substate={:?}; unconfirmed_substate={:?}\n", substate, unconfirmed_substate);
 
 			self.enact_result(&res, substate, unconfirmed_substate, trace_info);
-			trace!("exec: new substate={:?}\n", substate);
+			trace!(target: "executive", "enacted: substate={:?}\n", substate);
 			res
 		} else {
 			// otherwise, nothing
@@ -307,11 +305,11 @@ impl<'a> Executive<'a> {
 		};
 
 		if let Some((TraceAction::Create(ref mut c), _)) = trace_info {
-			if let Some(output) = trace_output {
-				c.result = res.as_ref().ok().map(|gas_left| (c.gas - *gas_left, created, output));
-			}
+			c.result = res.as_ref().ok().map(|gas_left| (c.gas - *gas_left, created, trace_output.expect("trace_info is Some: qed")));
 		}
 
+		trace!(target: "executive", "trace_info={:?}", trace_info);
+
 		self.enact_result(&res, substate, unconfirmed_substate, trace_info);
 		res
 	}
@@ -348,6 +346,8 @@ impl<'a> Executive<'a> {
 			self.state.kill_account(address);
 		}
 
+		let trace = substate.subtraces.and_then(|mut v| v.pop());
+
 		match result {
 			Err(evm::Error::Internal) => Err(ExecutionError::Internal),
 			Err(_) => {
@@ -359,7 +359,7 @@ impl<'a> Executive<'a> {
 					logs: vec![],
 					contracts_created: vec![],
 					output: output,
-					trace: None,
+					trace: trace,
 				})
 			},
 			_ => {
@@ -371,7 +371,7 @@ impl<'a> Executive<'a> {
 					logs: substate.logs,
 					contracts_created: substate.contracts_created,
 					output: output,
-					trace: substate.subtraces.and_then(|mut v| v.pop()),
+					trace: trace,
 				})
 			},
 		}
@@ -385,6 +385,7 @@ impl<'a> Executive<'a> {
 				| Err(evm::Error::StackUnderflow {..})
 				| Err(evm::Error::OutOfStack {..}) => {
 				self.state.revert_snapshot();
+				substate.accrue_trace(un_substate.subtraces, maybe_info)
 			},
 			Ok(_) | Err(evm::Error::Internal) => {
 				self.state.clear_snapshot();

diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
@@ -153,13 +153,15 @@ impl<'a> Ext for Externalities<'a> {
 	}
 
 	fn call(&mut self,
-			gas: &U256,
-			sender_address: &Address,
-			receive_address: &Address,
-			value: Option<U256>,
-			data: &[u8],
-			code_address: &Address,
-			output: &mut [u8]) -> MessageCallResult {
+		gas: &U256,
+		sender_address: &Address,
+		receive_address: &Address,
+		value: Option<U256>,
+		data: &[u8],
+		code_address: &Address,
+		output: &mut [u8]
+	) -> MessageCallResult {
+		trace!(target: "externalities", "call");
 
 		let mut params = ActionParams {
 			sender: sender_address.clone(),