Make RPC use PlatformAddress

Author: Seulgi Kim

rpc/src/v1/impls/chain.rs

@@ -20,12 +20,12 @@ use ccore::{
     AssetClient, BlockId, EngineInfo, ExecuteClient, MinerService, MiningBlockChainClient, RegularKey, Shard,
     SignedParcel, UnverifiedParcel,
 };
-use ckey::{Address, NetworkId, Public};
+use ckey::{NetworkId, PlatformAddress, Public};
 use cstate::{AssetScheme, AssetSchemeAddress, OwnedAsset};
 use ctypes::invoice::{ParcelInvoice, TransactionInvoice};
 use ctypes::parcel::Action;
 use ctypes::{BlockNumber, ShardId, WorldId};
-use primitives::{H160, H256, U256};
+use primitives::{H256, U256};
 use rlp::{DecoderError, UntrustedRlp};
 
 use jsonrpc_core::Result;
@@ -135,17 +135,17 @@ where
         self.client.is_asset_spent(transaction_hash, index, shard_id, block_id).map_err(errors::parcel_state)
     }
 
-    fn get_nonce(&self, address: H160, block_number: Option<u64>) -> Result<Option<U256>> {
+    fn get_nonce(&self, address: PlatformAddress, block_number: Option<u64>) -> Result<Option<U256>> {
         let block_id = block_number.map(BlockId::Number).unwrap_or(BlockId::Latest);
         Ok(self.client.nonce(&address.into(), block_id))
     }
 
-    fn get_balance(&self, address: H160, block_number: Option<u64>) -> Result<Option<U256>> {
+    fn get_balance(&self, address: PlatformAddress, block_number: Option<u64>) -> Result<Option<U256>> {
         let block_id = block_number.map(BlockId::Number).unwrap_or(BlockId::Latest);
         Ok(self.client.balance(&address.into(), block_id.into()))
     }
 
-    fn get_regular_key(&self, address: H160, block_number: Option<u64>) -> Result<Option<Public>> {
+    fn get_regular_key(&self, address: PlatformAddress, block_number: Option<u64>) -> Result<Option<Public>> {
         let block_id = block_number.map(BlockId::Number).unwrap_or(BlockId::Latest);
         Ok(self.client.regular_key(&address.into(), block_id.into()))
     }
@@ -194,23 +194,29 @@ where
         Ok(self.client.ready_parcels().into_iter().map(|signed| signed.into()).collect())
     }
 
-    fn get_coinbase(&self) -> Result<Option<Address>> {
+    fn get_coinbase(&self) -> Result<Option<PlatformAddress>> {
         if self.miner.author().is_zero() {
             Ok(None)
         } else {
-            Ok(Some(self.miner.author()))
+            const VERSION: u8 = 0;
+            let network_id = self.client.common_params().network_id;
+            Ok(Some(PlatformAddress::create(VERSION, network_id, self.miner.author())))
         }
     }
 
     fn get_network_id(&self) -> Result<NetworkId> {
         Ok(self.client.common_params().network_id)
     }
 
-    fn execute_change_shard_state(&self, transactions: Vec<Transaction>, sender: Address) -> Result<Vec<ChangeShard>> {
+    fn execute_change_shard_state(
+        &self,
+        transactions: Vec<Transaction>,
+        sender: PlatformAddress,
+    ) -> Result<Vec<ChangeShard>> {
         let transaction_types: Vec<_> = transactions.into_iter().map(From::from).collect();
         Ok(self
             .client
-            .execute_transactions(&transaction_types, &sender)
+            .execute_transactions(&transaction_types, &sender.into())
             .map_err(errors::core)?
             .into_iter()
             .map(From::from)

rpc/src/v1/traits/chain.rs

@@ -14,11 +14,11 @@
 // 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 ckey::{Address, NetworkId, Public};
+use ckey::{NetworkId, PlatformAddress, Public};
 use cstate::{AssetScheme, OwnedAsset};
 use ctypes::invoice::{ParcelInvoice, TransactionInvoice};
 use ctypes::{BlockNumber, ShardId, WorldId};
-use primitives::{H160, H256, U256};
+use primitives::{H256, U256};
 
 use jsonrpc_core::Result;
 
@@ -64,15 +64,15 @@ build_rpc_trait! {
 
         /// Gets nonce with given account.
         # [rpc(name = "chain_getNonce")]
-        fn get_nonce(&self, H160, Option<u64>) -> Result<Option<U256>>;
+        fn get_nonce(&self, PlatformAddress, Option<u64>) -> Result<Option<U256>>;
 
         /// Gets balance with given account.
         # [rpc(name = "chain_getBalance")]
-        fn get_balance(&self, H160, Option<u64>) -> Result<Option<U256>>;
+        fn get_balance(&self, PlatformAddress, Option<u64>) -> Result<Option<U256>>;
 
         /// Gets regular key with given account
         # [rpc(name = "chain_getRegularKey")]
-        fn get_regular_key(&self, H160, Option<u64>) -> Result<Option<Public>>;
+        fn get_regular_key(&self, PlatformAddress, Option<u64>) -> Result<Option<Public>>;
 
         /// Gets the number of shards
         # [rpc(name = "chain_getNumberOfShards")]
@@ -108,14 +108,14 @@ build_rpc_trait! {
 
         /// Gets coinbase's account id
         # [rpc(name = "chain_getCoinbase")]
-        fn get_coinbase(&self) -> Result<Option<Address>>;
+        fn get_coinbase(&self) -> Result<Option<PlatformAddress>>;
 
         /// Return the network id that is used in this chain.
         # [rpc(name = "chain_getNetworkId")]
         fn get_network_id(&self) -> Result<NetworkId>;
 
         /// Execute Transactions
         # [rpc(name = "chain_executeTransactions")]
-        fn execute_change_shard_state(&self, Vec<Transaction>, Address) -> Result<Vec<ChangeShard>>;
+        fn execute_change_shard_state(&self, Vec<Transaction>, PlatformAddress) -> Result<Vec<ChangeShard>>;
     }
 }

spec/JSON-RPC.md

@@ -276,7 +276,7 @@ Response Example
 {
   "jsonrpc":"2.0",
   "result":{
-    "hash":"0x56642f04d519ae3262c7ba6facf1c5b11450ebaeb7955337cfbc45420d573077",
+    "hash":"cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d70x56642f04d519ae3262c7ba6facf1c5b11450ebaeb7955337cfbc45420d573077",
     "number":1
   },
   "id":null
@@ -663,7 +663,7 @@ Response Example
 Gets a nonce of an account of the given address, at state of the given blockNumber.
 
 Params:
- 1. address: `H160`
+ 1. address: `PlatformAddress`
  2. block number: `number` | `null`
 
 Return Type: `U256`
@@ -674,7 +674,7 @@ Request Example
 ```
   curl \
     -H 'Content-Type: application/json' \
-    -d '{"jsonrpc": "2.0", "method": "chain_getNonce", "params": ["0xa6594b7196808d161b6fb137e781abbc251385d9", null], "id": null}' \
+    -d '{"jsonrpc": "2.0", "method": "chain_getNonce", "params": ["cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d7", null], "id": null}' \
     localhost:8080
 ```
 
@@ -691,7 +691,7 @@ Response Example
 Gets a balance of an account of the given address, at the state of the given blockNumber.
 
 Params:
- 1. address: `H160`
+ 1. address: `PlatformAddress`
  2. block number: `number` | `null`
 
 Return Type: `U256`
@@ -702,7 +702,7 @@ Request Example
 ```
   curl \
     -H 'Content-Type: application/json' \
-    -d '{"jsonrpc": "2.0", "method": "chain_getBalance", "params": ["0xa6594b7196808d161b6fb137e781abbc251385d9", null], "id": null}' \
+    -d '{"jsonrpc": "2.0", "method": "chain_getBalance", "params": ["cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d7", null], "id": null}' \
     localhost:8080
 ```
 
@@ -719,7 +719,7 @@ Response Example
 Gets the regular key of an account of the given address, at the state of the given blockNumber.
 
 Params:
- 1. address: `H160`
+ 1. address: `PlatformAddress`
  2. block number: `number` | `null`
 
 Return Type: `H512` - 512-bit public key
@@ -730,7 +730,7 @@ Request Example
 ```
   curl \
     -H 'Content-Type: application/json' \
-    -d '{"jsonrpc": "2.0", "method": "chain_getRegularKey", "params": ["0xa6594b7196808d161b6fb137e781abbc251385d9", null], "id": null}' \
+    -d '{"jsonrpc": "2.0", "method": "chain_getRegularKey", "params": ["cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d7", null], "id": null}' \
     localhost:8080
 ```
 
@@ -850,7 +850,7 @@ Gets coinbase's account id.
 
 Params: No parameters
 
-Return Type: `H160` | `null`
+Return Type: `PlatformAddress` | `null`
 
 Request Example
 ```
@@ -864,7 +864,7 @@ Response Example
 ```
 {
   "jsonrpc":"2.0",
-  "result":"0xa6594b7196808d161b6fb137e781abbc251385d9",
+  "result":"cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d7",
   "id":null
 }
 ```
@@ -874,7 +874,7 @@ Executes the transactions and returns the current shard root and the changed sha
 
 Params:
  1. transactions: `Transaction[]`
- 2. sender: `H160`
+ 2. sender: `PlatformAddress`
 
 Return Type: `ChangeShard[]`
 
@@ -884,7 +884,7 @@ Request Example
 ```
   curl \
     -H 'Content-Type: application/json' \
-    -d '{"jsonrpc": "2.0", "method": "chain_executeTransactions", "params": [[{"type":"assetMint","data":{"networkId":"17","shardId":0,"worldId":0,"metadata":"{\"name\":\"Gold\",\"description\":\"An asset example\",\"icon_url\":\"https://gold.image/\"}","output":{"lockScriptHash":"0xf42a65ea518ba236c08b261c34af0521fa3cd1aa505e1c18980919cb8945f8f3","parameters":[],"amount":10000},"registrar":null,"nonce":0}}, {"type":"assetMint","data":{"networkId":"17","shardId":1,"worldId":0,"metadata":"{\"name\":\"Gold\",\"description\":\"An asset example\",\"icon_url\":\"https://gold.image/\"}","output":{"lockScriptHash":"0xf42a65ea518ba236c08b261c34af0521fa3cd1aa505e1c18980919cb8945f8f3","parameters":[],"amount":10000},"registrar":null,"nonce":0}}], "0xa6594b7196808d161b6fb137e781abbc251385d9"], "id": null}' \
+    -d '{"jsonrpc": "2.0", "method": "chain_executeTransactions", "params": [[{"type":"assetMint","data":{"networkId":"17","shardId":0,"worldId":0,"metadata":"{\"name\":\"Gold\",\"description\":\"An asset example\",\"icon_url\":\"https://gold.image/\"}","output":{"lockScriptHash":"0xf42a65ea518ba236c08b261c34af0521fa3cd1aa505e1c18980919cb8945f8f3","parameters":[],"amount":10000},"registrar":null,"nonce":0}}, {"type":"assetMint","data":{"networkId":"17","shardId":1,"worldId":0,"metadata":"{\"name\":\"Gold\",\"description\":\"An asset example\",\"icon_url\":\"https://gold.image/\"}","output":{"lockScriptHash":"0xf42a65ea518ba236c08b261c34af0521fa3cd1aa505e1c18980919cb8945f8f3","parameters":[],"amount":10000},"registrar":null,"nonce":0}}], "cccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9myd6c4d7"], "id": null}' \
     localhost:8080
 ```