make rand optional for CosmWasm support

Author: Jiloc

Cargo.lock

@@ -14,7 +14,7 @@ members = [
 
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]
-ed25519-dalek = { version = "2.1.1", features = ["serde", "rand_core"] }
+ed25519-dalek = { version = "2.1.1", default-features = false }
 hashbrown = { version = "0.15.2", features = ["serde"] }
 lazy_static = "1.4.0"
 rand_core = "0.6.4"

Cargo.toml

@@ -35,7 +35,7 @@ curve25519-dalek = { version = "4.1.3", features = ["serde"] }
 ed25519-dalek = { workspace = true }
 hashbrown = { workspace = true }
 lazy_static = { workspace = true }
-rand = { workspace = true }
+rand = { workspace = true, optional = true }
 ripemd = "0.1.1"
 serde = { workspace = true , features = ["derive"] }
 serde_derive = { workspace = true }
@@ -45,7 +45,6 @@ slog = { workspace = true }
 slog-term = "2.6.0"
 
 # Optional dependencies
-rusqlite = { workspace = true, optional = true }
 slog-json = { version = "2.3.0", optional = true }
 
 [target.'cfg(unix)'.dependencies]
@@ -57,16 +56,15 @@ winapi = { version = "0.3", features = [
     "handleapi",
     "synchapi",
     "winbase",
-] }
-
-[target.'cfg(windows)'.dev-dependencies]
-winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
+], optional = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 secp256k1 = { version = "0.24.3", features = ["serde", "recovery"] }
+rusqlite = { workspace = true, optional = true }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-libsecp256k1 = { version = "0.7.0" }
+libsecp256k1 = { version = "0.7.0", default-features = false, features = ["hmac", "static-context"] }
+getrandom = { version = "0.2.12", features = ["js"], optional = true }
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
 sha2 = { version = "0.10", features = ["asm"] }
@@ -75,23 +73,28 @@ sha2 = { version = "0.10", features = ["asm"] }
 sha2 = { version = "0.10" }
 
 [dev-dependencies]
-rand_core = { workspace = true }
 proptest = "1.6.0"
 
+[target.'cfg(windows)'.dev-dependencies]
+winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
+
 [build-dependencies]
 toml = { workspace = true }
 
 [features]
-default = ["developer-mode", "ctrlc-handler", "http-parser"]
+default = ["developer-mode", "ctrlc-handler", "http-parser", "rand"]
 developer-mode = []
-# Enables graceful shutdown handling for Ctrl+C (SIGINT) signals on Unix-like systems.
-# This pulls in the `nix` dependency.
-ctrlc-handler = ["dep:nix"]
+# Enables graceful shutdown handling for Ctrl+C (SIGINT) signals.
+# This pulls in the `nix` or `winapi` dependency.
+ctrlc-handler = ["dep:nix", "dep:winapi"]
 # Enables a lightweight, internal HTTP/1.x parser.
 http-parser = []
 slog_json = ["slog-json"]
-rusqlite = ["dep:rusqlite"]
-testing = []
+rusqlite = ["dep:rusqlite", "rand"]
+# Enables the rand module. This flag must be off on deterministic
+# platforms such as CosmWasm
+rand = ["dep:rand", "dep:getrandom"]
 serde = []
+testing = ["rand"]
 bech32_std = []
 bech32_strict = []

stacks-common/Cargo.toml

@@ -20,8 +20,6 @@ pub mod hash;
 
 use std::{error, fmt};
 
-use secp256k1;
-
 use crate::deps_common::bitcoin::network;
 use crate::deps_common::bitcoin::network::serialize;
 
@@ -50,8 +48,6 @@ pub trait BitArray {
 /// if appropriate.
 #[derive(Debug)]
 pub enum Error {
-    /// secp-related error
-    Secp256k1(secp256k1::Error),
     /// Serialization error
     Serialize(serialize::Error),
     /// Network error
@@ -65,7 +61,6 @@ pub enum Error {
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Error::Secp256k1(ref e) => fmt::Display::fmt(e, f),
             Error::Serialize(ref e) => fmt::Display::fmt(e, f),
             Error::Network(ref e) => fmt::Display::fmt(e, f),
             Error::SpvBadProofOfWork => f.write_str("target correct but not attained"),
@@ -77,28 +72,13 @@ impl fmt::Display for Error {
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
-            Error::Secp256k1(ref e) => Some(e),
             Error::Serialize(ref e) => Some(e),
             Error::Network(ref e) => Some(e),
             Error::SpvBadProofOfWork | Error::SpvBadTarget => None,
         }
     }
 }
 
-#[doc(hidden)]
-impl From<secp256k1::Error> for Error {
-    fn from(e: secp256k1::Error) -> Error {
-        Error::Secp256k1(e)
-    }
-}
-
-#[doc(hidden)]
-impl From<serialize::Error> for Error {
-    fn from(e: serialize::Error) -> Error {
-        Error::Serialize(e)
-    }
-}
-
 #[doc(hidden)]
 impl From<network::Error> for Error {
     fn from(e: network::Error) -> Error {

stacks-common/src/deps_common/bitcoin/util/mod.rs

@@ -16,7 +16,7 @@ extern crate serde_derive;
 #[cfg(all(unix, feature = "ctrlc-handler"))]
 extern crate nix;
 
-#[cfg(windows)]
+#[cfg(all(windows, feature = "ctrlc-handler"))]
 extern crate winapi;
 
 #[macro_use]
@@ -33,8 +33,7 @@ pub mod deps_common {
     pub mod bech32;
     pub mod bitcoin;
 
-    // These are gated by features.
-    #[cfg(feature = "ctrlc-handler")]
+    #[cfg(all(not(target_family = "wasm"), feature = "ctrlc-handler"))]
     pub mod ctrlc;
 
     #[cfg(feature = "http-parser")]

stacks-common/src/libcommon.rs

@@ -447,7 +447,7 @@ mod test {
     use std::io;
     use std::io::Read;
 
-    use rand::RngCore;
+    use rand::RngCore as _;
 
     use super::*;
 

stacks-common/src/util/chunked_encoding.rs

@@ -139,3 +139,5 @@ where
     let reader = BufReader::new(file);
     serde_json::from_reader::<_, J>(reader).map_err(std::io::Error::from)
 }
+#[cfg(all(feature = "rusqlite", target_family = "wasm"))]
+compile_error!("The `rusqlite` feature is not supported for wasm targets");

stacks-common/src/util/mod.rs

@@ -317,8 +317,7 @@ mod test {
     use std::io::{Read, Write};
     use std::{io, thread};
 
-    use rand;
-    use rand::RngCore;
+    use rand::RngCore as _;
 
     use super::*;
 

stacks-common/src/util/pipe.rs

@@ -24,7 +24,6 @@ use ::secp256k1::{
     constants as LibSecp256k1Constants, Error as LibSecp256k1Error, Message as LibSecp256k1Message,
     PublicKey as LibSecp256k1PublicKey, Secp256k1, SecretKey as LibSecp256k1PrivateKey,
 };
-use rand::RngCore;
 use serde::de::{Deserialize, Error as de_Error};
 use serde::Serialize;
 
@@ -240,7 +239,10 @@ impl PublicKey for Secp256k1PublicKey {
 }
 
 impl Secp256k1PrivateKey {
+    #[cfg(feature = "rand")]
     pub fn random() -> Secp256k1PrivateKey {
+        use rand::RngCore as _;
+
         let mut rng = rand::thread_rng();
         loop {
             // keep trying to generate valid bytes
@@ -422,6 +424,7 @@ pub fn secp256k1_verify(
 
 #[cfg(test)]
 mod tests {
+    use rand::RngCore as _;
     use secp256k1;
     use secp256k1::{PublicKey as LibSecp256k1PublicKey, Secp256k1};
 

stacks-common/src/util/secp256k1/native.rs

@@ -21,7 +21,6 @@ use ::libsecp256k1::{
     RecoveryId as LibSecp256k1RecoveryId, SecretKey as LibSecp256k1PrivateKey,
     Signature as LibSecp256k1Signature,
 };
-use rand::RngCore;
 use serde::de::{Deserialize, Error as de_Error};
 use serde::Serialize;
 
@@ -123,7 +122,10 @@ impl Secp256k1PublicKey {
 }
 
 impl Secp256k1PrivateKey {
+    #[cfg(feature = "rand")]
     pub fn new() -> Secp256k1PrivateKey {
+        use rand::RngCore as _;
+
         let mut rng = rand::thread_rng();
         loop {
             // keep trying to generate valid bytes