diff --git a/Cargo.lock b/Cargo.lock index db6edfa81d539..ee7ae20a1cadc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1520,6 +1520,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.2", + "subtle-ng", + "zeroize", +] + [[package]] name = "darling" version = "0.13.0" @@ -4467,6 +4480,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.2", + "zeroize", +] + [[package]] name = "mime" version = "0.2.6" @@ -8244,7 +8269,7 @@ dependencies = [ "fork-tree", "futures 0.3.19", "log 0.4.14", - "merlin", + "merlin 2.0.1", "num-bigint", "num-rational 0.2.4", "num-traits", @@ -8262,7 +8287,7 @@ dependencies = [ "sc-network", "sc-network-test", "sc-telemetry", - "schnorrkel", + "schnorrkel 0.10.2", "serde", "sp-api", "sp-application-crypto", @@ -9168,7 +9193,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.2", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -9176,6 +9201,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.1", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.2", + "serde_bytes", + "sha2 0.9.8", + "subtle-ng", + "zeroize", +] + [[package]] name = "scoped-tls" version = "1.0.0" @@ -9805,7 +9847,7 @@ name = "sp-consensus-babe" version = "0.10.0-dev" dependencies = [ "async-trait", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "scale-info", "serde", @@ -9851,7 +9893,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" dependencies = [ "parity-scale-codec", - "schnorrkel", + "schnorrkel 0.10.2", "sp-core", "sp-runtime", "sp-std", @@ -9877,7 +9919,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log 0.4.14", - "merlin", + "merlin 2.0.1", "num-traits", "parity-scale-codec", "parity-util-mem", @@ -9886,7 +9928,7 @@ dependencies = [ "rand 0.7.3", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.10.2", "secp256k1", "secrecy", "serde", @@ -10028,12 +10070,12 @@ version = "0.12.0" dependencies = [ "async-trait", "futures 0.3.19", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "rand_chacha 0.2.2", - "schnorrkel", + "schnorrkel 0.10.2", "serde", "sp-core", "sp-externalities", @@ -10537,7 +10579,7 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.8", "zeroize", ] @@ -10768,6 +10810,12 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.82" diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml index a135807d707e0..9b08ad5c875cd 100644 --- a/client/consensus/babe/Cargo.toml +++ b/client/consensus/babe/Cargo.toml @@ -46,7 +46,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../.. futures = "0.3.19" parking_lot = "0.12.0" log = "0.4.8" -schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] } +schnorrkel = { version = "0.10.2", features = ["preaudit_deprecated"] } rand = "0.7.2" merlin = "2.0" thiserror = "1.0" diff --git a/primitives/consensus/vrf/Cargo.toml b/primitives/consensus/vrf/Cargo.toml index 80d2d1ddb09d1..ff04d53ca531a 100644 --- a/primitives/consensus/vrf/Cargo.toml +++ b/primitives/consensus/vrf/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { version = "3.0.0", package = "parity-scale-codec", default-features = false } -schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false } +schnorrkel = { version = "0.10.2", features = ["preaudit_deprecated", "u64_backend"], default-features = false } sp-std = { version = "4.0.0", path = "../../std", default-features = false } sp-core = { version = "6.0.0", path = "../../core", default-features = false } sp-runtime = { version = "6.0.0", default-features = false, path = "../../runtime" } diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index 1effb8efbf5ae..37f9a0344c3f1 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -49,7 +49,7 @@ bitflags = "1.3" # full crypto ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true } blake2-rfc = { version = "0.2.18", default-features = false, optional = true } -schnorrkel = { version = "0.9.1", features = [ +schnorrkel = { version = "0.10.2", features = [ "preaudit_deprecated", "u64_backend", ], default-features = false, optional = true } diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml index 7b1d1dd4ebc4b..cc1b634430309 100644 --- a/primitives/keystore/Cargo.toml +++ b/primitives/keystore/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0", optional = true } thiserror = "1.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false } +schnorrkel = { version = "0.10.2", features = ["preaudit_deprecated", "u64_backend"], default-features = false } merlin = { version = "2.0", default-features = false } sp-core = { version = "6.0.0", path = "../core" } sp-externalities = { version = "0.12.0", path = "../externalities", default-features = false }