Skip to content
Merged
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
2 changes: 2 additions & 0 deletions Cargo.lock

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

20 changes: 17 additions & 3 deletions crates/node/src/add_ons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
};
use morph_evm::MorphEvmConfig;
use morph_primitives::{Block, MorphHeader, MorphReceipt};
use morph_rpc::MorphEthApiBuilder;
use morph_rpc::{MorphEthApiBuilder, MorphEthConfigApiServer, MorphEthConfigHandler};
use reth_node_api::{AddOnsContext, FullNodeComponents, FullNodeTypes, NodeAddOns, NodePrimitives};
use reth_node_builder::{
NodeAdapter,
Expand Down Expand Up @@ -103,6 +103,10 @@ where
let engine_state_tracker =
std::sync::Arc::new(morph_engine_api::EngineStateTracker::default());

// Create Morph eth_config handler (EIP-7910 + morph extension)
let eth_config_handler =
MorphEthConfigHandler::new(ctx.node.provider().clone(), ctx.node.evm_config().clone());

// Keep a local view of canonical head/forkchoice from reth engine events.
let tracker_for_events = engine_state_tracker.clone();
task_executor.spawn_critical("morph engine state tracker", async move {
Expand All @@ -112,13 +116,23 @@ where
}
});

// Use launch_add_ons_with to register custom Engine API
// Use launch_add_ons_with to register custom Engine API and eth_config
self.inner
.launch_add_ons_with(ctx, move |container| {
let reth_node_builder::rpc::RpcModuleContainer {
auth_module, ..
modules,
auth_module,
..
} = container;

// Register Morph eth_config handler (EIP-7910 + morph extension)
// This provides eth_config on HTTP/WS/IPC for morphnode compatibility.
tracing::debug!(target: "morph::node", "Registering Morph eth_config handler");
modules
.merge_configured(eth_config_handler.into_rpc())
.map_err(|e| eyre::eyre!("Failed to register eth_config handler: {}", e))?;
tracing::info!(target: "morph::node", "Morph eth_config handler registered successfully");

// Create and register Morph L2 Engine API
tracing::debug!(target: "morph::node", "Registering Morph L2 Engine API");

Expand Down
4 changes: 4 additions & 0 deletions crates/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ reth-rpc-eth-types.workspace = true
reth-evm.workspace = true
reth-provider.workspace = true
reth-revm.workspace = true
reth-storage-api.workspace = true
reth-tasks.workspace = true
reth-errors.workspace = true
reth-transaction-pool.workspace = true
Expand Down Expand Up @@ -57,5 +58,8 @@ eyre.workspace = true
tracing.workspace = true


[dev-dependencies]
serde_json.workspace = true

[features]
default = []
Loading
Loading