feat(pactus): support validator string for testnet

Author: b00f

rust/chains/tw_pactus/src/types/address.rs

@@ -113,7 +113,7 @@ impl fmt::Display for Address {
             return f.write_str(TREASURY_ADDRESS_STRING);
         }
 
-        let hrp = self.network.hrp().map_err(|_| fmt::Error)?;
+        let hrp = self.network.address_hrp().map_err(|_| fmt::Error)?;
         let mut b32 = Vec::with_capacity(33);
 
         b32.push(bech32::u5::try_from_u8(self.addr_type.clone() as u8).map_err(|_| fmt::Error)?);

rust/chains/tw_pactus/src/types/network.rs

@@ -34,6 +34,9 @@ pub enum Network {
 const MAINNET_ADDRESS_HRP: &str = "pc";
 const TESTNET_ADDRESS_HRP: &str = "tpc";
 
+pub const MAINNET_PUBLIC_KEY_HRP: &str = "public";
+pub const TESTNET_PUBLIC_KEY_HRP: &str = "tpublic";
+
 impl Network {
     pub fn try_from_hrp(hrp: &str) -> Result<Self, AddressError> {
         match hrp {
@@ -43,11 +46,19 @@ impl Network {
         }
     }
 
-    pub fn hrp(&self) -> Result<&'static str, AddressError> {
+    pub fn address_hrp(&self) -> Result<&'static str, AddressError> {
         match &self {
             Network::Mainnet => Ok(MAINNET_ADDRESS_HRP),
             Network::Testnet => Ok(TESTNET_ADDRESS_HRP),
             Network::Unknown => Err(AddressError::InvalidHrp),
         }
     }
+
+    pub fn public_key_hrp(&self) -> Result<&'static str, AddressError> {
+        match &self {
+            Network::Mainnet => Ok(MAINNET_PUBLIC_KEY_HRP),
+            Network::Testnet => Ok(TESTNET_PUBLIC_KEY_HRP),
+            Network::Unknown => Err(AddressError::InvalidHrp),
+        }
+    }
 }

rust/chains/tw_pactus/src/types/validator_public_key.rs

@@ -5,8 +5,9 @@ use bech32::FromBase32;
 use std::str::FromStr;
 use tw_keypair::KeyPairError;
 
+use super::network::{MAINNET_PUBLIC_KEY_HRP, TESTNET_PUBLIC_KEY_HRP};
+
 pub const BLS_PUBLIC_KEY_SIZE: usize = 96;
-pub const PUBLIC_KEY_HRP: &str = "public";
 
 #[derive(Debug)]
 pub struct ValidatorPublicKey(pub [u8; BLS_PUBLIC_KEY_SIZE]);
@@ -34,7 +35,7 @@ impl FromStr for ValidatorPublicKey {
 
     fn from_str(s: &str) -> Result<Self, KeyPairError> {
         let (hrp, b32, _variant) = bech32::decode(s).map_err(|_| KeyPairError::InvalidPublicKey)?;
-        if hrp != PUBLIC_KEY_HRP {
+        if hrp != MAINNET_PUBLIC_KEY_HRP && hrp != TESTNET_PUBLIC_KEY_HRP {
             return Err(KeyPairError::InvalidPublicKey);
         }
 
@@ -83,6 +84,11 @@ mod test {
                 pub_key_str: "public1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg7v5jhx47a",
                 pub_key_data: "af0f74917f5065af94727ae9541b0ddcfb5b828a9e016b02498f477ed37fb44d5d882495afb6fd4f9773e4ea9deee436030c4d61c6e3a1151585e1d838cae1444a438d089ce77e10c492a55f6908125c5be9b236a246e4082d08de564e111e65",
             },
+            TestCase {
+                name: "OK",
+                pub_key_str: "tpublic1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg7v5fmv7tx",
+                pub_key_data: "af0f74917f5065af94727ae9541b0ddcfb5b828a9e016b02498f477ed37fb44d5d882495afb6fd4f9773e4ea9deee436030c4d61c6e3a1151585e1d838cae1444a438d089ce77e10c492a55f6908125c5be9b236a246e4082d08de564e111e65",
+            },
        ];
 
         for case in test_cases {