get height blocks

Author: nkysg

chain/api/src/chain.rs

@@ -43,6 +43,7 @@ pub trait ChainReader {
         reverse: bool,
         count: u64,
     ) -> Result<Vec<Block>>;
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>>;
     fn get_block(&self, hash: HashValue) -> Result<Option<Block>>;
     /// Get block hash by block number, if not exist, return None
     fn get_hash_by_number(&self, number: BlockNumber) -> Result<Option<HashValue>>;

chain/api/src/message.rs

@@ -60,6 +60,7 @@ pub enum ChainRequest {
         access_path: Option<AccessPath>,
     },
     GetBlockInfos(Vec<HashValue>),
+    GetHeightBlocks(BlockNumber),
 }
 
 impl ServiceRequest for ChainRequest {

chain/api/src/service.rs

@@ -72,6 +72,7 @@ pub trait ReadableChainService {
     ) -> Result<Option<TransactionInfoWithProof>>;
 
     fn get_block_infos(&self, ids: Vec<HashValue>) -> Result<Vec<Option<BlockInfo>>>;
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>>;
 }
 
 /// Writeable block chain service trait
@@ -106,6 +107,7 @@ pub trait ChainAsyncService:
     async fn main_head_header(&self) -> Result<BlockHeader>;
     async fn main_head_block(&self) -> Result<Block>;
     async fn main_block_by_number(&self, number: BlockNumber) -> Result<Option<Block>>;
+    async fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>>;
     async fn main_blocks_by_number(
         &self,
         number: Option<BlockNumber>,
@@ -310,6 +312,16 @@ where
         }
     }
 
+    async fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>> {
+        if let ChainResponse::BlockVec(blocks) =
+            self.send(ChainRequest::GetHeightBlocks(number)).await??
+        {
+            Ok(blocks)
+        } else {
+            bail!("Get height blocks by number response error.")
+        }
+    }
+
     async fn main_blocks_by_number(
         &self,
         number: Option<BlockNumber>,

chain/service/src/chain_service.rs

@@ -232,6 +232,9 @@ impl ServiceHandler<Self, ChainRequest> for ChainReaderService {
             ChainRequest::GetBlockInfos(ids) => Ok(ChainResponse::BlockInfoVec(Box::new(
                 self.inner.get_block_infos(ids)?,
             ))),
+            ChainRequest::GetHeightBlocks(number) => Ok(ChainResponse::BlockVec(
+                self.inner.get_height_blocks(number)?,
+            )),
         }
     }
 }
@@ -416,6 +419,10 @@ impl ReadableChainService for ChainReaderServiceInner {
     fn get_block_infos(&self, ids: Vec<HashValue>) -> Result<Vec<Option<BlockInfo>>> {
         self.storage.get_block_infos(ids)
     }
+
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>> {
+        self.storage.get_height_blocks(number)
+    }
 }
 
 #[cfg(test)]

chain/src/chain.rs

@@ -605,6 +605,10 @@ impl ChainReader for BlockChain {
         Ok(blocks)
     }
 
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>> {
+        self.storage.get_height_blocks(number)
+    }
+
     fn get_block(&self, hash: HashValue) -> Result<Option<Block>> {
         self.storage
             .get_block_by_hash(hash)

cmd/starcoin/src/chain/get_height_blocks_cmd.rs

@@ -0,0 +1,37 @@
+// Copyright (c) The Starcoin Core Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::cli_state::CliState;
+use crate::StarcoinOpt;
+use anyhow::Result;
+use clap::Parser;
+use scmd::{CommandAction, ExecContext};
+use starcoin_rpc_api::types::BlockView;
+use starcoin_types::block::BlockNumber;
+
+/// Get block by hash or number.
+#[derive(Debug, Parser)]
+#[clap(name = "get-height-blocks", alias = "get_height_blocks")]
+pub struct GetHeightBlocksOpt {
+    #[clap(name = "number")]
+    number: BlockNumber,
+}
+
+pub struct GetHeightBlocksCommand;
+
+impl CommandAction for GetHeightBlocksCommand {
+    type State = CliState;
+    type GlobalOpt = StarcoinOpt;
+    type Opt = GetHeightBlocksOpt;
+    type ReturnItem = Vec<BlockView>;
+
+    fn run(
+        &self,
+        ctx: &ExecContext<Self::State, Self::GlobalOpt, Self::Opt>,
+    ) -> Result<Self::ReturnItem> {
+        let client = ctx.state().client();
+        let opt = ctx.opt();
+        let blocks = client.chain_get_height_blocks(opt.number)?;
+        Ok(blocks)
+    }
+}

cmd/starcoin/src/chain/mod.rs

@@ -5,6 +5,7 @@ mod epoch_info;
 mod get_block_cmd;
 mod get_block_info_cmd;
 mod get_events_cmd;
+mod get_height_blocks_cmd;
 mod get_txn_cmd;
 mod get_txn_info_cmd;
 mod get_txn_info_list_cmd;
@@ -17,6 +18,7 @@ pub use epoch_info::*;
 pub use get_block_cmd::*;
 pub use get_block_info_cmd::*;
 pub use get_events_cmd::*;
+pub use get_height_blocks_cmd::*;
 pub use get_txn_cmd::*;
 pub use get_txn_info_cmd::*;
 pub use get_txn_info_list_cmd::*;

cmd/starcoin/src/lib.rs

@@ -102,7 +102,8 @@ pub fn add_command(
                 .subcommand(chain::EpochInfoCommand)
                 .subcommand(chain::GetTransactionInfoListCommand)
                 .subcommand(chain::get_txn_proof_cmd::GetTransactionProofCommand)
-                .subcommand(chain::GetBlockInfoCommand),
+                .subcommand(chain::GetBlockInfoCommand)
+                .subcommand(chain::GetHeightBlocksCommand),
         )
         .command(
             CustomCommand::with_name("txpool")

rpc/api/src/chain/mod.rs

@@ -47,6 +47,11 @@ pub trait ChainApi {
         count: u64,
         option: Option<GetBlocksOption>,
     ) -> FutureResult<Vec<BlockView>>;
+
+    /// Get height `number` blocks.
+    #[rpc(name = "chain.get_height_blocks")]
+    fn get_height_blocks(&self, number: BlockNumber) -> FutureResult<Vec<BlockView>>;
+
     #[rpc(name = "chain.get_block_info_by_number")]
     fn get_block_info_by_number(&self, number: BlockNumber) -> FutureResult<Option<BlockInfoView>>;
     /// Get chain transactions

rpc/client/src/lib.rs

@@ -799,6 +799,11 @@ impl RpcClient {
         .map_err(map_err)
     }
 
+    pub fn chain_get_height_blocks(&self, number: BlockNumber) -> anyhow::Result<Vec<BlockView>> {
+        self.call_rpc_blocking(|inner| inner.chain_client.get_height_blocks(number))
+            .map_err(map_err)
+    }
+
     pub fn chain_get_transaction(
         &self,
         txn_id: HashValue,

rpc/server/src/module/chain_rpc.rs

@@ -171,6 +171,19 @@ where
         Box::pin(fut.boxed())
     }
 
+    fn get_height_blocks(&self, number: BlockNumber) -> FutureResult<Vec<BlockView>> {
+        let service = self.service.clone();
+        let fut = async move {
+            let blocks = service.get_height_blocks(number).await?;
+            blocks
+                .into_iter()
+                .map(|blk| BlockView::try_from_block(blk, true, false))
+                .collect::<Result<Vec<_>, _>>()
+        }
+        .map_err(map_err);
+        Box::pin(fut.boxed())
+    }
+
     fn get_block_info_by_number(&self, number: u64) -> FutureResult<Option<BlockInfoView>> {
         let service = self.service.clone();
 

storage/src/block/mod.rs

@@ -12,7 +12,7 @@ use network_p2p_types::peer_id::PeerId;
 use serde::{Deserialize, Serialize};
 use starcoin_crypto::HashValue;
 use starcoin_logger::prelude::*;
-use starcoin_types::block::{Block, BlockBody, BlockHeader};
+use starcoin_types::block::{Block, BlockBody, BlockHeader, BlockNumber};
 
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 pub struct OldFailedBlock {
@@ -314,4 +314,20 @@ impl BlockStorage {
         self.failed_block_storage
             .put_raw(block_id, old_block.encode_value()?)
     }
+
+    pub fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>> {
+        let mut blocks = vec![];
+        let mut iter = self.header_store.iter()?;
+        iter.seek_to_first();
+        for item in iter {
+            let (id, block_header) = item?;
+            if block_header.number() == number {
+                let block = self.get(id)?;
+                if let Some(block) = block {
+                    blocks.push(block);
+                }
+            }
+        }
+        Ok(blocks)
+    }
 }

storage/src/lib.rs

@@ -30,6 +30,7 @@ use starcoin_types::{
 };
 //use starcoin_vm_types::state_store::table::{TableHandle, TableInfo};
 use starcoin_types::account_address::AccountAddress;
+use starcoin_types::block::BlockNumber;
 use starcoin_vm_types::state_store::table::{TableHandle, TableInfo};
 use std::collections::BTreeMap;
 use std::fmt::{Debug, Display, Formatter};
@@ -224,6 +225,7 @@ pub trait BlockStore {
 
     fn get_snapshot_range(&self) -> Result<Option<SnapshotRange>>;
     fn save_snapshot_range(&self, snapshot_height: SnapshotRange) -> Result<()>;
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>>;
 }
 
 pub trait BlockTransactionInfoStore {
@@ -468,6 +470,10 @@ impl BlockStore for Storage {
     fn save_snapshot_range(&self, snapshot_range: SnapshotRange) -> Result<()> {
         self.chain_info_storage.save_snapshot_range(snapshot_range)
     }
+
+    fn get_height_blocks(&self, number: BlockNumber) -> Result<Vec<Block>> {
+        self.block_storage.get_height_blocks(number)
+    }
 }
 
 impl BlockInfoStore for Storage {

vm/starcoin-transactional-test-harness/src/fork_chain.rs

@@ -307,6 +307,13 @@ impl ChainApi for MockChainApi {
         Box::pin(fut.boxed().map_err(map_err))
     }
 
+    fn get_height_blocks(&self, _number: BlockNumber) -> FutureResult<Vec<BlockView>> {
+        let fut = async move {
+            bail!("not implemented.");
+        };
+        Box::pin(fut.boxed().map_err(map_err))
+    }
+
     fn get_block_info_by_number(&self, number: BlockNumber) -> FutureResult<Option<BlockInfoView>> {
         let chain = self.chain.lock().unwrap();
         let client = chain.remote_chain_client();