Skip to content

some more refactoring #1826

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

Open
wants to merge 3 commits into
base: alee/runloop
Choose a base branch
from
Open

some more refactoring #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84a8aca
add event recording to ethereum runloop
zander-xyz Oct 23, 2025
8920055
move db finalize and update_verified_block out of process_ethereum_block
zander-xyz Oct 23, 2025
dfc41d0
const ref Block in runloops
zander-xyz Oct 23, 2025
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
18 changes: 11 additions & 7 deletions cmd/monad/runloop_ethereum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include <category/execution/ethereum/core/rlp/block_rlp.hpp>
#include <category/execution/ethereum/db/block_db.hpp>
#include <category/execution/ethereum/db/db.hpp>
#include <category/execution/ethereum/event/exec_event_ctypes.h>
#include <category/execution/ethereum/event/exec_event_recorder.hpp>
#include <category/execution/ethereum/execute_block.hpp>
#include <category/execution/ethereum/execute_transaction.hpp>
#include <category/execution/ethereum/metrics/block_metrics.hpp>
Expand Down Expand Up @@ -81,8 +83,9 @@ void log_tps(
template <Traits traits>
Result<BlockHeader> process_ethereum_block(
Chain const &chain, Db &db, vm::VM &vm, BlockHashBuffer &block_hash_buffer,
fiber::PriorityPool &priority_pool, Block &block, bytes32_t const &block_id,
bytes32_t const &parent_block_id, bool const enable_tracing)
fiber::PriorityPool &priority_pool, Block const &block,
bytes32_t const &block_id, bytes32_t const &parent_block_id,
bool const enable_tracing)
{
[[maybe_unused]] auto const block_start = std::chrono::system_clock::now();
auto const block_begin = std::chrono::steady_clock::now();
Expand Down Expand Up @@ -132,6 +135,7 @@ Result<BlockHeader> process_ethereum_block(
db.set_block_and_prefix(block.header.number - 1, parent_block_id);
BlockMetrics block_metrics;
BlockState block_state(db, vm);
record_block_marker_event(MONAD_EXEC_BLOCK_PERF_EVM_ENTER);
BOOST_OUTCOME_TRY(
auto const receipts,
execute_block<traits>(
Expand All @@ -145,6 +149,7 @@ Result<BlockHeader> process_ethereum_block(
block_metrics,
call_tracers,
state_tracers));
record_block_marker_event(MONAD_EXEC_BLOCK_PERF_EVM_EXIT);

// Database commit of state changes (incl. Merkle root calculations)
block_state.log_debug();
Expand All @@ -167,11 +172,6 @@ Result<BlockHeader> process_ethereum_block(
BOOST_OUTCOME_TRY(
chain.validate_output_header(block.header, output_header));

// Commit prologue: database finalization, computation of the Ethereum
// block hash to append to the circular hash buffer
db.finalize(block.header.number, block_id);
db.update_verified_block(block.header.number);

// Emit the block metrics log line
[[maybe_unused]] auto const block_time =
std::chrono::duration_cast<std::chrono::microseconds>(
Expand Down Expand Up @@ -256,6 +256,10 @@ Result<std::pair<uint64_t, uint64_t>> runloop_ethereum(
MONAD_ABORT_PRINTF("unhandled rev switch case: %d", rev);
}());

// Commit prologue: database finalization, computation of the Ethereum
// block hash to append to the circular hash buffer
db.finalize(block.header.number, block_id);
db.update_verified_block(block.header.number);
bytes32_t const eth_block_hash =
to_bytes(keccak256(rlp::encode_block_header(output_header)));
block_hash_buffer.set(block.header.number, eth_block_hash);
Expand Down
2 changes: 1 addition & 1 deletion cmd/monad/runloop_monad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ bool validate_delayed_execution_results(
template <Traits traits, class MonadConsensusBlockHeader>
Result<BlockExecOutput> propose_block(
bytes32_t const &block_id,
MonadConsensusBlockHeader const &consensus_header, Block block,
MonadConsensusBlockHeader const &consensus_header, Block const &block,
BlockHashChain &block_hash_chain, MonadChain const &chain, Db &db,
vm::VM &vm, fiber::PriorityPool &priority_pool, bool const is_first_block,
bool const enable_tracing, BlockCache &block_cache)
Expand Down
Loading