Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ members = [
"crates/exex/test-utils/",
"crates/exex/types/",
"crates/metrics/",
"crates/monitor/",
"crates/net/banlist/",
"crates/net/discv4/",
"crates/net/discv5/",
Expand Down Expand Up @@ -391,6 +392,7 @@ reth-ipc = { path = "crates/rpc/ipc" }
reth-libmdbx = { path = "crates/storage/libmdbx-rs" }
reth-mdbx-sys = { path = "crates/storage/libmdbx-rs/mdbx-sys" }
reth-metrics = { path = "crates/metrics" }
reth-monitor = { path = "crates/monitor" }
reth-net-banlist = { path = "crates/net/banlist" }
reth-net-nat = { path = "crates/net/nat" }
reth-network = { path = "crates/net/network" }
Expand Down
1 change: 1 addition & 0 deletions crates/engine/tree/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ smallvec.workspace = true
# metrics
metrics.workspace = true
reth-metrics = { workspace = true, features = ["common"] }
reth-monitor.workspace = true

# misc
dashmap.workspace = true
Expand Down
23 changes: 21 additions & 2 deletions crates/engine/tree/src/tree/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use reth_engine_primitives::{
};
use reth_errors::{ConsensusError, ProviderResult};
use reth_evm::{ConfigureEvm, OnStateHook};
use reth_monitor::{get_global_tracer, TransactionProcessId};
use reth_payload_builder::PayloadBuilderHandle;
use reth_payload_primitives::{
BuiltPayload, EngineApiMessageVersion, NewPayloadError, PayloadBuilderAttributes, PayloadTypes,
Expand Down Expand Up @@ -542,6 +543,13 @@ where
self.emit_event(EngineApiEvent::BeaconConsensus(engine_event));

let block_hash = num_hash.hash;
let block_number = payload.block_number();

// X Layer: Log block receive end (record immediately after receiving the block,
// before processing/insertion starts, to ensure correct timestamp ordering)
if let Some(tracer) = get_global_tracer() {
tracer.log_block(block_hash, block_number, TransactionProcessId::RpcBlockReceiveEnd);
}

// Check for invalid ancestors
if let Some(invalid) = self.find_invalid_ancestor(&payload) {
Expand Down Expand Up @@ -2504,12 +2512,23 @@ where
// emit insert event
let elapsed = start.elapsed();
let engine_event = if is_fork {
ConsensusEngineEvent::ForkBlockAdded(executed, elapsed)
ConsensusEngineEvent::ForkBlockAdded(executed.clone(), elapsed)
} else {
ConsensusEngineEvent::CanonicalBlockAdded(executed, elapsed)
ConsensusEngineEvent::CanonicalBlockAdded(executed.clone(), elapsed)
};
self.emit_event(EngineApiEvent::BeaconConsensus(engine_event));

// X Layer: Log block insertion end
if let Some(tracer) = get_global_tracer() {
let is_canonical = !is_fork;

if is_canonical {
let block_hash = executed.recovered_block().hash();
let block_number = executed.recovered_block().number();
tracer.log_block(block_hash, block_number, TransactionProcessId::RpcBlockInsertEnd);
}
}

self.metrics
.engine
.block_insert_total_duration
Expand Down
17 changes: 17 additions & 0 deletions crates/monitor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[package]
name = "reth-monitor"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true
description = "Transaction and block monitoring for X Layer"

[lints]
workspace = true

[dependencies]
alloy-primitives.workspace = true
tracing.workspace = true

Loading