Merge pull request #3385 from Conflux-Chain/revert-3368-feat/getBlockByNumberPending1

Revert "espace rpc method eth_blockByNumber support pending tag"

Author: peilun-conflux

changelogs/JSONRPC.md

@@ -7,7 +7,6 @@
 ## v3.0.3
 
 1. Core Space `log` object add `blockTimestamp` field for method `cfx_getLogs` and `cfx_getFilterLogs`.
-2. eSpace `eth_getBlockByNumber` now support `pending` tag to get the pending block, which is actually the Conflux latest mined block.
 
 ## v3.0.2
 

crates/rpc/rpc-eth-types/src/block_number.rs

@@ -225,7 +225,7 @@ impl TryFrom<BlockId> for EpochNumber {
             BlockId::Num(num) => Ok(EpochNumber::Number(num)),
             BlockId::Latest => Ok(EpochNumber::LatestState),
             BlockId::Earliest => Ok(EpochNumber::Earliest),
-            BlockId::Pending => Ok(EpochNumber::LatestMined),
+            BlockId::Pending => Ok(EpochNumber::LatestState), /* TODO: LatestMined maybe is better or add a new Pending variant for EpochNumber */
             BlockId::Safe => Ok(EpochNumber::LatestConfirmed),
             BlockId::Finalized => Ok(EpochNumber::LatestFinalized),
             BlockId::Hash { .. } => Err(Error::InvalidParams(
@@ -249,7 +249,7 @@ impl From<BlockId> for BlockHashOrEpochNumber {
                 BlockHashOrEpochNumber::EpochNumber(EpochNumber::Earliest)
             }
             BlockId::Pending => {
-                BlockHashOrEpochNumber::EpochNumber(EpochNumber::LatestMined)
+                BlockHashOrEpochNumber::EpochNumber(EpochNumber::LatestState)
             }
             BlockId::Safe => BlockHashOrEpochNumber::EpochNumber(
                 EpochNumber::LatestConfirmed,