Merge branch 'block_header_rpc' into on-demand-priority

2017-04-06 17:59:55 +02:00
parent 528dbf909a 4f843ada3c
commit cf75a19e8d
47 changed files with 960 additions and 367 deletions
--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -509,6 +509,9 @@ impl TransactionProof {
 	pub fn check_response(&self, _: &Mutex<::cache::Cache>, state_items: &[DBValue]) -> Result<super::ExecutionResult, Error> {
 		let root = self.header.state_root();

+		let mut env_info = self.env_info.clone();
+		env_info.gas_limit = self.tx.gas.clone();
+
 		let proved_execution = state::check_proof(
 			state_items,
 			root,