add support for gateway adddresses in rpcs (#390)

Author: coburncoburn

Diff for: gateway-crypto/src/no_std.rs

@@ -199,6 +199,17 @@ pub fn eth_hash_string(eth_hash: &[u8; 32]) -> String {
     format!("0x{}", hex::encode(eth_hash))
 }
 
+pub fn gateway_str_to_address(address_str: &str) -> Option<[u8; 32]> {
+    if address_str.len() == 66 && &address_str[0..2] == "0x" {
+        if let Ok(bytes) = hex::decode(&address_str[2..66]) {
+            if let Ok(hex_address) = bytes.try_into() {
+                return Some(hex_address);
+            }
+        }
+    }
+    return None;
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

Diff for: node/src/api.rs

@@ -362,7 +362,8 @@ where
             .get_accounts(&at)
             .map_err(runtime_err)?
             .map_err(chain_err)?;
-        Ok(accounts) // XXX try_into?
+
+        Ok(accounts)
     }
 
     fn chain_assets_meta(&self, at: Option<<B as BlockT>::Hash>) -> RpcResult<ApiAssetMeta> {

Diff for: pallets/cash/src/chains.rs

@@ -131,7 +131,7 @@ impl FromStr for ChainAccount {
 impl From<ChainAccount> for String {
     fn from(asset: ChainAccount) -> String {
         match asset {
-            ChainAccount::Gate(_) => String::from("GATE"), // XXX
+            ChainAccount::Gate(address) => format!("GATE:0x{}", hex::encode(address)),
             ChainAccount::Eth(address) => format!("ETH:0x{}", hex::encode(address)),
             ChainAccount::Dot(_) => String::from("DOT"), // XXX
         }
@@ -338,6 +338,7 @@ impl FromStr for ChainId {
         match s.to_ascii_uppercase().as_str() {
             "ETH" => Ok(ChainId::Eth),
             "DOT" => Ok(ChainId::Dot),
+            "GATE" => Ok(ChainId::Gate),
             _ => Err(Reason::BadChainId),
         }
     }
@@ -809,7 +810,10 @@ impl Chain for Gateway {
     }
 
     fn str_to_address(_addr: &str) -> Result<Self::Address, Reason> {
-        panic!("XXX not implemented");
+        match gateway_crypto::gateway_str_to_address(_addr) {
+            Some(s) => Ok(s),
+            None => Err(Reason::BadAddress),
+        }
     }
 
     fn address_string(_address: &Self::Address) -> String {

Diff for: pallets/cash/src/core.rs

@@ -410,15 +410,19 @@ mod tests {
     fn test_get_accounts() -> Result<(), Reason> {
         let jared = ChainAccount::from_str("Eth:0x18c8F1222083997405F2E482338A4650ac02e1d6")?;
         let geoff = ChainAccount::from_str("Eth:0x8169522c2c57883e8ef80c498aab7820da539806")?;
+        let alice_bytes: [u8; 32] = [6; 32];
+        let alice = ChainAccount::Gate(alice_bytes);
+
         new_test_ext().execute_with(|| {
             AssetsWithNonZeroBalance::insert(&jared, &Uni, ());
             AssetsWithNonZeroBalance::insert(&jared, &Wbtc, ());
 
             // geoff only cash
             CashPrincipals::insert(&geoff, CashPrincipal::from_nominal("1"));
+            CashPrincipals::insert(&alice, CashPrincipal::from_nominal("1"));
 
             let accounts: Vec<ChainAccount> = super::get_accounts::<Test>()?;
-            assert_eq!(accounts, vec![jared, geoff]);
+            assert_eq!(accounts, vec![alice, jared, geoff]);
 
             Ok(())
         })

Diff for: pallets/cash/src/lib.rs

@@ -840,7 +840,7 @@ impl<T: Config> Module<T> {
         Ok(internal::assets::get_assets::<T>()?)
     }
 
-    /// Get the rates for the given asset.
+    /// Get the a list of all chain accounts
     pub fn get_accounts() -> Result<Vec<ChainAccount>, Reason> {
         Ok(core::get_accounts::<T>()?)
     }

Diff for: pallets/cash/src/trx_req.rs

@@ -30,11 +30,8 @@ mod tests {
     use super::*;
     use trx_request;
 
-    const ALAN: [u8; 20] = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1];
-    const ETH: [u8; 20] = [
-        238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238,
-        238, 238,
-    ];
+    const ALAN: [u8; 20] = [1; 20];
+    const ETH: [u8; 20] = [238; 20];
 
     #[test]
     fn test_account_to_chain_account() {