Merge branch 'master' into debug_getModifiedAccountsByNumber_for_e3

.github/workflows/run_integration_tests.sh

@@ -10,7 +10,6 @@ set +e # Disable exit on error
 cd "$1" || exit 1
 rm -rf ./mainnet/results/
 
-# eth_baseFee & eth_blobBaseFee: new APIs
 # eth_estimateGas new fields
 # eth_getBlockReceipts/test_07.json new blobFields   
 # debug_accountRange: new algo using TKV
@@ -27,7 +26,7 @@ rm -rf ./mainnet/results/
 # trace_rawTransaction: different implementation
 # trace_replayTransaction/trace_replyBlockTransaction: silkworm has different response with erigon3 but could be erigon3 problem (to be analyzed)
 
-python3 ./run_tests.py --continue --blockchain mainnet --jwt "$2" --display-only-fail --port 51515 --json-diff -x \
+python3 ./run_tests.py --continue --blockchain mainnet --jwt "$2" --display-only-fail --json-diff --port 51515 -x \
 debug_accountRange,\
 debug_storageRangeAt,\
 debug_traceCall/test_02.json,\
@@ -45,6 +44,8 @@ debug_traceTransaction/test_96.json,\
 engine_,\
 erigon_getBalanceChangesInBlock,\
 erigon_getLatestLogs,\
+eth_estimateGas,\
+eth_getBlockReceipts/test_07.json,\
 eth_getLogs,\
 ots_getTransactionBySenderAndNonce,\
 ots_getContractCreator,\

docs/JSON-RPC-API.md

@@ -21,6 +21,8 @@ The following table shows the current [JSON RPC API](https://eth.wiki/json-rpc/A
 | eth_gasPrice                               |     Yes      |                                           |     Yes     |             |
 | eth_maxPriorityFeePerGas                   |     Yes      |                                           |     Yes     |             |
 | eth_feeHistory                             |     Yes      |                                           |     Yes     |             |
+| eth_baseFee                                |     Yes      |                                           |     Yes     |             |
+| eth_blobBaseFee                            |     Yes      |                                           |     Yes     |             |
 |                                            |              |                                           |             |             |
 | eth_getBlockByHash                         |     Yes      |                                           |     Yes     |     Yes     |
 | eth_getBlockByNumber                       |     Yes      |                                           |     Yes     |     Yes     |

silkworm/rpc/commands/eth_api.cpp

@@ -30,6 +30,7 @@
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/core/types/transaction.hpp>
 #include <silkworm/db/state/state_reader.hpp>
@@ -2060,4 +2061,88 @@ Task<void> EthereumRpcApi::handle_fee_history(const nlohmann::json& request, nlo
     co_await tx->close();  // RAII not (yet) available with coroutines
 }
 
+Task<void> EthereumRpcApi::handle_base_fee(const nlohmann::json& request, nlohmann::json& reply) {
+    const auto& params = request["params"];
+    if (params.size() != 0) {
+        const auto error_msg = "invalid eth_baseFee params: " + params.dump();
+        SILK_ERROR << error_msg;
+        reply = make_json_error(request, 100, error_msg);
+        co_return;
+    }
+
+    auto tx = co_await database_->begin();
+
+    try {
+        intx::uint256 base_fee{0};
+        const auto chain_storage{tx->create_storage()};
+        const auto chain_config = co_await chain_storage->read_chain_config();
+        const auto latest_block_number = co_await core::get_block_number(core::kLatestBlockId, *tx);
+        const auto latest_block_with_hash = co_await core::read_block_by_number(*block_cache_, *chain_storage, latest_block_number);
+        if (!latest_block_with_hash) {
+            reply = make_json_content(request, to_quantity(base_fee));
+            co_await tx->close();  // RAII not (yet) available with coroutines
+            co_return;
+        }
+        auto& header = latest_block_with_hash->block.header;
+
+        if (chain_config.is_london(header.number + 1)) {
+            base_fee = protocol::expected_base_fee_per_gas(header);
+        } else {
+            base_fee = 0;
+        }
+
+        reply = make_json_content(request, to_quantity(base_fee));
+
+    } catch (const std::exception& e) {
+        SILK_ERROR << "exception: " << e.what() << " processing request: " << request.dump();
+        reply = make_json_error(request, kInternalError, e.what());
+    } catch (...) {
+        SILK_ERROR << "unexpected exception processing request: " << request.dump();
+        reply = make_json_error(request, kServerError, "unexpected exception");
+    }
+
+    co_await tx->close();  // RAII not (yet) available with coroutines
+}
+
+Task<void> EthereumRpcApi::handle_blob_base_fee(const nlohmann::json& request, nlohmann::json& reply) {
+    const auto& params = request["params"];
+    if (params.size() != 0) {
+        const auto error_msg = "invalid eth_blobBaseFee params: " + params.dump();
+        SILK_ERROR << error_msg;
+        reply = make_json_error(request, 100, error_msg);
+        co_return;
+    }
+
+    auto tx = co_await database_->begin();
+
+    try {
+        intx::uint256 blob_base_fee{0};
+        const auto chain_storage{tx->create_storage()};
+        const auto latest_block_number = co_await core::get_block_number(core::kLatestBlockId, *tx);
+        const auto latest_block_with_hash = co_await core::read_block_by_number(*block_cache_, *chain_storage, latest_block_number);
+        if (!latest_block_with_hash) {
+            reply = make_json_content(request, to_quantity(blob_base_fee));
+            co_await tx->close();  // RAII not (yet) available with coroutines
+            co_return;
+        }
+        auto& header = latest_block_with_hash->block.header;
+
+        if (header.excess_blob_gas) {
+            blob_base_fee = calc_blob_gas_price(protocol::calc_excess_blob_gas(header));
+        } else {
+            blob_base_fee = 0;
+        }
+        reply = make_json_content(request, to_quantity(blob_base_fee));
+
+    } catch (const std::exception& e) {
+        SILK_ERROR << "exception: " << e.what() << " processing request: " << request.dump();
+        reply = make_json_error(request, kInternalError, e.what());
+    } catch (...) {
+        SILK_ERROR << "unexpected exception processing request: " << request.dump();
+        reply = make_json_error(request, kServerError, "unexpected exception");
+    }
+
+    co_await tx->close();  // RAII not (yet) available with coroutines
+}
+
 }  // namespace silkworm::rpc::commands

silkworm/rpc/commands/eth_api.hpp

@@ -104,6 +104,8 @@ class EthereumRpcApi {
     Task<void> handle_eth_max_priority_fee_per_gas(const nlohmann::json& request, nlohmann::json& reply);
     Task<void> handle_fee_history(const nlohmann::json& request, nlohmann::json& reply);
     Task<void> handle_eth_call_many(const nlohmann::json& request, nlohmann::json& reply);
+    Task<void> handle_blob_base_fee(const nlohmann::json& request, nlohmann::json& reply);
+    Task<void> handle_base_fee(const nlohmann::json& request, nlohmann::json& reply);
 
     // GLAZE format routine
     Task<void> handle_eth_get_logs(const nlohmann::json& request, std::string& reply);

silkworm/rpc/commands/rpc_api_table.cpp

@@ -159,6 +159,8 @@ void RpcApiTable::add_eth_handlers() {
     method_handlers_[json_rpc::method::k_eth_maxPriorityFeePerGas] = &commands::RpcApi::handle_eth_max_priority_fee_per_gas;
     method_handlers_[json_rpc::method::k_eth_feeHistory] = &commands::RpcApi::handle_fee_history;
     method_handlers_[json_rpc::method::k_eth_callMany] = &commands::RpcApi::handle_eth_call_many;
+    method_handlers_[json_rpc::method::k_eth_baseFee] = &commands::RpcApi::handle_base_fee;
+    method_handlers_[json_rpc::method::k_eth_blobBaseFee] = &commands::RpcApi::handle_blob_base_fee;
 
     // GLAZE methods
     method_handlers_glaze_[json_rpc::method::k_eth_getLogs] = &commands::RpcApi::handle_eth_get_logs;

silkworm/rpc/json_rpc/methods.hpp

@@ -87,6 +87,8 @@ inline constexpr const char* k_eth_getBlockReceipts{"eth_getBlockReceipts"};
 inline constexpr const char* k_eth_getTransactionReceiptsByBlock{"eth_getTransactionReceiptsByBlock"};
 inline constexpr const char* k_eth_maxPriorityFeePerGas{"eth_maxPriorityFeePerGas"};
 inline constexpr const char* k_eth_feeHistory{"eth_feeHistory"};
+inline constexpr const char* k_eth_blobBaseFee{"eth_blobBaseFee"};
+inline constexpr const char* k_eth_baseFee{"eth_baseFee"};
 
 inline constexpr const char* k_debug_accountRange{"debug_accountRange"};
 inline constexpr const char* k_debug_getModifiedAccountsByNumber{"debug_getModifiedAccountsByNumber"};