Implementation of the API eth_getTransactionByBlockHashAndIndex (#61)

Author: Sixtysixter

docs/API.md

@@ -27,7 +27,7 @@ The following table shows the current [JSON RPC API](https://eth.wiki/json-rpc/A
 | eth_getUncleCountByBlockNumber          | Yes          |                                            |
 |                                         |              |                                            |
 | eth_getTransactionByHash                | -            | not yet implemented                        |
-| eth_getTransactionByBlockHashAndIndex   | -            | not yet implemented                        |
+| eth_getTransactionByBlockHashAndIndex   | Yes          |                                            |
 | eth_getTransactionByBlockNumberAndIndex | Yes          |                                            |
 | eth_getTransactionReceipt               | -            | not yet implemented                        |
 |                                         |              |                                            |

silkrpc/commands/eth_api.cpp

@@ -39,6 +39,7 @@
 #include <silkrpc/types/block.hpp>
 #include <silkrpc/types/call.hpp>
 #include <silkrpc/types/filter.hpp>
+#include <silkrpc/types/transaction.hpp>
 
 namespace silkrpc::commands {
 
@@ -456,12 +457,36 @@ asio::awaitable<void> EthereumRpcApi::handle_eth_get_transaction_by_hash(const n
 
 // https://eth.wiki/json-rpc/API#eth_gettransactionbyblockhashandindex
 asio::awaitable<void> EthereumRpcApi::handle_eth_get_transaction_by_block_hash_and_index(const nlohmann::json& request, nlohmann::json& reply) {
+    auto params = request["params"];
+    if (params.size() != 2) {
+        auto error_msg = "invalid eth_getTransactionByBlockHashAndIndex 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>();
+    auto index_string = params[1].get<std::string>();
+    SILKRPC_DEBUG << "block_hash: " << block_hash << " index: " << index_string << "\n";
+
     auto tx = co_await database_->begin();
 
     try {
         ethdb::TransactionDatabase tx_database{*tx};
+        const auto block_with_hash = co_await core::rawdb::read_block_by_hash(tx_database, block_hash);
 
-        reply = make_json_content(request["id"],  "0x" + to_hex_no_leading_zeros(0));
+        const auto transactions = block_with_hash.block.transactions;
+
+        auto index = std::stoul(index_string, 0, 16);
+        if (index >= transactions.size()) {
+           const auto error_msg = "Requested transaction not found " + index_string;
+           SILKRPC_DEBUG << error_msg << "\n";
+           reply = make_json_content(request["id"], nullptr);
+           co_return;
+        }
+        
+        silkrpc::Transaction new_transaction{{transactions[index]}, {block_with_hash.hash}, {block_with_hash.block.header.number}, {index}};
+
+        reply = make_json_content(request["id"],  new_transaction);
     } catch (const std::exception& e) {
         SILKRPC_ERROR << "exception: " << e.what() << "\n";
         reply = make_json_error(request["id"], 100, e.what());

silkrpc/json/types.cpp

@@ -163,6 +163,15 @@ void to_json(nlohmann::json& json, const Block& b) {
     json["uncles"] = b.block.ommers;
 }
 
+void to_json(nlohmann::json& json, const Transaction& transaction) {
+    to_json(json, silkworm::Transaction(transaction));
+
+    const auto block_number = "0x" + silkrpc::to_hex_no_leading_zeros(transaction.block_number);
+    json["blockHash"] = transaction.block_hash;
+    json["blockNumber"] = block_number;
+    json["transactionIndex"] = "0x" + silkrpc::to_hex_no_leading_zeros(transaction.transaction_index);
+}
+
 void from_json(const nlohmann::json& json, Call& call) {
     if (json.count("from") != 0) {
         call.from = json.at("from").get<evmc::address>();

silkrpc/json/types.hpp

@@ -29,6 +29,7 @@
 #include <silkrpc/types/error.hpp>
 #include <silkrpc/types/filter.hpp>
 #include <silkrpc/types/log.hpp>
+#include <silkrpc/types/transaction.hpp>
 #include <silkrpc/types/receipt.hpp>
 #include <silkworm/types/block.hpp>
 #include <silkworm/types/transaction.hpp>
@@ -55,6 +56,8 @@ namespace silkrpc {
 
 void to_json(nlohmann::json& json, const Block& b);
 
+void to_json(nlohmann::json& json, const Transaction& transaction);
+
 void from_json(const nlohmann::json& json, Call& call);
 
 void to_json(nlohmann::json& json, const Log& log);

silkrpc/types/transaction.cpp

@@ -0,0 +1,33 @@
+/*
+    Copyright 2020 The Silkrpc Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "transaction.hpp"
+
+#include <iomanip>
+
+#include <silkrpc/common/util.hpp>
+
+namespace silkrpc {
+
+std::ostream& operator<<(std::ostream& out, const Transaction& t) {
+    out << " block_hash: " << t.block_hash;
+    out << " block_number: " << t.block_number;
+    out << " transaction_index: " << t.transaction_index;
+
+    return out;
+}
+
+} // namespace silkrpc

silkrpc/types/transaction.hpp

@@ -0,0 +1,39 @@
+/*
+   Copyright 2020 The Silkrpc Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#ifndef SILKRPC_TYPES_TRANSACTION_HPP_
+#define SILKRPC_TYPES_TRANSACTION_HPP_
+
+#include <iostream>
+
+#include <intx/intx.hpp>
+
+#include <silkworm/common/base.hpp>
+#include <silkworm/types/transaction.hpp>
+
+namespace silkrpc {
+
+struct Transaction : public silkworm::Transaction {
+    evmc::bytes32 block_hash;
+    uint64_t block_number{0};
+    uint64_t transaction_index{0};
+};
+
+std::ostream& operator<<(std::ostream& out, const Transaction& t);
+
+} // namespace silkrpc
+
+#endif  // SILKRPC_TYPES_TRANSACTION_HPP_

tests/integration/run_jsonrpc_commands.py

@@ -44,3 +44,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_getLogs","params":[{"fromBlock": "0x3d0900", "toBlock": "0x3d0964", "address": "0x2a89f54a9f8e727a7be754fd055bb8ea93d0557d"}],"id":3}' localhost:51515''')
+
+run_shell_command('''curl --silent -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_getTransactionByBlockHashAndIndex","params":["0x814672e6913a3879217169c6ba461114fa032d9510a56a409d3aab19f668e299", "0x0"],"id":1}' localhost:51515''')