Merge pull request #87 from scrtlabs/0.9

v0.9.0

Author: toml01

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "LICENSE"
@@ -36,15 +36,15 @@ utils = ["secret-toolkit-utils"]
 viewing-key = ["secret-toolkit-viewing-key"]
 
 [dependencies]
-secret-toolkit-crypto = { version = "0.8", path = "packages/crypto", optional = true }
-secret-toolkit-incubator = { version = "0.8", path = "packages/incubator", optional = true }
-secret-toolkit-permit = { version = "0.8", path = "packages/permit", optional = true }
-secret-toolkit-serialization = { version = "0.8", path = "packages/serialization", optional = true }
-secret-toolkit-snip20 = { version = "0.8", path = "packages/snip20", optional = true }
-secret-toolkit-snip721 = { version = "0.8", path = "packages/snip721", optional = true }
-secret-toolkit-storage = { version = "0.8", path = "packages/storage", optional = true }
-secret-toolkit-utils = { version = "0.8", path = "packages/utils", optional = true }
-secret-toolkit-viewing-key = { version = "0.8", path = "packages/viewing_key", optional = true }
+secret-toolkit-crypto = { version = "0.9", path = "packages/crypto", optional = true }
+secret-toolkit-incubator = { version = "0.9", path = "packages/incubator", optional = true }
+secret-toolkit-permit = { version = "0.9", path = "packages/permit", optional = true }
+secret-toolkit-serialization = { version = "0.9", path = "packages/serialization", optional = true }
+secret-toolkit-snip20 = { version = "0.9", path = "packages/snip20", optional = true }
+secret-toolkit-snip721 = { version = "0.9", path = "packages/snip721", optional = true }
+secret-toolkit-storage = { version = "0.9", path = "packages/storage", optional = true }
+secret-toolkit-utils = { version = "0.9", path = "packages/utils", optional = true }
+secret-toolkit-viewing-key = { version = "0.9", path = "packages/viewing_key", optional = true }
 
 
 [workspace]
@@ -57,5 +57,7 @@ members = ["packages/*"]
 [workspace.dependencies]
 schemars = { version = "0.8.11" }
 serde = { version = "1.0" }
-cosmwasm-std = { git = "https://github.com/scrtlabs/cosmwasm", tag = "v1.1.9-secret" }
-cosmwasm-storage = { git = "https://github.com/scrtlabs/cosmwasm", tag = "v1.1.9-secret" }
+cosmwasm-std = { package = "secret-cosmwasm-std", version = "1.1.10", features = [
+    "random",
+] }
+cosmwasm-storage = { package = "secret-cosmwasm-storage", version = "1.1.10" }

Releases.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## v0.9.0
+
+### Features
+
+- Replace `cosmwasm-std` with `secret-cosmwasm-std` in prep for crates.io packages ([#87](https://github.com/scrtlabs/secret-toolkit/pull/87)).
+- Add `RngCore` & `CryptoRng` trait to `Prng` ([#87](https://github.com/scrtlabs/secret-toolkit/pull/87)).
+- Added `from_env` function for `ContractPrng` that consumes `env.block.random` ([#87](https://github.com/scrtlabs/secret-toolkit/pull/87)).
+
+### Breaking
+
+- Renamed `Prng` as `ContractPrng` ([#87](https://github.com/scrtlabs/secret-toolkit/pull/87)).
+
 ## v0.8.2
 
 ### Bug fixes

packages/crypto/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-crypto"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -14,21 +14,22 @@ keywords = ["secret-network", "secret-contracts", "secret-toolkit"]
 all-features = true
 
 [features]
+default = ["hash", "ecc-secp256k1", "rand"]
 hash = ["sha2"]
 ecc-secp256k1 = ["secp256k1"]
-rand = ["rand_chacha", "rand_core"]
+rand = ["hash", "rand_chacha", "rand_core"]
 
 [dependencies]
 rand_core = { version = "0.6.4", default-features = false, optional = true }
 rand_chacha = { version = "0.3.1", default-features = false, optional = true }
 sha2 = { version = "0.10.6", default-features = false, optional = true }
-secp256k1 = { version = "0.24.1", default-features = false, features = [
+secp256k1 = { version = "0.27.0", default-features = false, features = [
     "alloc",
 ], optional = true }
 cosmwasm-std = { workspace = true }
 
 [dev-dependencies]
-secp256k1 = { version = "0.24.1", default-features = false, features = [
+secp256k1 = { version = "0.27.0", default-features = false, features = [
     "alloc",
     "rand-std",
 ] }

packages/crypto/Readme.md

@@ -11,25 +11,25 @@ Add the following to your `cargo.toml` file:
 
 ```toml
 [dependencies]
-secret-toolkit = { version = "0.8.2", features = ["crypto"] }
-secret-toolkit-crypto = { version = "0.8.2", features = ["hash", "rand", "ecc-secp256k1"] }
+secret-toolkit = { version = "0.9.0", features = ["crypto"] }
+secret-toolkit-crypto = { version = "0.9.0", features = ["hash", "rand", "ecc-secp256k1"] }
 ```
 
 ## Example usage
 
 ```rust
 # extern crate secret_toolkit_crypto;
 
-# use secret_toolkit_crypto::{sha_256, Prng, secp256k1::{PrivateKey, PublicKey, Signature}};
+# use secret_toolkit_crypto::{sha_256, ContractPrng, secp256k1::{PrivateKey, PublicKey, Signature}};
 # use base64;
 # use cosmwasm_std::{StdError, testing::mock_dependencies};
 
 # fn main() -> Result<(), StdError> {
-# let deps = mock_dependencies();
+let deps = mock_dependencies();
 let entropy: String = "secret".to_owned();
 let prng_seed: Vec<u8> = sha_256(base64::encode(&entropy.clone()).as_bytes()).to_vec();
 
-let mut rng = Prng::new(&prng_seed, entropy.as_bytes());
+let mut rng = ContractPrng::new(&prng_seed, entropy.as_bytes());
 
 let private_key: PrivateKey = PrivateKey::parse(&rng.rand_bytes())?;
 let public_key: PublicKey = private_key.pubkey();

packages/crypto/src/lib.rs

@@ -11,4 +11,4 @@ pub mod secp256k1;
 pub use hash::{sha_256, SHA256_HASH_SIZE};
 
 #[cfg(feature = "rand")]
-pub use rng::Prng;
+pub use rng::ContractPrng;

packages/crypto/src/rng.rs

@@ -1,12 +1,21 @@
 use rand_chacha::ChaChaRng;
-use rand_core::{RngCore, SeedableRng};
+use rand_core::{CryptoRng, RngCore, SeedableRng};
 use sha2::{Digest, Sha256};
 
-pub struct Prng {
+use cosmwasm_std::Env;
+
+pub struct ContractPrng {
     pub rng: ChaChaRng,
 }
 
-impl Prng {
+impl ContractPrng {
+
+    pub fn from_env(env: &Env) -> Self {
+        let seed = env.block.random.as_ref().unwrap();
+
+        Self::new(seed.as_slice(), &[])
+    }
+
     pub fn new(seed: &[u8], entropy: &[u8]) -> Self {
         let mut hasher = Sha256::new();
 
@@ -35,6 +44,26 @@ impl Prng {
     }
 }
 
+impl RngCore for ContractPrng {
+    fn next_u32(&mut self) -> u32 {
+        self.rng.next_u32()
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        self.rng.next_u64()
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        self.rng.fill_bytes(dest)
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand_core::Error> {
+        self.rng.try_fill_bytes(dest)
+    }
+}
+
+impl CryptoRng for ContractPrng {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -43,7 +72,7 @@ mod tests {
     /// different random bytes every time it is called.
     #[test]
     fn test_rng() {
-        let mut rng = Prng::new(b"foo", b"bar!");
+        let mut rng = ContractPrng::new(b"foo", b"bar!");
         let r1: [u8; 32] = [
             155, 11, 21, 97, 252, 65, 160, 190, 100, 126, 85, 251, 47, 73, 160, 49, 216, 182, 93,
             30, 185, 67, 166, 22, 34, 10, 213, 112, 21, 136, 49, 214,
@@ -68,7 +97,7 @@ mod tests {
 
     #[test]
     fn test_rand_bytes_counter() {
-        let mut rng = Prng::new(b"foo", b"bar");
+        let mut rng = ContractPrng::new(b"foo", b"bar");
 
         let r1: [u8; 32] = [
             114, 227, 179, 76, 120, 34, 236, 42, 204, 27, 153, 74, 44, 29, 158, 162, 180, 202, 165,

packages/incubator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-incubator"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -16,7 +16,7 @@ all-features = true
 [dependencies]
 serde = { workspace = true, optional = true }
 cosmwasm-std = { workspace = true, optional = true }
-secret-toolkit-serialization = { version = "0.8", path = "../serialization", optional = true }
+secret-toolkit-serialization = { version = "0.9", path = "../serialization", optional = true }
 
 [features]
 generational-store = ["secret-toolkit-serialization", "serde", "cosmwasm-std"]

packages/permit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-permit"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -19,7 +19,7 @@ serde = { workspace = true }
 ripemd = { version = "0.1.3", default-features = false }
 schemars = { workspace = true }
 bech32 = "0.9.1"
-remain = "0.2.2"
-secret-toolkit-crypto = { version = "0.8.2", path = "../crypto", features = [
+remain = "0.2.8"
+secret-toolkit-crypto = { version = "0.9.0", path = "../crypto", features = [
     "hash",
 ] }

packages/serialization/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-serialization"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"

packages/snip20/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-snip20"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -17,4 +17,4 @@ all-features = true
 serde = { workspace = true }
 schemars = { workspace = true }
 cosmwasm-std = { workspace = true }
-secret-toolkit-utils = { version = "0.8", path = "../utils" }
+secret-toolkit-utils = { version = "0.9", path = "../utils" }

packages/snip721/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-snip721"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -17,4 +17,4 @@ all-features = true
 serde = { workspace = true }
 schemars = { workspace = true }
 cosmwasm-std = { workspace = true }
-secret-toolkit-utils = { version = "0.8", path = "../utils" }
+secret-toolkit-utils = { version = "0.9", path = "../utils" }

packages/snip721/src/expiration.rs

@@ -61,12 +61,14 @@ mod test {
             height: 1000,
             time: Timestamp::from_seconds(1000000),
             chain_id: "test".to_string(),
+            random: None
         };
 
         let block_h2000_t2000000 = BlockInfo {
             height: 2000,
             time: Timestamp::from_seconds(2000000),
             chain_id: "test".to_string(),
+            random: None
         };
         let exp_h1000 = Expiration::AtHeight(1000);
         let exp_t1000000 = Expiration::AtTime(1000000);

packages/storage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-storage"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -17,4 +17,4 @@ all-features = true
 serde = { workspace = true }
 cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }
-secret-toolkit-serialization = { version = "0.8", path = "../serialization" }
+secret-toolkit-serialization = { version = "0.9", path = "../serialization" }

packages/utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-utils"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"

packages/viewing_key/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secret-toolkit-viewing-key"
-version = "0.8.2"
+version = "0.9.0"
 edition = "2021"
 authors = ["SCRT Labs <[email protected]>"]
 license-file = "../../LICENSE"
@@ -20,8 +20,8 @@ base64 = "0.21.0"
 subtle = { version = "2.2.3", default-features = false }
 cosmwasm-std = { workspace = true }
 cosmwasm-storage = { workspace = true }
-secret-toolkit-crypto = { version = "0.8", path = "../crypto", features = [
+secret-toolkit-crypto = { version = "0.9", path = "../crypto", features = [
     "hash",
     "rand",
 ] }
-secret-toolkit-utils = { version = "0.8", path = "../utils" }
+secret-toolkit-utils = { version = "0.9", path = "../utils" }

packages/viewing_key/src/lib.rs

@@ -8,7 +8,7 @@ use subtle::ConstantTimeEq;
 use cosmwasm_std::{Env, MessageInfo, StdError, StdResult, Storage};
 use cosmwasm_storage::{PrefixedStorage, ReadonlyPrefixedStorage};
 
-use secret_toolkit_crypto::{sha_256, Prng, SHA256_HASH_SIZE};
+use secret_toolkit_crypto::{sha_256, ContractPrng, SHA256_HASH_SIZE};
 
 pub const VIEWING_KEY_SIZE: usize = SHA256_HASH_SIZE;
 pub const VIEWING_KEY_PREFIX: &str = "api_key_";
@@ -102,7 +102,7 @@ fn new_viewing_key(
     rng_entropy.extend_from_slice(info.sender.as_bytes());
     rng_entropy.extend_from_slice(entropy);
 
-    let mut rng = Prng::new(seed, &rng_entropy);
+    let mut rng = ContractPrng::new(seed, &rng_entropy);
 
     let rand_slice = rng.rand_bytes();