Move addresses

Author: aumetra

Cargo.lock

@@ -14,8 +14,8 @@ crc32fast = { version = "1.4.0", optional = true, default-features = false }
 derive_more = { version = "1.0.0-beta.6", default-features = false, features = ["display", "from"] }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 schemars = { version = "0.8.16", optional = true }
-serde = { version = "1.0.197", default-features = false, features = ["derive"] }
-serde-json-wasm = { version = "1.0.1", default-features = false }
+serde = { version = "1.0.197", default-features = false, features = ["alloc", "derive"] }
+sha2 = { version = "0.10.8", default-features = false }
 static_assertions = "1.1.0"
 
 [features]
@@ -29,3 +29,5 @@ testing = ["dep:crc32fast"]
 # I love cyclic dependencies. They are good for your health.
 cosmwasm-std = { path = "../std", version = "2.0.0" }
 crc32fast = { version = "1.4.0", default-features = false }
+hex-literal = "0.4.1"
+serde_json = { version = "1.0.114", default-features = false }

packages/core/Cargo.toml

@@ -1,16 +1,13 @@
-use alloc::borrow::Cow;
+use alloc::{borrow::Cow, string::String, vec::Vec};
 use core::fmt;
 use core::ops::Deref;
-use cosmwasm_core::Binary;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use sha2::{
     digest::{Digest, Update},
     Sha256,
 };
-use thiserror::Error;
 
-use crate::prelude::*;
+use crate::Binary;
 use crate::{forward_ref_partial_eq, HexBinary};
 
 /// A human readable address.
@@ -29,9 +26,8 @@ use crate::{forward_ref_partial_eq, HexBinary};
 /// This type is immutable. If you really need to mutate it (Really? Are you sure?), create
 /// a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String`
 /// instance.
-#[derive(
-    Serialize, Deserialize, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, JsonSchema,
-)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(feature = "std", derive(schemars::JsonSchema))]
 pub struct Addr(String);
 
 forward_ref_partial_eq!(Addr, Addr);
@@ -131,7 +127,8 @@ impl<'a> From<&'a Addr> for Cow<'a, Addr> {
 /// addition to that there are many unsafe ways to convert any binary data into an instance.
 /// So the type should be treated as a marker to express the intended data type, not as
 /// a validity guarantee of any sort.
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "std", derive(schemars::JsonSchema))]
 pub struct CanonicalAddr(Binary);
 
 /// Implement `CanonicalAddr == Binary`
@@ -252,7 +249,7 @@ impl fmt::Display for CanonicalAddr {
     }
 }
 
-#[derive(Error, Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Instantiate2AddressError {
     /// Checksum must be 32 bytes
     InvalidChecksumLength,
@@ -269,6 +266,9 @@ impl fmt::Display for Instantiate2AddressError {
     }
 }
 
+#[cfg(feature = "std")]
+impl std::error::Error for Instantiate2AddressError {}
+
 /// Creates a contract address using the predictable address format introduced with
 /// wasmd 0.29. When using instantiate2, this is a way to precompute the address.
 /// When using instantiate, the contract address will use a different algorithm and
@@ -361,8 +361,9 @@ fn hash(ty: &str, key: &[u8]) -> Vec<u8> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::assert_hash_works;
     use crate::HexBinary;
-    use cosmwasm_core::assert_hash_works;
+
     use hex_literal::hex;
 
     #[test]

packages/std/src/addresses.rs renamed to packages/core/src/addresses.rs

@@ -7,6 +7,7 @@
 #[macro_use]
 extern crate alloc;
 
+mod addresses;
 mod binary;
 mod errors;
 mod forward_ref;
@@ -16,6 +17,7 @@ mod math;
 #[doc(hidden)]
 pub mod __internal;
 
+pub use crate::addresses::{instantiate2_address, Addr, CanonicalAddr, Instantiate2AddressError};
 pub use crate::binary::Binary;
 pub use crate::errors::{
     CheckedFromRatioError, CheckedMultiplyFractionError, CheckedMultiplyRatioError,

packages/core/src/lib.rs

@@ -3052,26 +3052,26 @@ mod tests {
     #[test]
     fn signed_decimal_can_be_serialized_and_deserialized() {
         // properly deserialized
-        let value: SignedDecimal = serde_json_wasm::from_str(r#""123""#).unwrap();
+        let value: SignedDecimal = serde_json::from_str(r#""123""#).unwrap();
         assert_eq!(SignedDecimal::from_str("123").unwrap(), value);
 
         // properly serialized
         let value = SignedDecimal::from_str("456").unwrap();
-        assert_eq!(r#""456""#, serde_json_wasm::to_string(&value).unwrap());
+        assert_eq!(r#""456""#, serde_json::to_string(&value).unwrap());
 
         // invalid: not a string encoded decimal
         assert_eq!(
-            "Invalid type",
-            serde_json_wasm::from_str::<SignedDecimal>("123")
+            "invalid type: integer `123`, expected string-encoded decimal at line 1 column 3",
+            serde_json::from_str::<SignedDecimal>("123")
                 .err()
                 .unwrap()
                 .to_string()
         );
 
         // invalid: not properly defined signed decimal value
         assert_eq!(
-            "Error parsing decimal '1.e': Generic error: Error parsing fractional",
-            serde_json_wasm::from_str::<SignedDecimal>(r#""1.e""#)
+            "Error parsing decimal '1.e': Generic error: Error parsing fractional at line 1 column 5",
+            serde_json::from_str::<SignedDecimal>(r#""1.e""#)
                 .err()
                 .unwrap()
                 .to_string()

packages/core/src/math/signed_decimal.rs

@@ -3225,26 +3225,26 @@ mod tests {
     #[test]
     fn signed_decimal_256_can_be_serialized_and_deserialized() {
         // properly deserialized
-        let value: SignedDecimal256 = serde_json_wasm::from_str(r#""123""#).unwrap();
+        let value: SignedDecimal256 = serde_json::from_str(r#""123""#).unwrap();
         assert_eq!(SignedDecimal256::from_str("123").unwrap(), value);
 
         // properly serialized
         let value = SignedDecimal256::from_str("456").unwrap();
-        assert_eq!(r#""456""#, serde_json_wasm::to_string(&value).unwrap());
+        assert_eq!(r#""456""#, serde_json::to_string(&value).unwrap());
 
         // invalid: not a string encoded decimal
         assert_eq!(
-            "Invalid type",
-            serde_json_wasm::from_str::<SignedDecimal256>("123")
+            "invalid type: integer `123`, expected string-encoded decimal at line 1 column 3",
+            serde_json::from_str::<SignedDecimal256>("123")
                 .err()
                 .unwrap()
                 .to_string()
         );
 
         // invalid: not properly defined signed decimal value
         assert_eq!(
-            "Error parsing decimal '1.e': Generic error: Error parsing fractional",
-            serde_json_wasm::from_str::<SignedDecimal256>(r#""1.e""#)
+            "Error parsing decimal '1.e': Generic error: Error parsing fractional at line 1 column 5",
+            serde_json::from_str::<SignedDecimal256>(r#""1.e""#)
                 .err()
                 .unwrap()
                 .to_string()

packages/core/src/math/signed_decimal_256.rs

@@ -4,8 +4,8 @@
 use core::cmp::{Ord, Ordering, PartialOrd};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use cosmwasm_core::Addr;
 
-use crate::addresses::Addr;
 use crate::coin::Coin;
 use crate::errors::StdResult;
 use crate::prelude::*;

packages/std/testdata/instantiate2_addresses.json renamed to packages/core/testdata/instantiate2_addresses.json

@@ -9,7 +9,6 @@ Builds without the std feature are currently not expected to work. If you need n
 
 // Exposed on all platforms
 
-mod addresses;
 mod assertions;
 mod checksum;
 mod coin;
@@ -43,7 +42,6 @@ pub(crate) mod prelude;
 /// contract devs to use it directly.
 pub mod storage_keys;
 
-pub use crate::addresses::{instantiate2_address, Addr, CanonicalAddr, Instantiate2AddressError};
 pub use crate::checksum::{Checksum, ChecksumError};
 pub use crate::coin::{coin, coins, has_coins, Coin};
 pub use crate::coins::Coins;

packages/std/src/ibc.rs

@@ -10,8 +10,8 @@ use serde::de::DeserializeOwned;
 #[cfg(feature = "stargate")]
 use serde::Serialize;
 use sha2::{Digest, Sha256};
+use cosmwasm_core::{Addr, CanonicalAddr};
 
-use crate::addresses::{Addr, CanonicalAddr};
 use crate::coin::Coin;
 use crate::deps::OwnedDeps;
 use crate::errors::{RecoverPubkeyError, StdError, StdResult, SystemError, VerificationError};

packages/std/src/lib.rs

@@ -1,8 +1,8 @@
 use core::marker::PhantomData;
 use core::ops::Deref;
 use serde::{de::DeserializeOwned, Serialize};
+use cosmwasm_core::{Addr, CanonicalAddr};
 
-use crate::addresses::{Addr, CanonicalAddr};
 use crate::coin::Coin;
 use crate::errors::{RecoverPubkeyError, StdError, StdResult, VerificationError};
 #[cfg(feature = "iterator")]

packages/std/src/testing/mock.rs

@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use cosmwasm_core::Addr;
 
-use crate::addresses::Addr;
 use crate::coin::Coin;
 use crate::prelude::*;
 use crate::timestamp::Timestamp;