Add support for the Filecoin.EthGetBlockTransactionCountByNumber V2 (#6465)

Author: sudo-shashank

CHANGELOG.md

@@ -31,19 +31,21 @@
 
 ### Added
 
-- [#6466](https://github.com/ChainSafe/forest/pull/6466) Enabled `Filecoin.EthGetBlockTransactionCountByHash` for API v2.
+- [#6465](https://github.com/ChainSafe/forest/pull/6465): Implemented `Filecoin.EthGetBlockTransactionCountByNumber` for API v2.
 
-- [#6469](https://github.com/ChainSafe/forest/pull/6469) Implemented `Filecoin.EthGetTransactionByBlockNumberAndIndex` for API v2.
+- [#6466](https://github.com/ChainSafe/forest/pull/6466): Enabled `Filecoin.EthGetBlockTransactionCountByHash` for API v2.
+
+- [#6469](https://github.com/ChainSafe/forest/pull/6469): Implemented `Filecoin.EthGetTransactionByBlockNumberAndIndex` for API v2.
 
 ### Changed
 
-- [#6471](https://github.com/ChainSafe/forest/pull/6471) Moved `forest-tool state` subcommand to `forest-dev`.
+- [#6471](https://github.com/ChainSafe/forest/pull/6471): Moved `forest-tool state` subcommand to `forest-dev`.
 
 ### Removed
 
 ### 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.
+- [#6467](https://github.com/ChainSafe/forest/pull/6467): `Filecoin.EthGetBlockByNumber` now only supports retrieving a block by its block number or a special tag.
 
 ## Forest v0.31.1 "Quadrantids"
 

scripts/tests/api_compare/filter-list-offline

@@ -26,6 +26,8 @@
 # Offline server won't provide correct results for finality-related methods
 !Filecoin.EthGetBlockByNumber
 !eth_getBlockByNumber
+!Filecoin.EthGetBlockTransactionCountByNumber
+!eth_getBlockTransactionCountByNumber
 !Filecoin.EthGetTransactionByBlockNumberAndIndex
 !eth_getTransactionByBlockNumberAndIndex
 !Filecoin.ChainSetHead

src/rpc/methods/eth.rs

@@ -1787,6 +1787,8 @@ impl RpcMethod<1> for EthGetBlockTransactionCountByNumber {
     const PARAM_NAMES: [&'static str; 1] = ["blockNumber"];
     const API_PATHS: BitFlags<ApiPaths> = ApiPaths::all();
     const PERMISSION: Permission = Permission::Read;
+    const DESCRIPTION: Option<&'static str> =
+        Some("Returns the number of transactions in a block identified by its block number.");
 
     type Params = (EthInt64,);
     type Ok = EthUint64;
@@ -1808,6 +1810,35 @@ impl RpcMethod<1> for EthGetBlockTransactionCountByNumber {
     }
 }
 
+pub enum EthGetBlockTransactionCountByNumberV2 {}
+impl RpcMethod<1> for EthGetBlockTransactionCountByNumberV2 {
+    const NAME: &'static str = "Filecoin.EthGetBlockTransactionCountByNumber";
+    const NAME_ALIAS: Option<&'static str> = Some("eth_getBlockTransactionCountByNumber");
+    const PARAM_NAMES: [&'static str; 1] = ["blockNumber"];
+    const API_PATHS: BitFlags<ApiPaths> = make_bitflags!(ApiPaths::V2);
+    const PERMISSION: Permission = Permission::Read;
+    const DESCRIPTION: Option<&'static str> = Some(
+        "Returns the number of transactions in a block identified by its block number or a special tag.",
+    );
+
+    type Params = (BlockNumberOrPredefined,);
+    type Ok = EthUint64;
+
+    async fn handle(
+        ctx: Ctx<impl Blockstore + Send + Sync + 'static>,
+        (block_number,): Self::Params,
+    ) -> Result<Self::Ok, ServerError> {
+        let ts = tipset_by_block_number_or_hash_v2(
+            &ctx,
+            block_number.into(),
+            ResolveNullTipset::TakeOlder,
+        )
+        .await?;
+        let count = count_messages_in_tipset(ctx.store(), &ts)?;
+        Ok(EthUint64(count as _))
+    }
+}
+
 pub enum EthGetMessageCidByTransactionHash {}
 impl RpcMethod<1> for EthGetMessageCidByTransactionHash {
     const NAME: &'static str = "Filecoin.EthGetMessageCidByTransactionHash";

src/rpc/mod.rs

@@ -119,6 +119,7 @@ macro_rules! for_each_rpc_method {
         $callback!($crate::rpc::eth::EthGetBlockReceiptsLimited);
         $callback!($crate::rpc::eth::EthGetBlockTransactionCountByHash);
         $callback!($crate::rpc::eth::EthGetBlockTransactionCountByNumber);
+        $callback!($crate::rpc::eth::EthGetBlockTransactionCountByNumberV2);
         $callback!($crate::rpc::eth::EthGetCode);
         $callback!($crate::rpc::eth::EthGetLogs);
         $callback!($crate::rpc::eth::EthGetFilterLogs);

src/tool/subcommands/api_cmd/api_compare_tests.rs

@@ -1849,6 +1849,24 @@ fn eth_tests_with_tipset<DB: Blockstore>(store: &Arc<DB>, shared_tipset: &Tipset
             EthGetBlockTransactionCountByNumber::request((EthInt64(shared_tipset.epoch()),))
                 .unwrap(),
         ),
+        RpcTest::identity(
+            EthGetBlockTransactionCountByNumberV2::request((BlockNumberOrPredefined::BlockNumber(
+                EthInt64(shared_tipset.epoch()),
+            ),))
+            .unwrap(),
+        ),
+        RpcTest::identity(
+            EthGetBlockTransactionCountByNumberV2::request((
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Safe),
+            ))
+            .unwrap(),
+        ),
+        RpcTest::identity(
+            EthGetBlockTransactionCountByNumberV2::request((
+                BlockNumberOrPredefined::PredefinedBlock(ExtPredefined::Finalized),
+            ))
+            .unwrap(),
+        ),
         RpcTest::identity(
             EthGetTransactionCount::request((
                 EthAddress::from_str("0xff000000000000000000000000000000000003ec").unwrap(),

src/tool/subcommands/api_cmd/test_snapshots.txt

@@ -67,6 +67,9 @@ filecoin_ethgetblockreceipts_1740132537907751.rpcsnap.json.zst
 filecoin_ethgetblockreceiptslimited_1740132537908421.rpcsnap.json.zst
 filecoin_ethgetblocktransactioncountbyhash_1740132538001911.rpcsnap.json.zst
 filecoin_ethgetblocktransactioncountbynumber_1737446676697272.rpcsnap.json.zst
+filecoin_ethgetblocktransactioncountbynumber_v2_1769099953133906.rpcsnap.json.zst
+filecoin_ethgetblocktransactioncountbynumber_v2_1769099953134061.rpcsnap.json.zst
+filecoin_ethgetblocktransactioncountbynumber_v2_1769099953141937.rpcsnap.json.zst
 filecoin_ethgetcode_1765803672602510.rpcsnap.json.zst # latest
 filecoin_ethgetcode_1765803672604518.rpcsnap.json.zst # concrete
 filecoin_ethgetcode_1765803672655291.rpcsnap.json.zst # pending