diff --git a/Cargo.toml b/Cargo.toml index a36953b..fdbad1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ exclude = ["examples/"] [workspace.package] -version = "2.1.3" +version = "2.1.4" # Special triple # comment for ci. [patch.crates-io] diff --git a/unc-contract-standards/Cargo.toml b/unc-contract-standards/Cargo.toml index 6ed51cb..efdbde0 100644 --- a/unc-contract-standards/Cargo.toml +++ b/unc-contract-standards/Cargo.toml @@ -13,7 +13,7 @@ Utility smart contracts standard library. """ [dependencies] -unc-sdk = { path = "../unc-sdk", version = "2.1.2", default-features = false, features = ["legacy"] } +unc-sdk = { path = "../unc-sdk", version = "2.1.4", default-features = false, features = ["legacy"] } [dev-dependencies] unc-sdk = { path = "../unc-sdk", default-features = false, features = ["unit-testing"] } diff --git a/unc-sdk/Cargo.toml b/unc-sdk/Cargo.toml index f87d96c..338f47d 100644 --- a/unc-sdk/Cargo.toml +++ b/unc-sdk/Cargo.toml @@ -21,8 +21,8 @@ required-features = ["abi", "unstable"] # Provide unc_bidgen macros. serde = { version = "1", features = ["derive"] } serde_json = "1" -unc-sdk-macros = { path = "../unc-sdk-macros", version = "2.1.3" } -unc-sys = { path = "../unc-sys", version = "2.1.3" } +unc-sdk-macros = { path = "../unc-sdk-macros", version = "2.1.4" } +unc-sys = { path = "../unc-sys", version = "2.1.4" } base64 = "0.22.0" borsh = { version = "1.0.0", features = ["derive"] } bs58 = "0.5" diff --git a/unc-sdk/src/types/public_key.rs b/unc-sdk/src/types/public_key.rs index 70f4da7..34d71c5 100644 --- a/unc-sdk/src/types/public_key.rs +++ b/unc-sdk/src/types/public_key.rs @@ -96,7 +96,8 @@ impl TryFrom for unc_crypto::PublicKey { /// .parse() /// .unwrap(); /// ``` -#[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq, BorshSerialize, Hash)] +#[unc(inside_uncsdk)] +#[derive(Debug, Clone, PartialEq, PartialOrd, Ord, Eq, Hash)] pub struct PublicKey { data: Vec, } @@ -177,14 +178,6 @@ impl serde::Serialize for PublicKey { } } -impl BorshDeserialize for PublicKey { - fn deserialize_reader(reader: &mut R) -> io::Result { - as BorshDeserialize>::deserialize_reader(reader).and_then(|s| { - Self::try_from(s).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e)) - }) - } -} - impl<'de> serde::Deserialize<'de> for PublicKey { fn deserialize(deserializer: D) -> Result where