Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpcdaemon: remove optional in read chain config #2130

Merged
merged 4 commits into from
Jun 20, 2024
Merged

rpcdaemon: remove optional in read chain config #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68bf3d3
rpcdaemon: remove optional in read chain config
canepat Jun 20, 2024
21c40d1
change exception type in read_head_header_hash
canepat Jun 20, 2024
aab4db7
pass uint256 by-reference in to_quantity
canepat Jun 20, 2024
c254403
Merge branch 'master' into rpcdaemon_read_chain_config_no_optional
canepat Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions silkworm/rpc/commands/debug_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,14 @@ Task<void> DebugRpcApi::handle_debug_account_at(const nlohmann::json& request, n

SILK_TRACE << "Block number: " << block_number << " #tnx: " << transactions.size();

auto chain_config_ptr = co_await chain_storage->read_chain_config();
ensure(chain_config_ptr.has_value(), "cannot read chain config");

const auto chain_config = co_await chain_storage->read_chain_config();
auto this_executor = co_await boost::asio::this_coro::executor;
auto result = co_await async_task(workers_.executor(), [&]() -> nlohmann::json {
auto state = tx->create_state(this_executor, *chain_storage, block_number - 1);
auto account_opt = state->read_account(address);
account_opt.value_or(silkworm::Account{});

EVMExecutor executor{*chain_config_ptr, workers_, state};
EVMExecutor executor{chain_config, workers_, state};

uint64_t index = std::min(static_cast<uint64_t>(transactions.size()), tx_index);
for (uint64_t idx{0}; idx < index; idx++) {
Expand Down Expand Up @@ -710,9 +708,9 @@ Task<void> DebugRpcApi::handle_debug_get_raw_header(const nlohmann::json& reques
const auto chain_storage = tx->create_storage();
const auto block_number = co_await core::get_block_number(block_id, *tx);
const auto block_hash = co_await chain_storage->read_canonical_hash(block_number);
auto header = co_await chain_storage->read_header(block_number, block_hash->bytes);
const auto header = co_await chain_storage->read_header(block_number, block_hash->bytes);
if (!header) {
throw std::invalid_argument("header not found");
throw std::invalid_argument("header " + std::to_string(block_number) + " not found");
}
Bytes encoded_header;
rlp::encode(encoded_header, *header);
Expand Down
25 changes: 11 additions & 14 deletions silkworm/rpc/commands/engine_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,25 +318,24 @@ Task<void> EngineRpcApi::handle_engine_new_payload_v2(const nlohmann::json& requ
#endif
const auto storage{tx->create_storage()};
const auto config{co_await storage->read_chain_config()};
ensure(config.has_value(), "execution layer has invalid configuration");
ensure(config->shanghai_time.has_value(), "execution layer has no Shanghai timestamp in configuration");
ensure(config.shanghai_time.has_value(), "execution layer has no Shanghai timestamp in configuration");

// We MUST check that CL has sent the expected ExecutionPayload version [Specification for params]
if (payload.timestamp < config->shanghai_time && payload.version != ExecutionPayload::V1) {
if (payload.timestamp < config.shanghai_time && payload.version != ExecutionPayload::V1) {
const auto error_msg = "consensus layer must use ExecutionPayloadV1 if timestamp lower than Shanghai";
SILK_ERROR << error_msg;
reply = make_json_error(request, kInvalidParams, error_msg);
co_await tx->close();
co_return;
}
if (payload.timestamp >= config->shanghai_time && payload.version != ExecutionPayload::V2) {
if (payload.timestamp >= config.shanghai_time && payload.version != ExecutionPayload::V2) {
const auto error_msg = "consensus layer must use ExecutionPayloadV2 if timestamp greater or equal to Shanghai";
SILK_ERROR << error_msg;
reply = make_json_error(request, kInvalidParams, error_msg);
co_await tx->close();
co_return;
}
if (config->cancun_time && payload.timestamp >= config->cancun_time) {
if (config.cancun_time && payload.timestamp >= config.cancun_time) {
const auto error_msg = "consensus layer must use ExecutionPayloadV3 if timestamp greater or equal to Cancun";
SILK_ERROR << error_msg;
reply = make_json_error(request, kUnsupportedFork, error_msg);
Expand Down Expand Up @@ -382,12 +381,11 @@ Task<void> EngineRpcApi::handle_engine_new_payload_v3(const nlohmann::json& requ
#endif
const auto storage{tx->create_storage()};
const auto config{co_await storage->read_chain_config()};
ensure(config.has_value(), "execution layer has invalid configuration");
ensure(config->shanghai_time.has_value(), "execution layer has no Shanghai timestamp in configuration");
ensure(config->cancun_time.has_value(), "execution layer has no Cancun timestamp in configuration");
ensure(config.shanghai_time.has_value(), "execution layer has no Shanghai timestamp in configuration");
ensure(config.cancun_time.has_value(), "execution layer has no Cancun timestamp in configuration");

// We MUST check that CL has sent the expected ExecutionPayload version [Specification for params]
if (payload.timestamp >= config->cancun_time && payload.version != ExecutionPayload::V3) {
if (payload.timestamp >= config.cancun_time && payload.version != ExecutionPayload::V3) {
const auto error_msg = "consensus layer must use ExecutionPayloadV3 if timestamp greater or equal to Cancun";
SILK_ERROR << error_msg;
reply = make_json_error(request, kUnsupportedFork, error_msg);
Expand Down Expand Up @@ -581,13 +579,12 @@ Task<void> EngineRpcApi::handle_engine_exchange_transition_configuration_v1(cons
#endif
const auto storage{tx->create_storage()};
const auto config{co_await storage->read_chain_config()};
ensure(config.has_value(), "execution layer has invalid configuration");
ensure(config->terminal_total_difficulty.has_value(), "execution layer does not have terminal total difficulty");
ensure(config.terminal_total_difficulty.has_value(), "execution layer does not have terminal total difficulty");

// We SHOULD check for any configuration mismatch except `terminalBlockNumber` [Specification 2.]
if (config->terminal_total_difficulty != cl_configuration.terminal_total_difficulty) {
if (config.terminal_total_difficulty != cl_configuration.terminal_total_difficulty) {
SILK_ERROR << "execution layer has the incorrect terminal total difficulty, expected: "
<< cl_configuration.terminal_total_difficulty << " got: " << config->terminal_total_difficulty.value();
<< cl_configuration.terminal_total_difficulty << " got: " << config.terminal_total_difficulty.value();
reply = make_json_error(request, kInvalidParams, "consensus layer terminal total difficulty does not match");
co_await tx->close();
co_return;
Expand All @@ -602,7 +599,7 @@ Task<void> EngineRpcApi::handle_engine_exchange_transition_configuration_v1(cons

// We MUST respond with configurable setting values set according to EIP-3675 [Specification 1.]
const TransitionConfiguration transition_configuration{
.terminal_total_difficulty = config->terminal_total_difficulty.value(),
.terminal_total_difficulty = config.terminal_total_difficulty.value(),
.terminal_block_hash = kZeroHash, // terminal_block_hash removed from chain_config, return zero
.terminal_block_number = 0 // terminal_block_number removed from chain_config, return zero
};
Expand Down
27 changes: 11 additions & 16 deletions silkworm/rpc/commands/erigon_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,12 @@ Task<void> ErigonRpcApi::handle_erigon_get_block_by_timestamp(const nlohmann::js

// Lookup the first and last block headers
const auto first_header = co_await chain_storage->read_canonical_header(kEarliestBlockNumber);
ensure(first_header.has_value(), "cannot find earliest header");
const auto head_header_hash = co_await core::rawdb::read_head_header_hash(*tx);
const auto header_header_block_number = co_await chain_storage->read_block_number(head_header_hash);
const auto current_header = co_await chain_storage->read_header(*header_header_block_number, head_header_hash);
const auto head_header_block_number = co_await chain_storage->read_block_number(head_header_hash);
ensure(head_header_block_number.has_value(), "cannot find head header hash");
const auto current_header = co_await chain_storage->read_header(*head_header_block_number, head_header_hash);
ensure(current_header.has_value(), "cannot find head header");
const BlockNum current_block_number = current_header->number;

// Find the lowest block header w/ timestamp greater or equal to provided timestamp
Expand All @@ -142,13 +145,14 @@ Task<void> ErigonRpcApi::handle_erigon_get_block_by_timestamp(const nlohmann::js
block_number = kEarliestBlockNumber;
} else {
// Good-old binary search to find the lowest block header matching timestamp
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
auto matching_block_number = co_await binary_search(current_block_number, [&](uint64_t bn) -> Task<bool> {
const auto header = co_await chain_storage->read_canonical_header(bn);
co_return header->timestamp >= timestamp;
co_return header && header->timestamp >= timestamp;
});
// TODO(canepat) we should try to avoid this block header lookup (just done in search)
auto matching_header = co_await chain_storage->read_canonical_header(matching_block_number);
while (matching_header->timestamp > timestamp) {
while (matching_header && matching_header->timestamp > timestamp) {
const auto header = co_await chain_storage->read_canonical_header(matching_block_number - 1);
if (!header || header->timestamp < timestamp) {
break;
Expand All @@ -161,14 +165,9 @@ Task<void> ErigonRpcApi::handle_erigon_get_block_by_timestamp(const nlohmann::js

// Lookup and return the matching block
const auto block_with_hash = co_await core::read_block_by_number(*block_cache_, *chain_storage, block_number);
if (!block_with_hash) {
const std::string error_msg = "block not found ";
SILK_ERROR << "erigon_get_block_by_timestamp: core::read_block_by_number: " << error_msg << request.dump();
make_glaze_json_error(request, 100, error_msg, reply);
co_await tx->close(); // RAII not (yet) available with coroutines
co_return;
}
ensure(block_with_hash != nullptr, [&]() { return "block " + std::to_string(block_number) + " not found"; });
const auto total_difficulty = co_await chain_storage->read_total_difficulty(block_with_hash->hash, block_number);
ensure(total_difficulty.has_value(), [&]() { return "no total difficulty for block " + std::to_string(block_number); });
const Block extended_block{block_with_hash, *total_difficulty, full_tx};

make_glaze_json_content(request, extended_block, reply);
Expand Down Expand Up @@ -449,11 +448,7 @@ Task<void> ErigonRpcApi::handle_erigon_forks(const nlohmann::json& request, nloh
const auto chain_storage = tx->create_storage();

const auto chain_config{co_await chain_storage->read_chain_config()};
if (!chain_config) {
throw std::runtime_error("Chain config missing");
}
SILK_DEBUG << "chain config: " << *chain_config;
Forks forks{*chain_config};
Forks forks{chain_config};

reply = make_json_content(request, forks);
} catch (const std::exception& e) {
Expand Down
Loading
Loading