Fix worker pool life cycle for eth_call (#97)

Author: canepat

docs/API.md

@@ -17,8 +17,8 @@ The following table shows the current [JSON RPC API](https://eth.wiki/json-rpc/A
 | eth_syncing                             | Yes          |                                            |
 | eth_gasPrice                            | -            | not yet implemented                        |
 |                                         |              |                                            |
-| eth_getBlockByHash                      | Yes          | not yet tested for performance             |
-| eth_getBlockByNumber                    | Yes          | not yet tested for performance             |
+| eth_getBlockByHash                      | Yes          |                                            |
+| eth_getBlockByNumber                    | Yes          |                                            |
 | eth_getBlockTransactionCountByHash      | Yes          |                                            |
 | eth_getBlockTransactionCountByNumber    | Yes          |                                            |
 | eth_getUncleByBlockHashAndIndex         | Yes          |                                            |
@@ -37,7 +37,7 @@ The following table shows the current [JSON RPC API](https://eth.wiki/json-rpc/A
 | eth_getCode                             | Yes          |                                            |
 | eth_getTransactionCount                 | Yes          |                                            |
 | eth_getStorageAt                        | Yes          |                                            |
-| eth_call                                | -            | work in progress                           |
+| eth_call                                | Yes          | not yet tested for performance             |
 |                                         |              |                                            |
 | eth_newFilter                           | -            | not yet implemented                        |
 | eth_newBlockFilter                      | -            | not yet implemented                        |

silkrpc/commands/eth_api.cpp

@@ -794,7 +794,7 @@ asio::awaitable<void> EthereumRpcApi::handle_eth_call(const nlohmann::json& requ
         const auto chain_config_ptr = silkworm::lookup_chain_config(chain_id);
         const auto block_number = co_await core::get_block_number(block_id, tx_database);
 
-        Executor executor{context_, tx_database, *chain_config_ptr, block_number};
+        Executor executor{context_, tx_database, *chain_config_ptr, workers_, block_number};
         const auto block_with_hash = co_await core::rawdb::read_block_by_number(tx_database, block_number);
         silkworm::Transaction txn{call.to_transaction()};
         const auto execution_result = co_await executor.call(block_with_hash.block, txn, txn.gas_limit);

silkrpc/commands/eth_api.hpp

@@ -17,12 +17,15 @@
 #ifndef SILKRPC_COMMANDS_ETH_API_HPP_
 #define SILKRPC_COMMANDS_ETH_API_HPP_
 
+#include <cstddef>
 #include <memory>
+#include <thread>
 #include <vector>
 
 #include <silkrpc/config.hpp> // NOLINT(build/include_order)
 
 #include <asio/awaitable.hpp>
+#include <asio/thread_pool.hpp>
 #include <evmc/evmc.hpp>
 #include <nlohmann/json.hpp>
 
@@ -43,7 +46,8 @@ namespace silkrpc::commands {
 
 class EthereumRpcApi {
 public:
-    explicit EthereumRpcApi(Context& context) : context_(context), database_(context.database), backend_(context.backend) {}
+    explicit EthereumRpcApi(Context& context, std::size_t workers_count = std::thread::hardware_concurrency())
+    : context_(context), database_(context.database), backend_(context.backend), workers_{workers_count} {}
     virtual ~EthereumRpcApi() {}
 
     EthereumRpcApi(const EthereumRpcApi&) = delete;
@@ -99,6 +103,7 @@ class EthereumRpcApi {
     Context& context_;
     std::unique_ptr<ethdb::Database>& database_;
     std::unique_ptr<ethbackend::BackEnd>& backend_;
+    asio::thread_pool workers_;
 
     friend class silkrpc::http::RequestHandler;
 };

silkrpc/core/executor.cpp

@@ -82,7 +82,7 @@ asio::awaitable<ExecutionResult> Executor::call(const silkworm::Block& block, co
     const auto exec_result = co_await asio::async_compose<decltype(asio::use_awaitable), void(ExecutionResult)>(
         [this, &block, &txn, gas](auto&& self) {
             SILKRPC_TRACE << "Executor::call post block: " << block.header.number << " txn: " << &txn << " gas: " << gas << "\n";
-            asio::post(thread_pool_, [this, &block, &txn, gas, self = std::move(self)]() mutable {
+            asio::post(workers_, [this, &block, &txn, gas, self = std::move(self)]() mutable {
                 silkworm::IntraBlockState state{buffer_};
                 silkworm::EVM evm{block, state, config_};
 

silkrpc/core/executor.hpp

@@ -45,8 +45,8 @@ class Executor {
 public:
     static std::string get_error_message(int64_t error_code);
 
-    explicit Executor(const Context& context, const core::rawdb::DatabaseReader& db_reader, const silkworm::ChainConfig& config, uint64_t block_number)
-    : context_(context), db_reader_(db_reader), config_(config), buffer_{*context.io_context, db_reader, block_number}, thread_pool_{10} {}
+    explicit Executor(const Context& context, const core::rawdb::DatabaseReader& db_reader, const silkworm::ChainConfig& config, asio::thread_pool& workers, uint64_t block_number)
+    : context_(context), db_reader_(db_reader), config_(config), workers_{workers}, buffer_{*context.io_context, db_reader, block_number} {}
     virtual ~Executor() {}
 
     Executor(const Executor&) = delete;
@@ -58,8 +58,8 @@ class Executor {
     const Context& context_;
     const core::rawdb::DatabaseReader& db_reader_;
     const silkworm::ChainConfig& config_;
+    asio::thread_pool& workers_;
     RemoteBuffer buffer_;
-    asio::thread_pool thread_pool_;
 };
 
 } // namespace silkrpc