From abcfe9f9e8f91aae3ae0527bd21473bfaae409c1 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Tue, 9 Feb 2016 16:38:21 +0100
Subject: [PATCH] eth_getBlock properly returns transactions

---
 rpc/src/v1/impls/eth.rs         | 27 ++++++---------------------
 rpc/src/v1/types/transaction.rs | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index ef5f5b732..63783df34 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -22,7 +22,6 @@ use util::uint::*;
 use util::sha3::*;
 use ethcore::client::*;
 use ethcore::views::*;
-use ethcore::transaction::Action;
 use v1::traits::{Eth, EthFilter};
 use v1::types::{Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, Transaction, OptionalValue};
 
@@ -126,9 +125,10 @@ impl Eth for EthClient {
 
 	fn block(&self, params: Params) -> Result<Value, Error> {
 		match from_params::<(H256, bool)>(params) {
-			Ok((hash, include_txs)) => match (self.client.block_header(&hash), self.client.block_total_difficulty(&hash)) {
+			Ok((hash, include_txs)) => match (self.client.block(&hash), self.client.block_total_difficulty(&hash)) {
 				(Some(bytes), Some(total_difficulty)) => {
-					let view = HeaderView::new(&bytes);
+					let block_view = BlockView::new(&bytes);
+					let view = block_view.header_view();
 					let block = Block {
 						hash: OptionalValue::Value(view.sha3()),
 						parent_hash: view.parent_hash(),
@@ -148,9 +148,9 @@ impl Eth for EthClient {
 						uncles: vec![],
 						transactions: {
 							if include_txs {
-								BlockTransactions::Hashes(vec![])
+								BlockTransactions::Full(block_view.localized_transactions().into_iter().map(From::from).collect())
 							} else {
-								BlockTransactions::Full(vec![])
+								BlockTransactions::Hashes(block_view.transaction_hashes())
 							}
 						},
 						extra_data: Bytes::default()
@@ -166,22 +166,7 @@ impl Eth for EthClient {
 	fn transaction_at(&self, params: Params) -> Result<Value, Error> {
 		match from_params::<(H256,)>(params) {
 			Ok((hash,)) => match self.client.transaction(&hash) {
-				Some(t) => to_value(&Transaction {
-					hash: t.hash(),
-					nonce: t.nonce,
-					block_hash: OptionalValue::Value(t.block_hash.clone()),
-					block_number: OptionalValue::Value(U256::from(t.block_number)),
-					transaction_index: OptionalValue::Value(U256::from(t.transaction_index)),
-					from: t.sender().unwrap(),
-					to: match t.action {
-						Action::Create => OptionalValue::Null,
-						Action::Call(ref address) => OptionalValue::Value(address.clone())
-					},
-					value: t.value,
-					gas_price: t.gas_price,
-					gas: t.gas,
-					input: Bytes::new(t.data.clone())
-				}),
+				Some(t) => to_value(&Transaction::from(t)),
 				None => Ok(Value::Null)
 			},
 			Err(err) => Err(err)
diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
index e45fe033b..0e9256ada 100644
--- a/rpc/src/v1/types/transaction.rs
+++ b/rpc/src/v1/types/transaction.rs
@@ -16,6 +16,7 @@
 
 use util::hash::*;
 use util::uint::*;
+use ethcore::transaction::{LocalizedTransaction, Action};
 use v1::types::{Bytes, OptionalValue};
 
 #[derive(Debug, Default, Serialize)]
@@ -37,6 +38,27 @@ pub struct Transaction {
 	pub input: Bytes
 }
 
+impl From<LocalizedTransaction> for Transaction {
+	fn from(t: LocalizedTransaction) -> Transaction {
+		Transaction {
+			hash: t.hash(),
+			nonce: t.nonce,
+			block_hash: OptionalValue::Value(t.block_hash.clone()),
+			block_number: OptionalValue::Value(U256::from(t.block_number)),
+			transaction_index: OptionalValue::Value(U256::from(t.transaction_index)),
+			from: t.sender().unwrap(),
+			to: match t.action {
+				Action::Create => OptionalValue::Null,
+				Action::Call(ref address) => OptionalValue::Value(address.clone())
+			},
+			value: t.value,
+			gas_price: t.gas_price,
+			gas: t.gas,
+			input: Bytes::new(t.data.clone())
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;