Gate BLS dependencies behind target triple instead of feature

Author: aumetra

packages/crypto/Cargo.toml

@@ -7,39 +7,28 @@ description = "Crypto bindings for cosmwasm contracts"
 repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/crypto"
 license = "Apache-2.0"
 
-[features]
-default = []
-std = [
-    "dep:ark-bls12-381",
-    "dep:ark-ec",
-    "dep:ark-ff",
-    "dep:ark-serialize",
-    "dep:num-traits",
-    "dep:rayon",
-    "dep:sha2",
-    "dep:thiserror"
-]
-
 [lib]
 # See https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 bench = false
 
 [dependencies]
-ark-bls12-381 = { version = "0.4.0", optional = true }
-ark-ec = { version = "0.4.2", features = ["parallel"], optional = true }
-ark-ff = { version = "0.4.2", features = ["asm", "parallel"], optional = true }
-ark-serialize = { version = "0.4.2", optional = true }
 cfg-if = "1.0.0"
 digest = "0.10"
 ecdsa = "0.16.2" # Not used directly, but needed to bump transitive dependency, see: https://github.com/CosmWasm/cosmwasm/pull/1899 for details.
 ed25519-zebra = { version = "4.0.3", default-features = false }
 k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] }
-num-traits = { version = "0.2.18", optional = true }
 p256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }
 rand_core = "0.6"
-rayon = { version = "1.9.0", optional = true }
-sha2 = { version = "0.10", optional = true }
-thiserror = { version = "1.0.26", optional = true }
+thiserror = "1.0.26"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+ark-bls12-381 = "0.4.0"
+ark-ec = { version = "0.4.2", features = ["parallel"] }
+ark-ff = { version = "0.4.2", features = ["asm", "parallel"] }
+ark-serialize = "0.4.2"
+num-traits = "0.2.18"
+rayon = "1.9.0"
+sha2 = "0.10"
 
 [dev-dependencies]
 base64 = "0.22.0"

packages/crypto/src/bls12_318/mod.rs

@@ -5,7 +5,7 @@ pub use self::constants::{
 };
 
 cfg_if::cfg_if! {
-    if #[cfg(feature = "std")] {
+    if #[cfg(not(target_arch = "wasm32"))] {
         mod aggregate;
         mod hash;
         mod pairing;

packages/std/Cargo.toml

@@ -65,7 +65,6 @@ thiserror = "1.0.26"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 bech32 = "0.11.0"
-cosmwasm-crypto = { version = "2.0.1", path = "../crypto", features = ["std"] }
 rand_core = { version = "0.6.4", features = ["getrandom"] }
 
 [dev-dependencies]

packages/std/src/addresses.rs

@@ -26,7 +26,9 @@ use crate::{HexBinary, __internal::forward_ref_partial_eq};
 /// 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, schemars::JsonSchema)]
+#[derive(
+    Serialize, Deserialize, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, schemars::JsonSchema,
+)]
 pub struct Addr(String);
 
 forward_ref_partial_eq!(Addr, Addr);

packages/std/src/errors/system_error.rs

@@ -12,7 +12,9 @@ use crate::Binary;
 ///
 /// Such errors are only created by the VM. The error type is defined in the standard library, to ensure
 /// the contract understands the error format without creating a dependency on cosmwasm-vm.
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, schemars::JsonSchema, thiserror::Error)]
+#[derive(
+    Serialize, Deserialize, Clone, Debug, PartialEq, Eq, schemars::JsonSchema, thiserror::Error,
+)]
 #[serde(rename_all = "snake_case")]
 #[non_exhaustive]
 pub enum SystemError {

packages/std/src/math/signed_decimal.rs

@@ -3095,7 +3095,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn signed_decimal_has_defined_json_schema() {
         let schema = schemars::schema_for!(SignedDecimal);
         assert_eq!(

packages/std/src/math/signed_decimal_256.rs

@@ -3268,7 +3268,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn signed_decimal_256_has_defined_json_schema() {
         let schema = schemars::schema_for!(SignedDecimal256);
         assert_eq!(

packages/std/src/timestamp.rs

@@ -21,7 +21,19 @@ use crate::Uint64;
 /// assert_eq!(ts.seconds(), 3);
 /// assert_eq!(ts.subsec_nanos(), 202);
 /// ```
-#[derive(Serialize, Deserialize, Copy, Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord, schemars::JsonSchema)]
+#[derive(
+    Serialize,
+    Deserialize,
+    Copy,
+    Clone,
+    Default,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    schemars::JsonSchema,
+)]
 pub struct Timestamp(Uint64);
 
 impl Timestamp {

packages/vm/Cargo.toml

@@ -46,7 +46,7 @@ crc32fast = "1.3.2"
 bech32 = "0.11.0"
 # Uses the path when built locally; uses the given version from crates.io when published
 cosmwasm-std = { version = "2.0.1", path = "../std", default-features = false, features = ["std"] }
-cosmwasm-crypto = { version = "2.0.1", path = "../crypto", features = ["std"] }
+cosmwasm-crypto = { version = "2.0.1", path = "../crypto" }
 derivative = "2"
 hex = "0.4"
 rand_core = { version = "0.6", features = ["getrandom"] }