fix missing rand impl on wasm; bump RustCrypto crates;

ditch rand impl in `sigma_protocol::crypto_utils` in favor of k256 bundled rand_core;

Author: greenhat

bindings/ergo-lib-wasm/Cargo.toml

@@ -15,13 +15,11 @@ default = ["console_error_panic_hook"]
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"]}
-ergo-lib = { version = "^0.13.0", path = "../../ergo-lib" }
+ergo-lib = { version = "^0.13.0", path = "../../ergo-lib"}
 serde_json = "1.0"
 js-sys = "0.3"
 syn = "=1.0.65" # workaround for https://github.com/rustwasm/wasm-bindgen/issues/2508
 
-# used in elliptic-curve(in ergo-lib), compiled here with WASM support
-getrandom = {version = "0.1", features = ["wasm-bindgen"]}
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
@@ -42,7 +40,6 @@ features = ["serde-serialize"]
 [dev-dependencies]
 wasm-bindgen-test = "0.3.22"
 ergotree-ir = { version = "^0.13.0", path = "../../ergotree-ir", features = ["arbitrary"] }
-ergotree-interpreter = { version = "^0.13.0", path = "../../ergotree-interpreter", features = ["arbitrary"] }
 ergo-lib = { version = "^0.13.0", path = "../../ergo-lib", features = ["arbitrary"] }
 
 [dev-dependencies.proptest]

ergo-lib/Cargo.toml

@@ -25,9 +25,18 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
 thiserror = "1"
 derive_more = "0.99"
-proptest = {version = "1.0.0", optional = true }
 proptest-derive = {version = "0.3.0", optional = true }
 
+[dependencies.proptest]
+# wasm support, via https://altsysrq.github.io/proptest-book/proptest/wasm.html
+version = "1.0.0"
+# The default feature set includes things like process forking which are not
+# supported in Web Assembly.
+default-features = false
+# Enable using the `std` crate.
+features = ["std"]
+optional = true
+
 [dependencies.serde_with]
 version = "1.9.1"
 features = [ "json" ]
@@ -41,17 +50,9 @@ arbitrary = ["proptest", "proptest-derive"]
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.10"
-rand = "0.7.3"
+rand = "0.8.3"
 ergotree-ir = { version = "^0.13.0", path = "../ergotree-ir", features = ["arbitrary"] }
 ergotree-interpreter = { version = "^0.13.0", path = "../ergotree-interpreter", features = ["arbitrary"] }
 sigma-test-util = { version = "0.2.0", path = "../sigma-test-util" }
 pretty_assertions = "0.7.2"
 
-[dev-dependencies.proptest]
-# wasm support, via https://altsysrq.github.io/proptest-book/proptest/wasm.html
-version = "1.0.0"
-# The default feature set includes things like process forking which are not
-# supported in Web Assembly.
-default-features = false
-# Enable using the `std` crate.
-features = ["std"]

ergotree-interpreter/Cargo.toml

@@ -17,19 +17,27 @@ crate-type = ["cdylib", "rlib"]
 sigma-util = { version = "^0.2.0", path = "../sigma-util" }
 ergotree-ir = { version = "^0.13.0", path = "../ergotree-ir" }
 indexmap = "1.3.2"
-k256 = { version = "0.7.2", features = ["zeroize", "arithmetic", "ecdsa"] }
-elliptic-curve = {version = "0.9.6", features = [ "zeroize"]}
+k256 = { version = "0.9.5", features = ["zeroize", "arithmetic", "ecdsa"] }
+elliptic-curve = {version = "0.10.5", features = ["zeroize"]}
 blake2 = "0.9"
-rand = "0.7"
 lazy_static = "1.4"
 thiserror = "1"
 derive_more = "0.99"
 num-traits = "0.2.14"
-proptest = {version = "1.0.0", optional = true }
 proptest-derive = {version = "0.3.0", optional = true }
 base16 = "0.2.1"
 num-bigint = "0.4.0"
 
+[dependencies.proptest]
+# wasm support, via https://altsysrq.github.io/proptest-book/proptest/wasm.html
+version = "1.0.0"
+# The default feature set includes things like process forking which are not
+# supported in Web Assembly.
+default-features = false
+# Enable using the `std` crate.
+features = ["std"]
+optional = true
+
 [features]
 default = []
 arbitrary = ["proptest", "proptest-derive"]

ergotree-interpreter/src/sigma_protocol/crypto_utils.rs

@@ -1,7 +1,7 @@
 /// Generate cryptographically secure random bytes
 pub fn secure_random_bytes(how_many: usize) -> Vec<u8> {
-    use rand::rngs::OsRng;
-    use rand::RngCore;
+    use k256::elliptic_curve::rand_core::OsRng;
+    use k256::elliptic_curve::rand_core::RngCore;
     let mut bytes: Vec<u8> = vec![0; how_many];
     OsRng.fill_bytes(&mut bytes);
     bytes

ergotree-interpreter/src/sigma_protocol/private_input.rs

@@ -1,10 +1,10 @@
 //! Private input types for the prover's secrets
 use std::convert::TryInto;
 
+use elliptic_curve::group::ff::PrimeField;
 use ergotree_ir::sigma_protocol::dlog_group;
 use ergotree_ir::sigma_protocol::sigma_boolean::ProveDlog;
 
-use k256::elliptic_curve::ff::PrimeField;
 use k256::Scalar;
 
 extern crate derive_more;

ergotree-ir/Cargo.toml

@@ -16,21 +16,31 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 sigma-ser = { version = "^0.2.0", path = "../sigma-ser" }
 sigma-util = { version = "^0.2.0", path = "../sigma-util" }
-k256 = { version = "0.7.2", features = ["zeroize", "arithmetic", "ecdsa"] }
-elliptic-curve = {version = "0.9.12", features = ["zeroize"]}
+k256 = { version = "0.9.5", features = ["zeroize", "arithmetic", "ecdsa"] }
+elliptic-curve = {version = "0.10.5", features = ["zeroize"]}
 thiserror = "1"
-rand = "0.7"
+# used in elliptic-curve(in ergo-lib), compiled here with WASM support
+getrandom = {version = "0.2.3", features = ["js"]}
 lazy_static = "1.4"
 derive_more = "0.99"
 impl-trait-for-tuples = "0.2.0"
-proptest = {version = "1.0.0", optional = true }
 proptest-derive = {version = "0.3.0", optional = true }
 bs58 = "0.4.0"
 base16 = "0.2.1"
 num-bigint = "0.4.0"
 # bounded-vec = { git = "https://github.com/ergoplatform/bounded-vec", rev="78f1c83" }
 bounded-vec = { version = "^0.3.0" }
 
+[dependencies.proptest]
+# wasm support, via https://altsysrq.github.io/proptest-book/proptest/wasm.html
+version = "1.0.0"
+# The default feature set includes things like process forking which are not
+# supported in Web Assembly.
+default-features = false
+# Enable using the `std` crate.
+features = ["std"]
+optional = true
+
 [features]
 default = []
 arbitrary = ["proptest", "proptest-derive"]

ergotree-ir/src/sigma_protocol/dlog_group.rs

@@ -20,7 +20,8 @@ use crate::serialization::SigmaSerializeResult;
 use crate::serialization::{
     sigma_byte_reader::SigmaByteRead, SigmaParsingError, SigmaSerializable,
 };
-use k256::elliptic_curve::ff::PrimeField;
+use elliptic_curve::group::ff::PrimeField;
+use elliptic_curve::group::prime::PrimeCurveAffine;
 use k256::elliptic_curve::sec1::ToEncodedPoint;
 use k256::{ProjectivePoint, PublicKey, Scalar};
 use num_bigint::{BigInt, Sign};
@@ -111,7 +112,7 @@ pub fn exponentiate(base: &EcPoint, exponent: &Scalar) -> EcPoint {
 
 /// Creates a random scalar, a big-endian integer in the range [0, n), where n is group order
 pub fn random_scalar_in_group_range() -> Scalar {
-    use rand::rngs::OsRng;
+    use k256::elliptic_curve::rand_core::OsRng;
     Scalar::generate_vartime(&mut OsRng)
 }