Fix CI and dependency resolver

Signed-off-by: aeryz <[email protected]>

Author: aeryz

.circleci/config.yml

@@ -260,17 +260,25 @@ jobs:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown && rustup target list --installed
       - run:
-          name: Build library for native target (no features)
+          name: Build library for native target (no_std)
           working_directory: ~/project/packages/std
           command: cargo build --locked --no-default-features
       - run:
-          name: Build library for wasm target (no features)
+          name: Build library for native target (only "std" feature)
           working_directory: ~/project/packages/std
-          command: cargo wasm --locked --no-default-features
+          command: cargo build --locked --no-default-features --features std
+      - run:
+          name: Build library for wasm target (only "std" feature)
+          working_directory: ~/project/packages/std
+          command: cargo wasm --locked --no-default-features --features std
       - run:
           name: Run unit tests (only "std" feature)
           working_directory: ~/project/packages/std
           command: cargo test --locked --no-default-features --features std
+      - run:
+          name: Build library for native target (all features "no_std")
+          working_directory: ~/project/packages/std
+          command: cargo build --locked --no-default-features --features abort,iterator,staking,stargate,std,cosmwasm_1_1
       - run:
           name: Build library for native target (all features)
           working_directory: ~/project/packages/std

CHANGELOG.md

@@ -14,8 +14,12 @@ and this project adheres to
   `CanonicalAddr` ([#1463]).
 - cosmwasm-std: Implement `PartialEq` between `CanonicalAddr` and
   `HexBinary`/`Binary` ([#1463]).
+- cosmwasm-std: Add `std` feature to support `no_std` if this feature
+  is not enabled.
+- cosmwasm-std: Add `std` feature to default features.
 
 [#1463]: https://github.com/CosmWasm/cosmwasm/pull/1463
+[#1483]: https://github.com/CosmWasm/cosmwasm/pull/1483
 
 ### Changed
 

Cargo.toml

@@ -1,3 +1,4 @@
 [workspace]
 members = ["packages/*"]
 exclude = ["contracts"]
+resolver = "2"

packages/std/Cargo.toml

@@ -37,12 +37,12 @@ ibc3 = ["stargate"]
 # the host blockchain to run CosmWasm `1.1.0` or higher.
 cosmwasm_1_1 = []
 # enable std support
-std = ["forward_ref", "schemars", "serde-json-wasm", "thiserror", "cosmwasm-crypto", "derivative"]
+std = ["forward_ref", "schemars", "serde-json-wasm", "thiserror", "cosmwasm-crypto"]
 
 [dependencies]
 base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
 cosmwasm-derive = { path = "../derive", version = "1.1.5" }
-derivative = { version = "2", features = ["use_core"], optional = true }
+derivative = { version = "2", features = ["use_core"] }
 forward_ref = { version = "1", optional = true }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 schemars = { version = "0.8.3", optional = true }

packages/std/src/lib.rs

@@ -93,6 +93,7 @@ pub use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, TransactionInf
 mod exports;
 #[cfg(all(target_arch = "wasm32", feature = "std"))]
 mod imports;
+#[cfg(all(target_arch = "wasm32", feature = "std"))]
 mod memory; // Used by exports and imports only. This assumes pointers are 32 bit long, which makes it untestable on dev machines.
 
 #[cfg(all(target_arch = "wasm32", feature = "std"))]
@@ -105,11 +106,9 @@ pub use crate::exports::{
 #[cfg(all(target_arch = "wasm32", feature = "std"))]
 pub use crate::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
 
-pub use memory::Region;
-
 // Exposed for testing only
 // Both unit tests and integration tests are compiled to native code, so everything in here does not need to compile to Wasm.
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(all(not(target_arch = "wasm32"), feature = "std"))]
 pub mod testing;
 
 // Re-exports

packages/std/src/memory.rs

@@ -1,5 +1,3 @@
-#![allow(unused)]
-
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::mem;

packages/std/src/results/cosmos_msg.rs

@@ -1,6 +1,7 @@
 use alloc::fmt;
 use alloc::string::String;
 use alloc::vec::Vec;
+use derivative::Derivative;
 use serde::{Deserialize, Serialize};
 
 use crate::binary::Binary;
@@ -120,8 +121,10 @@ pub enum DistributionMsg {
     },
 }
 
-#[cfg(feature = "std")]
-fn binary_to_string(data: &Binary, fmt: &mut alloc::fmt::Formatter) -> Result<(), std::fmt::Error> {
+fn binary_to_string(
+    data: &Binary,
+    fmt: &mut alloc::fmt::Formatter,
+) -> Result<(), core::fmt::Error> {
     match core::str::from_utf8(data.as_slice()) {
         Ok(s) => fmt.write_str(s),
         Err(_) => write!(fmt, "{:?}", data),
@@ -133,10 +136,8 @@ fn binary_to_string(data: &Binary, fmt: &mut alloc::fmt::Formatter) -> Result<()
 /// See https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto
 #[non_exhaustive]
 #[cfg_attr(feature = "std", derive(schemars::JsonSchema))]
-#[cfg_attr(feature = "std", derive(derivative::Derivative))]
-#[cfg_attr(not(feature = "std"), derive(Debug))]
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derivative(Debug))]
+#[derive(Serialize, Deserialize, Clone, Derivative, PartialEq, Eq)]
+#[derivative(Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum WasmMsg {
     /// Dispatches a call to another contract at a known address (with known ABI).
@@ -146,7 +147,7 @@ pub enum WasmMsg {
     Execute {
         contract_addr: String,
         /// msg is the json-encoded ExecuteMsg struct (as raw Binary)
-        #[cfg_attr(feature = "std", derivative(Debug(format_with = "binary_to_string")))]
+        #[derivative(Debug(format_with = "binary_to_string"))]
         msg: Binary,
         funds: Vec<Coin>,
     },
@@ -158,7 +159,7 @@ pub enum WasmMsg {
         admin: Option<String>,
         code_id: u64,
         /// msg is the JSON-encoded InstantiateMsg struct (as raw Binary)
-        #[cfg_attr(feature = "std", derivative(Debug(format_with = "binary_to_string")))]
+        #[derivative(Debug(format_with = "binary_to_string"))]
         msg: Binary,
         funds: Vec<Coin>,
         /// A human-readbale label for the contract
@@ -176,7 +177,7 @@ pub enum WasmMsg {
         /// the code_id of the new logic to place in the given contract
         new_code_id: u64,
         /// msg is the json-encoded MigrateMsg struct that will be passed to the new code
-        #[cfg_attr(feature = "std", derivative(Debug(format_with = "binary_to_string")))]
+        #[derivative(Debug(format_with = "binary_to_string"))]
         msg: Binary,
     },
     /// Sets a new admin (for migrate) on the given contract.

packages/std/src/testing/mock.rs

@@ -218,9 +218,8 @@ impl Api for MockApi {
         )?)
     }
 
-    fn debug(&self, _message: &str) {
-        #[cfg(feature = "std")]
-        println!("{}", _message);
+    fn debug(&self, message: &str) {
+        println!("{}", message);
     }
 }
 
@@ -1555,10 +1554,7 @@ mod tests {
         });
         match result {
             SystemResult::Ok(ContractResult::Err(err)) => {
-                #[cfg(feature = "std")]
                 assert_eq!(err, "Error parsing into type cosmwasm_std::testing::mock::tests::wasm_querier_works::{{closure}}::MyMsg: Invalid type");
-                #[cfg(not(feature = "std"))]
-                assert_eq!(err, "ParseErr { target_type: \"cosmwasm_std::testing::mock::tests::wasm_querier_works::{{closure}}::MyMsg\", msg: \"Invalid type\" }");
             }
             res => panic!("Unexpected result: {:?}", res),
         }

packages/storage/Cargo.toml

@@ -16,5 +16,5 @@ iterator = ["cosmwasm-std/iterator"]
 
 [dependencies]
 # Uses the path when built locally; uses the given version from crates.io when published
-cosmwasm-std = { path = "../std", version = "1.1.5", default-features = false }
+cosmwasm-std = { path = "../std", version = "1.1.5", default-features = false, features = ["std"] }
 serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }

packages/vm/Cargo.toml

@@ -41,7 +41,7 @@ required-features = ["iterator"]
 [dependencies]
 clru = "0.4.0"
 # Uses the path when built locally; uses the given version from crates.io when published
-cosmwasm-std = { path = "../std", version = "1.1.5", default-features = false }
+cosmwasm-std = { path = "../std", version = "1.1.5", default-features = false, features = ["std"] } 
 cosmwasm-crypto = { path = "../crypto", version = "1.1.5" }
 hex = "0.4"
 parity-wasm = "0.42"