Merge pull request #85 from Lay3rLabs/more-from-into

small api change

Author: dakom

Cargo.lock

@@ -3,20 +3,20 @@ members = ["packages/*", "examples/*", "faucet", "integration-test"]
 resolver = "2"
 
 [workspace.package]
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/Lay3rLabs/climb"
 
 [workspace.dependencies]
 # Local
-layer-climb = { path = "packages/layer-climb", version = "0.8.1" }
-layer-climb-address = { path = "packages/layer-climb-address", version = "0.8.1" }
-layer-climb-cli = { path = "packages/layer-climb-cli", version = "0.8.1" }
-layer-climb-config = { path = "packages/layer-climb-config", version = "0.8.1" }
-layer-climb-core = { path = "packages/layer-climb-core", version = "0.8.1" }
-layer-climb-proto = { path = "packages/layer-climb-proto", version = "0.8.1" }
-layer-climb-signer = { path = "packages/layer-climb-signer", version = "0.8.1" }
+layer-climb = { path = "packages/layer-climb", version = "0.8.2" }
+layer-climb-address = { path = "packages/layer-climb-address", version = "0.8.2" }
+layer-climb-cli = { path = "packages/layer-climb-cli", version = "0.8.2" }
+layer-climb-config = { path = "packages/layer-climb-config", version = "0.8.2" }
+layer-climb-core = { path = "packages/layer-climb-core", version = "0.8.2" }
+layer-climb-proto = { path = "packages/layer-climb-proto", version = "0.8.2" }
+layer-climb-signer = { path = "packages/layer-climb-signer", version = "0.8.2" }
 
 # General
 cfg-if = "1.0.1"

Cargo.toml

@@ -30,9 +30,9 @@ impl Address {
     pub fn try_from_str(value: &str, addr_kind: &AddrKind) -> Result<Self> {
         match addr_kind {
             AddrKind::Cosmos { prefix } => {
-                CosmosAddr::new_string(value, Some(prefix)).map(Self::Cosmos)
+                CosmosAddr::new_str(value, Some(prefix)).map(Self::Cosmos)
             }
-            AddrKind::Evm => EvmAddr::new_string(value).map(Self::Evm),
+            AddrKind::Evm => EvmAddr::new_str(value).map(Self::Evm),
         }
     }
 
@@ -135,6 +135,14 @@ impl TryFrom<cosmwasm_std::Addr> for Address {
     }
 }
 
+impl TryFrom<&cosmwasm_std::Addr> for Address {
+    type Error = anyhow::Error;
+
+    fn try_from(addr: &cosmwasm_std::Addr) -> Result<Self> {
+        Ok(Self::Cosmos(addr.try_into()?))
+    }
+}
+
 #[cw_serde]
 #[derive(Eq, Hash)]
 pub enum AddrKind {
@@ -186,7 +194,7 @@ mod test {
 
     #[test]
     fn test_basic_roundtrip_cosmos() {
-        let cosmos_addr = CosmosAddr::new_string(TEST_COSMOS_STR, None).unwrap();
+        let cosmos_addr = CosmosAddr::new_str(TEST_COSMOS_STR, None).unwrap();
         let addr: Address = cosmos_addr.clone().into();
 
         assert_eq!(addr.to_string(), TEST_COSMOS_STR);

packages/layer-climb-address/src/address.rs

@@ -61,7 +61,7 @@ impl CosmosAddr {
 
     // if the prefix is supplied, this will attempt to validate the address against the prefix to ensure they match
     // if you just have a public key, use new_cosmos_pub_key instead
-    pub fn new_string(value: &str, prefix: Option<&str>) -> Result<Self> {
+    pub fn new_str(value: &str, prefix: Option<&str>) -> Result<Self> {
         let (decoded_prefix, decoded_bytes) = if value.starts_with(|c: char| c.is_uppercase()) {
             bech32::decode_upper(value)
         } else {
@@ -95,7 +95,7 @@ impl CosmosAddr {
         if self.prefix() == new_prefix {
             Ok(self.clone())
         } else {
-            Self::new_string(&self.bech32_addr, Some(new_prefix))
+            Self::new_str(&self.bech32_addr, Some(new_prefix))
         }
     }
 }
@@ -111,7 +111,7 @@ impl FromStr for CosmosAddr {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self> {
-        Self::new_string(s, None)
+        Self::new_str(s, None)
     }
 }
 
@@ -172,7 +172,7 @@ impl TryFrom<cosmwasm_std::Addr> for CosmosAddr {
     type Error = anyhow::Error;
 
     fn try_from(addr: cosmwasm_std::Addr) -> Result<Self> {
-        Self::new_string(addr.as_str(), None)
+        Self::new_str(addr.as_str(), None)
     }
 }
 
@@ -181,3 +181,11 @@ impl From<CosmosAddr> for cosmwasm_std::Addr {
         cosmwasm_std::Addr::unchecked(addr.to_string())
     }
 }
+
+impl TryFrom<&cosmwasm_std::Addr> for CosmosAddr {
+    type Error = anyhow::Error;
+
+    fn try_from(addr: &cosmwasm_std::Addr) -> Result<Self> {
+        Self::new_str(addr.as_str(), None)
+    }
+}

packages/layer-climb-address/src/address/cosmos.rs

@@ -29,7 +29,7 @@ impl EvmAddr {
         Err(anyhow!("TODO - support EVM pub key"))
     }
 
-    pub fn new_string(s: &str) -> Result<Self> {
+    pub fn new_str(s: &str) -> Result<Self> {
         Self::new_vec(const_hex::decode(s.trim())?)
     }
 
@@ -80,7 +80,7 @@ impl FromStr for EvmAddr {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self> {
-        Self::new_string(s)
+        Self::new_str(s)
     }
 }