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] 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<Primitives = N::Primitives, Error = EthApiError>,
 {
-    fn get_hl_extras(&self, block: BlockHashOrNumber) -> Result<HlExtras, ProviderError> {
+    fn get_hl_extras(&self, block: BlockId) -> Result<HlExtras, ProviderError> {
         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<HlExtras>;
+    async fn block_precompile_data(&self, block: BlockId) -> RpcResult<HlExtras>;
 }
 
 pub struct HlBlockPrecompileExt<N: HlRpcNodeCore, Rpc: RpcConvert> {
@@ -36,7 +36,7 @@ where
     N: HlRpcNodeCore,
     Rpc: RpcConvert<Primitives = N::Primitives, Error = EthApiError>,
 {
-    async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult<HlExtras> {
+    async fn block_precompile_data(&self, block: BlockId) -> RpcResult<HlExtras> {
         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)