Make Block in RPC use PlatformAddress

Author: Seulgi Kim

rpc/src/v1/impls/chain.rs

@@ -177,11 +177,17 @@ where
     }
 
     fn get_block_by_number(&self, block_number: u64) -> Result<Option<Block>> {
-        Ok(self.client.block(BlockId::Number(block_number)).map(|block| block.decode().into()))
+        Ok(self
+            .client
+            .block(BlockId::Number(block_number))
+            .map(|block| Block::from_core(block.decode(), self.client.common_params().network_id)))
     }
 
     fn get_block_by_hash(&self, block_hash: H256) -> Result<Option<Block>> {
-        Ok(self.client.block(BlockId::Hash(block_hash)).map(|block| block.decode().into()))
+        Ok(self
+            .client
+            .block(BlockId::Hash(block_hash))
+            .map(|block| Block::from_core(block.decode(), self.client.common_params().network_id)))
     }
 
     fn get_pending_parcels(&self) -> Result<Vec<Parcel>> {

rpc/src/v1/types/block.rs

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use ccore::Block as CoreBlock;
-use ckey::Address;
+use ckey::{NetworkId, PlatformAddress};
 use ctypes::BlockNumber;
 use primitives::{H256, U256};
 
@@ -27,7 +27,7 @@ pub struct Block {
     parent_hash: H256,
     timestamp: u64,
     number: u64,
-    author: Address,
+    author: PlatformAddress,
 
     extra_data: Vec<u8>,
 
@@ -42,15 +42,16 @@ pub struct Block {
     parcels: Vec<Parcel>,
 }
 
-impl From<CoreBlock> for Block {
-    fn from(block: CoreBlock) -> Self {
+impl Block {
+    pub fn from_core(block: CoreBlock, network_id: NetworkId) -> Self {
         let block_number = block.header.number();
         let block_hash = block.header.hash();
+        const VERSION: u8 = 0;
         Block {
             parent_hash: block.header.parent_hash().clone(),
             timestamp: block.header.timestamp(),
             number: block.header.number(),
-            author: block.header.author().clone(),
+            author: PlatformAddress::create(VERSION, network_id, block.header.author().clone()),
 
             extra_data: block.header.extra_data().clone(),
 

spec/JSON-RPC.md

@@ -25,7 +25,7 @@ A base32 string that starts with "ccc" or "tcc". See [the specification](https:/
 
 ## Block
 
- - author: `H160`
+ - author: `PlatformAddress`
  - extraData: `any[]`
  - hash: `H256`
  - invoicesRoot: `H256`
@@ -333,7 +333,7 @@ Response Example
 {
   "jsonrpc":"2.0",
   "result":{
-    "author":"0x84137e7a75043bed32e4458a45da7549a8169b4d",
+    "author":"cccqzzpxln6w5zrhmfju3zc53w6w4y6s95mf5lfasfn",
     "extraData":[
 
     ],