rpcdaemon: trace_call trace_block trace_callMany traceRawTransaction …

…trace_replayBlockTransaction w/ snapshots (#1362)

silkworm/silkrpc/commands/trace_api.cpp

@@ -55,7 +55,9 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_call(const nlohmann::json
     try {
         ethdb::TransactionDatabase tx_database{*tx};
         ethdb::kv::CachedDatabase cached_database{block_number_or_hash, *tx, *state_cache_};
-        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, tx_database, block_number_or_hash);
+        const auto chain_storage = tx->create_storage(tx_database, backend_);
+
+        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, *chain_storage, tx_database, block_number_or_hash);
         const bool is_latest_block = co_await core::is_latest_block_number(block_with_hash->block.header.number, tx_database);
         const core::rawdb::DatabaseReader& db_reader =
             is_latest_block ? static_cast<core::rawdb::DatabaseReader&>(cached_database) : static_cast<core::rawdb::DatabaseReader&>(tx_database);
@@ -98,7 +100,8 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_call_many(const nlohmann:
     try {
         ethdb::TransactionDatabase tx_database{*tx};
         ethdb::kv::CachedDatabase cached_database{block_number_or_hash, *tx, *state_cache_};
-        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, tx_database, block_number_or_hash);
+        const auto chain_storage = tx->create_storage(tx_database, backend_);
+        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, *chain_storage, tx_database, block_number_or_hash);
         const bool is_latest_block = co_await core::is_latest_block_number(block_with_hash->block.header.number, tx_database);
 
         const core::rawdb::DatabaseReader& db_reader =
@@ -185,7 +188,8 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_raw_transaction(const nlo
         ethdb::TransactionDatabase tx_database{*tx};
 
         const auto block_number = co_await core::get_latest_block_number(tx_database);
-        const auto block_with_hash = co_await core::read_block_by_number(*block_cache_, tx_database, block_number);
+        const auto chain_storage = tx->create_storage(tx_database, backend_);
+        const auto block_with_hash = co_await core::read_block_by_number(*block_cache_, *chain_storage, tx_database, block_number);
 
         trace::TraceCallExecutor executor{*block_cache_, tx_database, workers_, *tx};
         const auto result = co_await executor.trace_transaction(block_with_hash->block, transaction, config);
@@ -225,8 +229,8 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_replay_block_transactions
 
     try {
         ethdb::TransactionDatabase tx_database{*tx};
-
-        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, tx_database, block_number_or_hash);
+        const auto chain_storage = tx->create_storage(tx_database, backend_);
+        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, *chain_storage, tx_database, block_number_or_hash);
 
         trace::TraceCallExecutor executor{*block_cache_, tx_database, workers_, *tx};
         const auto result = co_await executor.trace_block_transactions(block_with_hash->block, config);
@@ -305,8 +309,8 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_block(const nlohmann::jso
 
     try {
         ethdb::TransactionDatabase tx_database{*tx};
-
-        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, tx_database, block_number_or_hash);
+        const auto chain_storage = tx->create_storage(tx_database, backend_);
+        const auto block_with_hash = co_await core::read_block_by_number_or_hash(*block_cache_, *chain_storage, tx_database, block_number_or_hash);
 
         trace::TraceCallExecutor executor{*block_cache_, tx_database, workers_, *tx};
         trace::Filter filter;
@@ -347,7 +351,6 @@ boost::asio::awaitable<void> TraceRpcApi::handle_trace_filter(const nlohmann::js
 
     try {
         ethdb::TransactionDatabase tx_database{*tx};
-
         trace::TraceCallExecutor executor{*block_cache_, tx_database, workers_, *tx};
 
         co_await executor.trace_filter(trace_filter, &stream);

silkworm/silkrpc/commands/trace_api.hpp

@@ -46,7 +46,9 @@ class TraceRpcApi {
           block_cache_{must_use_shared_service<BlockCache>(io_context_)},
           state_cache_{must_use_shared_service<ethdb::kv::StateCache>(io_context_)},
           database_{must_use_private_service<ethdb::Database>(io_context_)},
-          workers_{workers} {}
+          workers_{workers},
+          backend_{must_use_private_service<ethbackend::BackEnd>(io_context_)} {}
+
     virtual ~TraceRpcApi() = default;
 
     TraceRpcApi(const TraceRpcApi&) = delete;
@@ -70,6 +72,7 @@ class TraceRpcApi {
     ethdb::kv::StateCache* state_cache_;
     ethdb::Database* database_;
     boost::asio::thread_pool& workers_;
+    ethbackend::BackEnd* backend_;
 
     friend class silkworm::http::RequestHandler;
 };

silkworm/silkrpc/storage/remote_chain_storage.cpp

@@ -54,12 +54,7 @@ Task<bool> RemoteChainStorage::read_block(const Hash& hash, BlockNum number, sil
 }
 
 Task<bool> RemoteChainStorage::read_block(const Hash& hash, silkworm::Block& block) const {
-    uint64_t block_number{0};
-    try {
-        block_number = co_await core::rawdb::read_header_number(reader_, hash);
-    } catch (const std::invalid_argument& iv) {
-        co_return false;
-    }
+    uint64_t block_number = co_await core::rawdb::read_header_number(reader_, hash);
     co_return co_await backend_->get_block(block_number, hash.bytes, /*.read_senders=*/false, block);
 }