Merge pull request #3328 from Pana/op/blockNumberDeserialize

RPC type BlockNumber optimize

Author: Pana

crates/rpc/rpc-eth-api/src/debug.rs

@@ -2,7 +2,7 @@ use alloy_rpc_types_trace::geth::{
     GethDebugTracingCallOptions, GethDebugTracingOptions, GethTrace,
     TraceResult,
 };
-use cfx_rpc_eth_types::{BlockNumber, TransactionRequest};
+use cfx_rpc_eth_types::{BlockId, TransactionRequest};
 use cfx_types::H256;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 
@@ -28,12 +28,12 @@ pub trait DebugApi {
 
     #[method(name = "traceBlockByNumber")]
     async fn debug_trace_block_by_number(
-        &self, block: BlockNumber, opts: Option<GethDebugTracingOptions>,
+        &self, block: BlockId, opts: Option<GethDebugTracingOptions>,
     ) -> RpcResult<Vec<TraceResult>>;
 
     #[method(name = "traceCall")]
     async fn debug_trace_call(
-        &self, request: TransactionRequest, block_number: Option<BlockNumber>,
+        &self, request: TransactionRequest, block_number: Option<BlockId>,
         opts: Option<GethDebugTracingCallOptions>,
     ) -> RpcResult<GethTrace>;
 }

crates/rpc/rpc-eth-api/src/eth.rs

@@ -1,9 +1,8 @@
 use cfx_rpc_eth_types::{
-    AccessListResult, AccountPendingTransactions, Block,
-    BlockNumber as BlockId, BlockOverrides, Bundle, EthCallResponse,
-    EthRpcLogFilter as Filter, FeeHistory, Header, Log, Receipt,
-    RpcStateOverride, SimulatePayload, SimulatedBlock, StateContext,
-    SyncStatus, Transaction, TransactionRequest,
+    AccessListResult, AccountPendingTransactions, Block, BlockId,
+    BlockOverrides, Bundle, EthCallResponse, EthRpcLogFilter as Filter,
+    FeeHistory, Header, Log, Receipt, RpcStateOverride, SimulatePayload,
+    SimulatedBlock, StateContext, SyncStatus, Transaction, TransactionRequest,
 };
 use cfx_rpc_primitives::{Bytes, Index};
 use cfx_types::{Address, H256, H64, U256, U64};

crates/rpc/rpc-eth-api/src/parity.rs

@@ -1,4 +1,4 @@
-use cfx_rpc_eth_types::{BlockNumber as BlockId, Receipt};
+use cfx_rpc_eth_types::{BlockId, Receipt};
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 
 #[rpc(server, namespace = "parity")]

crates/rpc/rpc-eth-api/src/trace.rs

@@ -1,5 +1,5 @@
 use cfx_rpc_eth_types::{
-    BlockNumber, Index, LocalizedSetAuthTrace, LocalizedTrace, TraceFilter,
+    BlockId, Index, LocalizedSetAuthTrace, LocalizedTrace, TraceFilter,
 };
 use cfx_types::H256;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
@@ -9,13 +9,13 @@ pub trait TraceApi {
     /// Returns all traces produced at the given block.
     #[method(name = "block")]
     async fn block_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> RpcResult<Option<Vec<LocalizedTrace>>>;
 
     /// Returns all set auth traces produced at the given block.
     #[method(name = "blockSetAuth")]
     async fn block_set_auth_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> RpcResult<Option<Vec<LocalizedSetAuthTrace>>>;
 
     /// Returns all traces matching the provided filter.

crates/rpc/rpc-eth-impl/src/debug.rs

@@ -6,7 +6,7 @@ use alloy_rpc_types_trace::geth::{
 };
 use async_trait::async_trait;
 use cfx_rpc_eth_api::DebugApiServer;
-use cfx_rpc_eth_types::{BlockNumber, TransactionRequest};
+use cfx_rpc_eth_types::{BlockId, TransactionRequest};
 use cfx_rpc_utils::error::jsonrpsee_error_helpers::invalid_params_msg;
 use cfx_types::{AddressSpaceUtil, Space, H256, U256};
 use cfxcore::{
@@ -36,19 +36,15 @@ impl DebugApi {
 
     pub fn consensus_graph(&self) -> &ConsensusGraph { &self.consensus }
 
-    pub fn get_block_epoch_num(
-        &self, block: BlockNumber,
-    ) -> Result<u64, String> {
+    pub fn get_block_epoch_num(&self, block: BlockId) -> Result<u64, String> {
         let num = match block {
-            BlockNumber::Num(block_number) => block_number,
-            BlockNumber::Latest
-            | BlockNumber::Safe
-            | BlockNumber::Finalized => {
+            BlockId::Num(block_number) => block_number,
+            BlockId::Latest | BlockId::Safe | BlockId::Finalized => {
                 let epoch_num = block.try_into().expect("should success");
                 self.consensus_graph()
                     .get_height_from_epoch_number(epoch_num)?
             }
-            BlockNumber::Hash {
+            BlockId::Hash {
                 hash,
                 require_canonical,
             } => self
@@ -64,8 +60,7 @@ impl DebugApi {
     }
 
     pub fn trace_call(
-        &self, mut request: TransactionRequest,
-        block_number: Option<BlockNumber>,
+        &self, mut request: TransactionRequest, block_number: Option<BlockId>,
         opts: Option<GethDebugTracingCallOptions>,
     ) -> Result<GethTrace, CoreError> {
         if request.from.is_none() {
@@ -265,7 +260,7 @@ impl DebugApiServer for DebugApi {
     }
 
     async fn debug_trace_block_by_number(
-        &self, block: BlockNumber, opts: Option<GethDebugTracingOptions>,
+        &self, block: BlockId, opts: Option<GethDebugTracingOptions>,
     ) -> RpcResult<Vec<TraceResult>> {
         let num = self
             .get_block_epoch_num(block)
@@ -275,7 +270,7 @@ impl DebugApiServer for DebugApi {
     }
 
     async fn debug_trace_call(
-        &self, request: TransactionRequest, block_number: Option<BlockNumber>,
+        &self, request: TransactionRequest, block_number: Option<BlockId>,
         opts: Option<GethDebugTracingCallOptions>,
     ) -> RpcResult<GethTrace> {
         self.trace_call(request, block_number, opts)

crates/rpc/rpc-eth-impl/src/eth.rs

@@ -11,10 +11,10 @@ use cfx_rpc_cfx_types::{
 use cfx_rpc_eth_api::EthApiServer;
 use cfx_rpc_eth_types::{
     AccessListResult, AccountOverride, AccountPendingTransactions, Block,
-    BlockNumber as BlockId, BlockOverrides, Bundle, Error, EthCallResponse,
-    EthRpcLogFilter, EthRpcLogFilter as Filter, EvmOverrides, FeeHistory,
-    Header, Log, Receipt, RpcStateOverride, SimulatePayload, SimulatedBlock,
-    StateContext, SyncInfo, SyncStatus, Transaction, TransactionRequest,
+    BlockId, BlockOverrides, Bundle, Error, EthCallResponse, EthRpcLogFilter,
+    EthRpcLogFilter as Filter, EvmOverrides, FeeHistory, Header, Log, Receipt,
+    RpcStateOverride, SimulatePayload, SimulatedBlock, StateContext, SyncInfo,
+    SyncStatus, Transaction, TransactionRequest,
 };
 use cfx_rpc_primitives::{Bytes, Index, U64 as HexU64};
 use cfx_rpc_utils::{

crates/rpc/rpc-eth-impl/src/filter.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 use cfx_rpc_eth_api::EthFilterApiServer;
 use cfx_rpc_eth_types::{
-    BlockNumber, EthRpcLogFilter as Filter, FilterChanges, Log,
+    BlockId, EthRpcLogFilter as Filter, FilterChanges, Log,
 };
 use cfx_rpc_utils::error::jsonrpsee_error_helpers::{
     invalid_request_msg, jsonrpc_error_to_error_object_owned,
@@ -52,7 +52,7 @@ impl EthFilterApiServer for EthFilterApi {
         let mut polls = self.inner.polls().lock();
         let epoch_number = self.inner.best_executed_epoch_number();
 
-        if filter.to_block == Some(BlockNumber::Pending) {
+        if filter.to_block == Some(BlockId::Pending) {
             bail!(invalid_request_msg(
                 "Filter logs from pending blocks is not supported"
             ))

crates/rpc/rpc-eth-impl/src/parity.rs

@@ -1,7 +1,7 @@
 use crate::EthApi;
 use async_trait::async_trait;
 use cfx_rpc_eth_api::ParityApiServer;
-use cfx_rpc_eth_types::{BlockNumber as BlockId, Receipt};
+use cfx_rpc_eth_types::{BlockId, Receipt};
 use jsonrpsee::core::RpcResult;
 
 pub struct ParityApi {

crates/rpc/rpc-eth-impl/src/trace.rs

@@ -10,7 +10,7 @@ use cfx_rpc_common_impl::trace::{
 use cfx_rpc_eth_api::TraceApiServer;
 use cfx_rpc_eth_types::{
     trace::{LocalizedSetAuthTrace, LocalizedTrace as EthLocalizedTrace},
-    BlockNumber, Index, LocalizedTrace, TraceFilter,
+    BlockId, Index, LocalizedTrace, TraceFilter,
 };
 use cfx_types::H256;
 use cfx_util_macros::unwrap_option_or_return_result_none as unwrap_or_return;
@@ -30,10 +30,10 @@ impl TraceApi {
     }
 
     pub fn get_block(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> CoreResult<Option<PhantomBlock>> {
         let phantom_block = match block_number {
-            BlockNumber::Hash { hash, .. } => self
+            BlockId::Hash { hash, .. } => self
                 .trace_handler
                 .consensus_graph()
                 .get_phantom_block_by_hash(
@@ -56,7 +56,7 @@ impl TraceApi {
     }
 
     pub fn block_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> CoreResult<Option<Vec<LocalizedTrace>>> {
         let phantom_block = self.get_block(block_number)?;
 
@@ -86,7 +86,7 @@ impl TraceApi {
     }
 
     pub fn block_set_auth_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> CoreResult<Option<Vec<LocalizedSetAuthTrace>>> {
         let phantom_block = self.get_block(block_number)?;
 
@@ -202,7 +202,7 @@ impl TraceApi {
 #[async_trait::async_trait]
 impl TraceApiServer for TraceApi {
     async fn block_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> RpcResult<Option<Vec<LocalizedTrace>>> {
         self.block_traces(block_number).map_err(|err| err.into())
     }
@@ -220,7 +220,7 @@ impl TraceApiServer for TraceApi {
     }
 
     async fn block_set_auth_traces(
-        &self, block_number: BlockNumber,
+        &self, block_number: BlockId,
     ) -> RpcResult<Option<Vec<LocalizedSetAuthTrace>>> {
         self.block_set_auth_traces(block_number)
             .map_err(|err| err.into())