From 1c7136bfab6447f152571d90113eabaa808c0364 Mon Sep 17 00:00:00 2001 From: Quertyy <98064975+Quertyy@users.noreply.github.com> Date: Thu, 18 Sep 2025 04:57:49 +0700 Subject: [PATCH 1/4] feat(rpc): add HlBlockPrecompile rpc API --- src/main.rs | 5 +++++ src/node/rpc/mod.rs | 1 + src/node/rpc/precompile.rs | 44 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/node/rpc/precompile.rs diff --git a/src/main.rs b/src/main.rs index a223874ea..0062a49cb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,6 +12,7 @@ use reth_hl::{ chainspec::{parser::HlChainSpecParser, HlChainSpec}, node::{ cli::{Cli, HlNodeArgs}, + rpc::precompile::{HlBlockPrecompileApiServer, HlBlockPrecompileExt}, storage::tables::Tables, HlNode, }, @@ -72,6 +73,10 @@ fn main() -> eyre::Result<()> { info!("eth_getProof is disabled by default"); } + ctx.modules.merge_configured( + HlBlockPrecompileExt::new(ctx.registry.eth_api().clone()).into_rpc(), + )?; + Ok(()) }) .apply(|builder| { diff --git a/src/node/rpc/mod.rs b/src/node/rpc/mod.rs index 30c8754f4..4fe7f3873 100644 --- a/src/node/rpc/mod.rs +++ b/src/node/rpc/mod.rs @@ -43,6 +43,7 @@ mod block; mod call; pub mod engine_api; mod estimate; +pub mod precompile; mod transaction; pub trait HlRpcNodeCore: RpcNodeCore> {} diff --git a/src/node/rpc/precompile.rs b/src/node/rpc/precompile.rs new file mode 100644 index 000000000..44a89d0c6 --- /dev/null +++ b/src/node/rpc/precompile.rs @@ -0,0 +1,44 @@ +use jsonrpsee::proc_macros::rpc; +use jsonrpsee_core::{async_trait, RpcResult}; +use reth_rpc_convert::RpcConvert; +use reth_rpc_eth_types::EthApiError; +use tracing::trace; + +use crate::node::{ + rpc::{HlEthApi, HlRpcNodeCore}, + types::HlExtras, +}; + +/// A custom RPC trait for fetching block precompile data. +#[rpc(server, namespace = "eth")] +#[async_trait] +pub trait HlBlockPrecompileApi { + /// Fetches precompile data for a given block number. + #[method(name = "blockPrecompileData")] + async fn block_precompile_data(&self, block_number: u64) -> RpcResult; +} + +pub struct HlBlockPrecompileExt { + eth_api: HlEthApi, +} + +impl HlBlockPrecompileExt { + /// Creates a new instance of the [`HlBlockPrecompileExt`]. + pub fn new(eth_api: HlEthApi) -> Self { + Self { eth_api } + } +} + +#[async_trait] +impl HlBlockPrecompileApiServer for HlBlockPrecompileExt +where + N: HlRpcNodeCore, + Rpc: RpcConvert, +{ + async fn block_precompile_data(&self, block_number: u64) -> RpcResult { + trace!(target: "rpc::eth", block_number, "Serving eth_blockPrecompileData"); + let hl_extras = + self.eth_api.get_hl_extras(block_number).map_err(|e| EthApiError::from(e))?; + Ok(hl_extras) + } +} From 458f506ad27e706d807272dff54eda73460d50cb Mon Sep 17 00:00:00 2001 From: Quertyy <98064975+Quertyy@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:33:32 +0700 Subject: [PATCH 2/4] refactor: use BlockHashOrNumber as block type --- src/node/rpc/call.rs | 6 +++--- src/node/rpc/estimate.rs | 2 +- src/node/rpc/mod.rs | 7 ++++--- src/node/rpc/precompile.rs | 12 ++++++------ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/node/rpc/call.rs b/src/node/rpc/call.rs index eb3dcf345..179a16477 100644 --- a/src/node/rpc/call.rs +++ b/src/node/rpc/call.rs @@ -61,7 +61,7 @@ where DB: Database + fmt::Debug, { let block_number = evm_env.block_env().number; - let hl_extras = self.get_hl_extras(block_number.try_into().unwrap())?; + let hl_extras = self.get_hl_extras(block_number.to::().into())?; let mut evm = self.evm_config().evm_with_env(db, evm_env); apply_precompiles(&mut evm, &hl_extras); @@ -82,7 +82,7 @@ where I: InspectorFor, { let block_number = evm_env.block_env().number; - let hl_extras = self.get_hl_extras(block_number.try_into().unwrap())?; + let hl_extras = self.get_hl_extras(block_number.to::().into())?; let mut evm = self.evm_config().evm_with_env_and_inspector(db, evm_env, inspector); apply_precompiles(&mut evm, &hl_extras); @@ -103,7 +103,7 @@ where I: IntoIterator>>, { let block_number = evm_env.block_env().number; - let hl_extras = self.get_hl_extras(block_number.try_into().unwrap())?; + let hl_extras = self.get_hl_extras(block_number.to::().into())?; let mut evm = self.evm_config().evm_with_env(db, evm_env); apply_precompiles(&mut evm, &hl_extras); diff --git a/src/node/rpc/estimate.rs b/src/node/rpc/estimate.rs index cd99dea95..f7a44794c 100644 --- a/src/node/rpc/estimate.rs +++ b/src/node/rpc/estimate.rs @@ -98,7 +98,7 @@ where tx_env.set_gas_limit(tx_env.gas_limit().min(highest_gas_limit)); let block_number = evm_env.block_env().number; - let hl_extras = self.get_hl_extras(block_number.try_into().unwrap())?; + let hl_extras = self.get_hl_extras(block_number.to::().into())?; let mut evm = self.evm_config().evm_with_env(&mut db, evm_env); apply_precompiles(&mut evm, &hl_extras); diff --git a/src/node/rpc/mod.rs b/src/node/rpc/mod.rs index 4fe7f3873..b2814661b 100644 --- a/src/node/rpc/mod.rs +++ b/src/node/rpc/mod.rs @@ -3,6 +3,7 @@ use crate::{ node::{evm::apply_precompiles, types::HlExtras}, HlBlock, HlPrimitives, }; +use alloy_eips::BlockHashOrNumber; use alloy_evm::Evm; use alloy_network::Ethereum; use alloy_primitives::U256; @@ -233,7 +234,7 @@ where I: InspectorFor, { let block_number = evm_env.block_env().number; - let hl_extras = self.get_hl_extras(block_number.try_into().unwrap())?; + let hl_extras = self.get_hl_extras(block_number.to::().into())?; let mut evm = self.evm_config().evm_with_env_and_inspector(db, evm_env, inspector); apply_precompiles(&mut evm, &hl_extras); @@ -246,10 +247,10 @@ where N: HlRpcNodeCore, Rpc: RpcConvert, { - fn get_hl_extras(&self, block_number: u64) -> Result { + fn get_hl_extras(&self, block: BlockHashOrNumber) -> Result { Ok(self .provider() - .block_by_number(block_number)? + .block(block)? .map(|block| HlExtras { read_precompile_calls: block.body.read_precompile_calls.clone(), highest_precompile_address: block.body.highest_precompile_address, diff --git a/src/node/rpc/precompile.rs b/src/node/rpc/precompile.rs index 44a89d0c6..91a85da48 100644 --- a/src/node/rpc/precompile.rs +++ b/src/node/rpc/precompile.rs @@ -1,3 +1,4 @@ +use alloy_eips::BlockHashOrNumber; use jsonrpsee::proc_macros::rpc; use jsonrpsee_core::{async_trait, RpcResult}; use reth_rpc_convert::RpcConvert; @@ -13,9 +14,9 @@ use crate::node::{ #[rpc(server, namespace = "eth")] #[async_trait] pub trait HlBlockPrecompileApi { - /// Fetches precompile data for a given block number. + /// Fetches precompile data for a given block. #[method(name = "blockPrecompileData")] - async fn block_precompile_data(&self, block_number: u64) -> RpcResult; + async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult; } pub struct HlBlockPrecompileExt { @@ -35,10 +36,9 @@ where N: HlRpcNodeCore, Rpc: RpcConvert, { - async fn block_precompile_data(&self, block_number: u64) -> RpcResult { - trace!(target: "rpc::eth", block_number, "Serving eth_blockPrecompileData"); - let hl_extras = - self.eth_api.get_hl_extras(block_number).map_err(|e| EthApiError::from(e))?; + async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult { + trace!(target: "rpc::eth", ?block, "Serving eth_blockPrecompileData"); + let hl_extras = self.eth_api.get_hl_extras(block).map_err(|e| EthApiError::from(e))?; Ok(hl_extras) } } From 4896e4f0ea614e6ee381526f4dda42feb771e9a1 Mon Sep 17 00:00:00 2001 From: Quertyy <98064975+Quertyy@users.noreply.github.com> Date: Fri, 19 Sep 2025 12:41:14 +0700 Subject: [PATCH 3/4] refactor: use BlockId as block type --- src/node/rpc/mod.rs | 10 ++++++---- src/node/rpc/precompile.rs | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/node/rpc/mod.rs b/src/node/rpc/mod.rs index b2814661b..c68a95d44 100644 --- a/src/node/rpc/mod.rs +++ b/src/node/rpc/mod.rs @@ -3,7 +3,7 @@ use crate::{ node::{evm::apply_precompiles, types::HlExtras}, HlBlock, HlPrimitives, }; -use alloy_eips::BlockHashOrNumber; +use alloy_eips::BlockId; use alloy_evm::Evm; use alloy_network::Ethereum; use alloy_primitives::U256; @@ -27,7 +27,9 @@ use reth::{ }; use reth_evm::{ConfigureEvm, Database, EvmEnvFor, HaltReasonFor, InspectorFor, TxEnvFor}; use reth_primitives::NodePrimitives; -use reth_provider::{BlockReader, ChainSpecProvider, ProviderError, ProviderHeader, ProviderTx}; +use reth_provider::{ + BlockReaderIdExt, ChainSpecProvider, ProviderError, ProviderHeader, ProviderTx, +}; use reth_rpc::RpcTypes; use reth_rpc_eth_api::{ helpers::{ @@ -247,10 +249,10 @@ where N: HlRpcNodeCore, Rpc: RpcConvert, { - fn get_hl_extras(&self, block: BlockHashOrNumber) -> Result { + fn get_hl_extras(&self, block: BlockId) -> Result { Ok(self .provider() - .block(block)? + .block_by_id(block)? .map(|block| HlExtras { read_precompile_calls: block.body.read_precompile_calls.clone(), highest_precompile_address: block.body.highest_precompile_address, diff --git a/src/node/rpc/precompile.rs b/src/node/rpc/precompile.rs index 91a85da48..92c1bf028 100644 --- a/src/node/rpc/precompile.rs +++ b/src/node/rpc/precompile.rs @@ -1,4 +1,4 @@ -use alloy_eips::BlockHashOrNumber; +use alloy_eips::BlockId; use jsonrpsee::proc_macros::rpc; use jsonrpsee_core::{async_trait, RpcResult}; use reth_rpc_convert::RpcConvert; @@ -16,7 +16,7 @@ use crate::node::{ pub trait HlBlockPrecompileApi { /// Fetches precompile data for a given block. #[method(name = "blockPrecompileData")] - async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult; + async fn block_precompile_data(&self, block: BlockId) -> RpcResult; } pub struct HlBlockPrecompileExt { @@ -36,7 +36,7 @@ where N: HlRpcNodeCore, Rpc: RpcConvert, { - async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult { + async fn block_precompile_data(&self, block: BlockId) -> RpcResult { trace!(target: "rpc::eth", ?block, "Serving eth_blockPrecompileData"); let hl_extras = self.eth_api.get_hl_extras(block).map_err(|e| EthApiError::from(e))?; Ok(hl_extras) From 30806657026300c271d612e5afe4aae244553dca Mon Sep 17 00:00:00 2001 From: Quertyy <98064975+Quertyy@users.noreply.github.com> Date: Fri, 19 Sep 2025 13:23:49 +0700 Subject: [PATCH 4/4] style: pass clippy check --- src/node/rpc/precompile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/rpc/precompile.rs b/src/node/rpc/precompile.rs index 92c1bf028..752d9916c 100644 --- a/src/node/rpc/precompile.rs +++ b/src/node/rpc/precompile.rs @@ -38,7 +38,7 @@ where { async fn block_precompile_data(&self, block: BlockId) -> RpcResult { trace!(target: "rpc::eth", ?block, "Serving eth_blockPrecompileData"); - let hl_extras = self.eth_api.get_hl_extras(block).map_err(|e| EthApiError::from(e))?; + let hl_extras = self.eth_api.get_hl_extras(block).map_err(EthApiError::from)?; Ok(hl_extras) } }