Fix Filecoin.EthGetBlockByNumber RPC V1 & V2

CHANGELOG.md

@@ -35,6 +35,8 @@
 
 ### Fixed
 
+- [#6467](https://github.com/ChainSafe/forest/pull/6467) Fixed: `Filecoin.EthGetBlockByNumber` now only supports retrieving a block by its block number or a special tag.
+
 ## Forest v0.31.1 "Quadrantids"
 
 This is a non-mandatory release for all node operators. It includes the support for more V2 API's and a few critical API fixes.

src/rpc/methods/eth.rs

@@ -1627,8 +1627,10 @@ impl RpcMethod<2> for EthGetBlockByNumber {
     const PARAM_NAMES: [&'static str; 2] = ["blockParam", "fullTxInfo"];
     const API_PATHS: BitFlags<ApiPaths> = ApiPaths::all();
     const PERMISSION: Permission = Permission::Read;
+    const DESCRIPTION: Option<&'static str> =
+        Some("Retrieves a block by its number or a special tag.");
 
-    type Params = (ExtBlockNumberOrHash, bool);
+    type Params = (BlockNumberOrPredefined, bool);
     type Ok = Block;
 
     async fn handle(
@@ -1637,7 +1639,7 @@ impl RpcMethod<2> for EthGetBlockByNumber {
     ) -> Result<Self::Ok, ServerError> {
         let ts = tipset_by_ext_block_number_or_hash(
             ctx.chain_store(),
-            block_param,
+            block_param.into(),
             ResolveNullTipset::TakeOlder,
         )?;
         Block::from_filecoin_tipset(ctx, ts, full_tx_info.into())
@@ -1653,16 +1655,22 @@ impl RpcMethod<2> for EthGetBlockByNumberV2 {
     const PARAM_NAMES: [&'static str; 2] = ["blockParam", "fullTxInfo"];
     const API_PATHS: BitFlags<ApiPaths> = make_bitflags!(ApiPaths::V2);
     const PERMISSION: Permission = Permission::Read;
+    const DESCRIPTION: Option<&'static str> =
+        Some("Retrieves a block by its number or a special tag.");
 
-    type Params = (ExtBlockNumberOrHash, bool);
+    type Params = (BlockNumberOrPredefined, bool);
     type Ok = Block;
 
     async fn handle(
         ctx: Ctx<impl Blockstore + Send + Sync + 'static>,
         (block_param, full_tx_info): Self::Params,
     ) -> Result<Self::Ok, ServerError> {
-        let ts = tipset_by_block_number_or_hash_v2(&ctx, block_param, ResolveNullTipset::TakeOlder)
-            .await?;
+        let ts = tipset_by_block_number_or_hash_v2(
+            &ctx,
+            block_param.into(),
+            ResolveNullTipset::TakeOlder,
+        )
+        .await?;
         Block::from_filecoin_tipset(ctx, ts, full_tx_info.into())
             .await
             .map_err(ServerError::from)

src/tool/subcommands/api_cmd/api_compare_tests.rs

@@ -1715,100 +1715,100 @@ fn eth_tests_with_tipset<DB: Blockstore>(store: &Arc<DB>, shared_tipset: &Tipset
         ),
         RpcTest::identity(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_block_number(shared_tipset.epoch()),
+                BlockNumberOrPredefined::BlockNumber(EthInt64(shared_tipset.epoch())),
                 false,
             ))
             .unwrap(),
         ),
         RpcTest::identity(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_block_number(shared_tipset.epoch()),
+                BlockNumberOrPredefined::BlockNumber(EthInt64(shared_tipset.epoch())),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::identity(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Earliest),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Earliest),
                 true,
             ))
             .unwrap(),
         )
         .policy_on_rejected(PolicyOnRejected::PassWithQuasiIdenticalError),
         RpcTest::basic(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Pending),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Pending),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Latest),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Latest),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Safe),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Safe),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumber::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Finalized),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Finalized),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::identity(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_block_number(shared_tipset.epoch()),
+                BlockNumberOrPredefined::BlockNumber(EthInt64(shared_tipset.epoch())),
                 false,
             ))
             .unwrap(),
         ),
         RpcTest::identity(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_block_number(shared_tipset.epoch()),
+                BlockNumberOrPredefined::BlockNumber(EthInt64(shared_tipset.epoch())),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::identity(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Earliest),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Earliest),
                 true,
             ))
             .unwrap(),
         )
         .policy_on_rejected(PolicyOnRejected::PassWithQuasiIdenticalError),
         RpcTest::basic(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Pending),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Pending),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Latest),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Latest),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Safe),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Safe),
                 true,
             ))
             .unwrap(),
         ),
         RpcTest::basic(
             EthGetBlockByNumberV2::request((
-                ExtBlockNumberOrHash::from_predefined(ExtPredefined::Finalized),
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Finalized),
                 true,
             ))
             .unwrap(),