From d361b726c1d838886969e9d4365da363d698c349 Mon Sep 17 00:00:00 2001
From: SergiySW <sergiysw@gmail.com>
Date: Wed, 26 Jul 2017 21:52:39 +0300
Subject: [PATCH] RPC account_info & blocks_info

blocks_info - blocks with amount & containing account
---
 rai/node/rpc.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
 rai/node/rpc.hpp |  2 ++
 2 files changed, 83 insertions(+)

diff --git a/rai/node/rpc.cpp b/rai/node/rpc.cpp
index 66ad1247..41d81d50 100755
--- a/rai/node/rpc.cpp
+++ b/rai/node/rpc.cpp
@@ -263,6 +263,39 @@ void rai::rpc_handler::account_get ()
 	}
 }
 
+void rai::rpc_handler::account_info ()
+{
+	std::string account_text (request.get <std::string> ("account"));
+	rai::uint256_union account;
+	auto error (account.decode_account (account_text));
+	if (!error)
+	{
+		rai::transaction transaction (node.store.environment, nullptr, false);
+		rai::account_info info;
+		if (!node.store.account_get (transaction, account, info))
+		{
+			boost::property_tree::ptree response_l;
+			response_l.put ("frontier", info.head.to_string ());
+			response_l.put ("open_block", info.open_block.to_string ());
+			response_l.put ("representative_block", info.rep_block.to_string ());
+			std::string balance;
+			rai::uint128_union (info.balance).encode_dec (balance);
+			response_l.put ("balance", balance);
+			response_l.put ("modified_timestamp", std::to_string (info.modified));
+			response_l.put ("block_count", std::to_string (info.block_count));
+			response (response_l);
+		}
+		else
+		{
+			error_response (response, "Account not found");
+		}
+	}
+	else
+	{
+		error_response (response, "Bad account number");
+	}
+}
+
 void rai::rpc_handler::account_key ()
 {
 	std::string account_text (request.get <std::string> ("account"));
@@ -699,6 +732,46 @@ void rai::rpc_handler::blocks ()
 	response (response_l);
 }
 
+void rai::rpc_handler::blocks_info ()
+{
+	std::vector <std::string> hashes;
+	boost::property_tree::ptree response_l;
+	boost::property_tree::ptree blocks;
+	rai::transaction transaction (node.store.environment, nullptr, false);
+	for (boost::property_tree::ptree::value_type &hashes : request.get_child("hashes"))
+	{
+		std::string hash_text = hashes.second.data();
+		rai::uint256_union hash;
+		auto error (hash.decode_hex (hash_text));
+		if (!error)
+		{
+			auto block (node.store.block_get (transaction, hash));
+			if (block != nullptr)
+			{
+				boost::property_tree::ptree entry;
+				auto account (node.ledger.account (transaction, hash));
+				entry.put ("block_account", account.to_account ());
+				auto amount (node.ledger.amount (transaction, hash));
+				entry.put ("amount", amount.convert_to <std::string> ());
+				std::string contents;
+				block->serialize_json (contents);
+				entry.put ("contents", contents);
+				blocks.push_back (std::make_pair (hash_text, entry));
+			}
+			else
+			{
+				error_response (response, "Block not found");
+			}
+		}
+		else
+		{
+			error_response (response, "Bad hash number");
+		}
+	}
+	response_l.add_child ("blocks", blocks);
+	response (response_l);
+}
+
 void rai::rpc_handler::block_account ()
 {
 	std::string hash_text (request.get <std::string> ("hash"));
@@ -2540,6 +2613,10 @@ void rai::rpc_handler::process_request ()
 		{
 			account_history ();
 		}
+		else if (action == "account_info")
+		{
+			account_info ();
+		}
 		else if (action == "account_key")
 		{
 			account_key ();
@@ -2592,6 +2669,10 @@ void rai::rpc_handler::process_request ()
 		{
 			blocks ();
 		}
+		else if (action == "blocks_info")
+		{
+			blocks_info ();
+		}
 		else if (action == "block_account")
 		{
 			block_account ();
diff --git a/rai/node/rpc.hpp b/rai/node/rpc.hpp
index a39557af..e300427f 100644
--- a/rai/node/rpc.hpp
+++ b/rai/node/rpc.hpp
@@ -94,6 +94,7 @@ public:
 	void account_create ();
 	void account_get ();
 	void account_history ();
+	void account_info ();
 	void account_key ();
 	void account_list ();
 	void account_move ();
@@ -107,6 +108,7 @@ public:
 	void available_supply ();
 	void block ();
 	void blocks ();
+	void blocks_info ();
 	void block_account ();
 	void block_count ();
 	void bootstrap ();