eth_getBlockByNumber return null when parameter is bigger than latest block

Author: Pana

changelogs/JSONRPC.md

@@ -18,6 +18,7 @@ Misc changes:
    4. These trace methods now support `SelfDestruct(Suicide)` trace, to access historical selfdestruct transaction data, a resync of the data is required.
 4. eSpace now support geth style `txpool` namespace methods, including: `txpool_status`, `txpool_inspect`, `txpool_content`, `txpool_contentFrom`
 5. `eth_call`, `eth_estimateGas` add support for `stateoverride` feature.
+6. `eth_getBlockByNumber` will return `null` when block number is bigger than latest block, other than return error message.
 
 ## v2.4.1
 

crates/cfxcore/core/src/consensus/consensus_graph/mod.rs

@@ -27,6 +27,7 @@ use crate::{
     verification::VerificationConfig,
     NodeType, Notifications,
 };
+pub use onchain_blocks_provider::EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE;
 
 use cfx_executor::spec::CommonParams;
 

crates/cfxcore/core/src/consensus/consensus_graph/onchain_blocks_provider.rs

@@ -9,6 +9,9 @@ use cfx_types::H256;
 use primitives::{compute_block_number, EpochNumber};
 use std::cmp::min;
 
+pub const EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE: &str =
+    "Invalid params: expected a numbers with less than largest epoch number.";
+
 impl ConsensusGraph {
     /// Returns the total number of blocks processed in consensus graph.
     ///
@@ -40,7 +43,7 @@ impl ConsensusGraph {
             EpochNumber::Number(num) => {
                 let epoch_num = num;
                 if epoch_num > self.inner.read_recursive().best_epoch_number() {
-                    return Err("Invalid params: expected a numbers with less than largest epoch number.".to_owned());
+                    return Err(EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE.to_owned());
                 }
                 epoch_num
             }

crates/cfxcore/core/src/consensus/mod.rs

@@ -22,7 +22,7 @@ pub use consensus_graph::{
     rpc_api::transaction_provider::{
         MaybeExecutedTxExtraInfo, TransactionInfo,
     },
-    ConsensusGraph,
+    ConsensusGraph, EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE,
 };
 pub use statistics::ConsensusGraphStatistics;
 

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

@@ -32,6 +32,7 @@ use cfx_types::{
 use cfx_util_macros::bail;
 use cfx_vm_types::Error as VmError;
 use cfxcore::{
+    consensus::EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE,
     errors::{Error as CoreError, Result as CoreResult},
     ConsensusGraph, SharedConsensusGraph, SharedSynchronizationService,
     SharedTransactionPool,
@@ -606,13 +607,19 @@ impl EthApi {
                         .map_err(RpcError::invalid_params)?
                 }
                 _ => {
-                    self.consensus_graph()
-                        .get_phantom_block_by_number(
-                            block_num.try_into()?,
-                            None,
-                            false, /* include_traces */
-                        )
-                        .map_err(RpcError::invalid_params)?
+                    match self.consensus_graph().get_phantom_block_by_number(
+                        block_num.try_into()?,
+                        None,
+                        false, /* include_traces */
+                    ) {
+                        Ok(pb) => pb,
+                        Err(e) if e == EPOCH_NUMBER_TOO_LARGE_ERR_MESSAGE => {
+                            None
+                        }
+                        Err(e) => {
+                            return Err(RpcError::invalid_params(e).into());
+                        }
+                    }
                 }
             }
         };