Add implementation of eth_getBlockTransactionCountByHash API (#31)

Co-authored-by: canepat <16927169+canepat@users.noreply.github.com>

Author: lupin012

docs/API.md

@@ -19,7 +19,7 @@ The following table shows the current [JSON RPC API](https://eth.wiki/json-rpc/A
 |                                         |              |                                            |
 | eth_getBlockByHash                      | Yes          | not yet tested for performance             |
 | eth_getBlockByNumber                    | Yes          | not yet tested for performance             |
-| eth_getBlockTransactionCountByHash      | -            | not yet implemented                        |
+| eth_getBlockTransactionCountByHash      | Yes          |                                            |
 | eth_getBlockTransactionCountByNumber    | Yes          |                                            |
 | eth_getUncleByBlockHashAndIndex         | -            | not yet implemented                        |
 | eth_getUncleByBlockNumberAndIndex       | -            | not yet implemented                        |

silkrpc/commands/eth_api.cpp

@@ -160,7 +160,7 @@ asio::awaitable<void> EthereumRpcApi::handle_eth_syncing(const nlohmann::json& r
 asio::awaitable<void> EthereumRpcApi::handle_eth_get_block_by_hash(const nlohmann::json& request, nlohmann::json& reply) {
     auto params = request["params"];
     if (params.size() != 2) {
-        auto error_msg = "invalid eth_getLogs params: " + params.dump();
+        auto error_msg = "invalid eth_getBlockByHash params: " + params.dump();
         SILKRPC_ERROR << error_msg << "\n";
         reply = make_json_error(request["id"], 100, error_msg);
         co_return;
@@ -192,11 +192,44 @@ asio::awaitable<void> EthereumRpcApi::handle_eth_get_block_by_hash(const nlohman
     co_return;
 }
 
+// https://eth.wiki/json-rpc/API#eth_getblocktransactioncountbyhash
+asio::awaitable<void> EthereumRpcApi::handle_eth_get_block_transaction_count_by_hash(const nlohmann::json& request, nlohmann::json& reply) {
+    auto params = request["params"];
+    if (params.size() != 1) {
+        auto error_msg = "invalid eth_getBlockTransactionCountByHash params: " + params.dump();
+        SILKRPC_ERROR << error_msg << "\n";
+        reply = make_json_error(request["id"], 100, error_msg);
+        co_return;
+    }
+    auto block_hash = params[0].get<evmc::bytes32>();
+    SILKRPC_DEBUG << "block_hash: " << block_hash << "\n";
+
+    auto tx = co_await database_->begin();
+
+    try {
+        ethdb::kv::TransactionDatabase tx_database{*tx};
+
+        const auto block_with_hash = co_await core::rawdb::read_block_by_hash(tx_database, block_hash);
+        const auto tx_count = block_with_hash.block.transactions.size();
+
+        reply = make_json_content(request["id"],  "0x" + to_hex_no_leading_zeros(tx_count));
+    } catch (const std::exception& e) {
+        SILKRPC_ERROR << "exception: " << e.what() << "\n";
+        reply = make_json_error(request["id"], 100, e.what());
+    } catch (...) {
+        SILKRPC_ERROR << "unexpected exception\n";
+        reply = make_json_error(request["id"], 100, "unexpected exception");
+    }
+
+    co_await tx->close(); // RAII not (yet) available with coroutines
+    co_return;
+}
+
 // https://eth.wiki/json-rpc/API#eth_getblockbynumber
 asio::awaitable<void> EthereumRpcApi::handle_eth_get_block_by_number(const nlohmann::json& request, nlohmann::json& reply) {
     auto params = request["params"];
     if (params.size() != 2) {
-        auto error_msg = "invalid eth_getLogs params: " + params.dump();
+        auto error_msg = "invalid getBlockByNumber params: " + params.dump();
         SILKRPC_ERROR << error_msg << "\n";
         reply = make_json_error(request["id"], 100, error_msg);
         co_return;

silkrpc/commands/eth_api.hpp

@@ -59,6 +59,8 @@ class EthereumRpcApi {
     asio::awaitable<void> handle_eth_get_block_transaction_count_by_number(const nlohmann::json& request, nlohmann::json& reply);
     asio::awaitable<void> handle_eth_get_logs(const nlohmann::json& request, nlohmann::json& reply);
 
+    asio::awaitable<void> handle_eth_get_block_transaction_count_by_hash(const nlohmann::json& request, nlohmann::json& reply);
+
     asio::awaitable<Roaring> get_topics_bitmap(core::rawdb::DatabaseReader& db_reader, FilterTopics& topics, uint64_t start, uint64_t end);
     asio::awaitable<Roaring> get_addresses_bitmap(core::rawdb::DatabaseReader& db_reader, FilterAddresses& addresses, uint64_t start, uint64_t end);
     asio::awaitable<Receipts> get_receipts(core::rawdb::DatabaseReader& db_reader, uint64_t number, evmc::bytes32 hash);

silkrpc/http/methods.hpp

@@ -35,6 +35,7 @@ constexpr const char* k_eth_chainId{"eth_chainId"};
 constexpr const char* k_eth_protocolVersion{"eth_protocolVersion"};
 constexpr const char* k_eth_syncing{"eth_syncing"};
 constexpr const char* k_eth_getBlockByHash{"eth_getBlockByHash"};
+constexpr const char* k_eth_getBlockTransactionCountByHash{"eth_getBlockTransactionCountByHash"};
 constexpr const char* k_eth_getBlockByNumber{"eth_getBlockByNumber"};
 constexpr const char* k_eth_getBlockTransactionCountByNumber{"eth_getBlockTransactionCountByNumber"};
 constexpr const char* k_eth_getLogs{"eth_getLogs"};

silkrpc/http/request_handler.cpp

@@ -43,6 +43,7 @@ std::map<std::string, RequestHandler::HandleMethod> RequestHandler::handlers_ =
     {method::k_eth_syncing, &commands::RpcApi::handle_eth_syncing},
     {method::k_eth_getBlockByHash, &commands::RpcApi::handle_eth_get_block_by_hash},
     {method::k_eth_getBlockByNumber, &commands::RpcApi::handle_eth_get_block_by_number},
+    {method::k_eth_getBlockTransactionCountByHash, &commands::RpcApi::handle_eth_get_block_transaction_count_by_hash},
     {method::k_eth_getBlockTransactionCountByNumber, &commands::RpcApi::handle_eth_get_block_transaction_count_by_number},
     {method::k_eth_getLogs, &commands::RpcApi::handle_eth_get_logs},
     {method::k_net_listening, &commands::RpcApi::handle_net_listening},

tests/integration/run_jsonrpc_commands.py

@@ -13,7 +13,10 @@ def run_shell_command(command: str) -> int:
         sys.exit(process.returncode)
     response = json.loads(process.stdout)
     if "error" in response:
+        print ("execute KO:", command_and_args)
         sys.exit(1)
+    else:
+       print ("execute OK:", command_and_args)
 
 run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":1}' localhost:51515''')
 run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"web3_sha3","params":["0x00"],"id":1}' localhost:51515''')
@@ -32,3 +35,5 @@ def run_shell_command(command: str) -> int:
 run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_getBlockTransactionCountByNumber","params":["0x41b57c"],"id":1}' localhost:51515''')
 
 run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_getLogs","params":[{"fromBlock": "0x3d0900", "toBlock": "0x3d0964", "address": "0x2a89f54a9f8e727a7be754fd055bb8ea93d0557d"}],"id":3}' http://localhost:51515''')
+
+run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_getBlockTransactionCountByHash","params":["0x814672e6913a3879217169c6ba461114fa032d9510a56a409d3aab19f668e299"],"id":1}' http://localhost:51515''')