Add getBestBlockId RPC method

Author: kakao-jun-e

core/src/lib.rs

@@ -105,4 +105,4 @@ pub use service::ClientService;
 pub use spec::Spec;
 pub use state::{Asset, AssetAddress, AssetScheme, AssetSchemeAddress, ShardStateInfo, TopStateInfo};
 pub use transaction::{Error as TransactionError, Transaction};
-pub use types::{BlockId, BlockNumber, ParcelId};
+pub use types::{BlockId, BlockNumber, BlockNumberAndHash, ParcelId};

core/src/types/mod.rs

@@ -18,8 +18,16 @@ mod block_status;
 mod ids;
 mod verification_queue_info;
 
+use ctypes::H256;
+
 pub use self::block_status::BlockStatus;
 pub use self::ids::{BlockId, ParcelId, TransactionId};
 pub use self::verification_queue_info::VerificationQueueInfo;
 
 pub type BlockNumber = u64;
+
+#[derive(Debug, Serialize)]
+pub struct BlockNumberAndHash {
+    pub number: BlockNumber,
+    pub hash: H256,
+}

rpc/src/v1/impls/chain.rs

@@ -18,7 +18,8 @@ use std::sync::Arc;
 
 use ccore::{
     Asset, AssetAddress, AssetScheme, AssetSchemeAddress, Balance, BlockChainClient, BlockId, BlockInfo, BlockNumber,
-    ChainInfo, Client, Invoice, Miner, MinerService, Nonce, ParcelInvoice, RegularKey, SignedParcel, TopStateInfo,
+    BlockNumberAndHash, ChainInfo, Client, Invoice, Miner, MinerService, Nonce, ParcelInvoice, RegularKey,
+    SignedParcel, TopStateInfo,
 };
 use ctypes::{H160, H256, Public, U256};
 use rlp::UntrustedRlp;
@@ -110,6 +111,13 @@ impl Chain for ChainClient {
         Ok(self.client.chain_info().best_block_number)
     }
 
+    fn get_best_block_id(&self) -> Result<BlockNumberAndHash> {
+        Ok(BlockNumberAndHash {
+            number: self.client.chain_info().best_block_number,
+            hash: self.client.chain_info().best_block_hash,
+        })
+    }
+
     fn get_block_hash(&self, block_number: u64) -> Result<Option<H256>> {
         Ok(self.client.block_hash(BlockId::Number(block_number)))
     }

rpc/src/v1/traits/chain.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use ccore::{Asset, AssetScheme, BlockNumber, Invoice, ParcelInvoice};
+use ccore::{Asset, AssetScheme, BlockNumber, BlockNumberAndHash, Invoice, ParcelInvoice};
 use ctypes::{H160, H256, Public, U256};
 
 use jsonrpc_core::Result;
@@ -63,6 +63,10 @@ build_rpc_trait! {
         # [rpc(name = "chain_getBestBlockNumber")]
         fn get_best_block_number(&self) -> Result<BlockNumber>;
 
+        /// Gets the number and the hash of the best block.
+        # [rpc(name = "chain_getBestBlockId")]
+        fn get_best_block_id(&self) -> Result<BlockNumberAndHash>;
+
         /// Gets the hash of the block with given number.
         # [rpc(name = "chain_getBlockHash")]
         fn get_block_hash(&self, u64) -> Result<Option<H256>>;