refactor: use BlockHashOrNumber as block type

src/node/rpc/call.rs

@@ -61,7 +61,7 @@ where
         DB: Database<Error = ProviderError> + 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::<u64>().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<Self::Evm, DB>,
     {
         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::<u64>().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<Item = Recovered<&'a ProviderTx<Self::Provider>>>,
     {
         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::<u64>().into())?;
 
         let mut evm = self.evm_config().evm_with_env(db, evm_env);
         apply_precompiles(&mut evm, &hl_extras);

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::<u64>().into())?;
 
         let mut evm = self.evm_config().evm_with_env(&mut db, evm_env);
         apply_precompiles(&mut evm, &hl_extras);

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<Self::Evm, DB>,
     {
         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::<u64>().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<Primitives = N::Primitives, Error = EthApiError>,
 {
-    fn get_hl_extras(&self, block_number: u64) -> Result<HlExtras, ProviderError> {
+    fn get_hl_extras(&self, block: BlockHashOrNumber) -> Result<HlExtras, ProviderError> {
         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,

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<HlExtras>;
+    async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult<HlExtras>;
 }
 
 pub struct HlBlockPrecompileExt<N: HlRpcNodeCore, Rpc: RpcConvert> {
@@ -35,10 +36,9 @@ where
     N: HlRpcNodeCore,
     Rpc: RpcConvert<Primitives = N::Primitives, Error = EthApiError>,
 {
-    async fn block_precompile_data(&self, block_number: u64) -> RpcResult<HlExtras> {
+    async fn block_precompile_data(&self, block: BlockHashOrNumber) -> RpcResult<HlExtras> {
-        trace!(target: "rpc::eth", block_number, "Serving eth_blockPrecompileData");
+        trace!(target: "rpc::eth", ?block, "Serving eth_blockPrecompileData");
-        let hl_extras =
+        let hl_extras = self.eth_api.get_hl_extras(block).map_err(|e| EthApiError::from(e))?;
-            self.eth_api.get_hl_extras(block_number).map_err(|e| EthApiError::from(e))?;
         Ok(hl_extras)
     }
 }