diff --git a/Cargo.lock b/Cargo.lock index 7e6f6123422e..c17e1998ca8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1352,6 +1352,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.3", + "subtle-ng", + "zeroize", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -4251,6 +4264,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.3", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -6155,7 +6180,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.5.1", - "schnorrkel", + "schnorrkel 0.10.2", "sp-authority-discovery", "sp-core", "tracing-gum", @@ -6486,7 +6511,7 @@ dependencies = [ "kvdb", "kvdb-memorydb", "lru 0.8.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-jaeger", @@ -6499,7 +6524,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand_core 0.5.1", "sc-keystore", - "schnorrkel", + "schnorrkel 0.10.2", "sp-application-crypto", "sp-consensus", "sp-consensus-babe", @@ -6865,7 +6890,7 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-parachain", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.10.2", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -8877,7 +8902,7 @@ dependencies = [ "fork-tree", "futures", "log", - "merlin", + "merlin 2.0.1", "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", @@ -8890,7 +8915,7 @@ dependencies = [ "sc-consensus-slots", "sc-keystore", "sc-telemetry", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-api", "sp-application-crypto", @@ -9741,7 +9766,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -9749,6 +9774,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.2", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.3", + "serde_bytes", + "sha2 0.9.8", + "subtle-ng", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -9867,6 +9909,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.137" @@ -10306,7 +10357,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50f9028ecba9bdbd3004e7f3f228f5" dependencies = [ "async-trait", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "scale-info", "serde", @@ -10344,7 +10395,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50 dependencies = [ "parity-scale-codec", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "sp-core", "sp-runtime", "sp-std", @@ -10369,7 +10420,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "num-traits", "parity-scale-codec", "parity-util-mem", @@ -10378,7 +10429,7 @@ dependencies = [ "rand 0.7.3", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", @@ -10527,10 +10578,10 @@ source = "git+https://github.com/paritytech/substrate?branch=master#f3139874cb50 dependencies = [ "async-trait", "futures", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-core", "sp-externalities", @@ -11078,7 +11129,7 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.8", "zeroize", ] @@ -11216,6 +11267,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "sval" version = "1.0.0-alpha.5" diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index 25fb51eb712b..84b13794c218 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -12,7 +12,7 @@ gum = { package = "tracing-gum", path = "../../gum" } bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } lru = "0.8" merlin = "2.0" -schnorrkel = "0.9.1" +schnorrkel = "0.10.2" kvdb = "0.12.0" derive_more = "0.99.17" thiserror = "1.0.31" diff --git a/node/network/approval-distribution/Cargo.toml b/node/network/approval-distribution/Cargo.toml index fa0e4fff2c91..85a1b604d107 100644 --- a/node/network/approval-distribution/Cargo.toml +++ b/node/network/approval-distribution/Cargo.toml @@ -24,7 +24,7 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" } polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" } assert_matches = "1.4.0" -schnorrkel = { version = "0.9.1", default-features = false } +schnorrkel = { version = "0.10.2", default-features = false } rand_core = "0.5.1" # should match schnorrkel rand_chacha = "0.3.1" env_logger = "0.9.0" diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 2e916df6a87e..6107f1a507bc 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -17,7 +17,7 @@ sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" } polkadot-parachain = { path = "../../parachain", default-features = false } -schnorrkel = "0.9.1" +schnorrkel = "0.10.2" thiserror = "1.0.31" serde = { version = "1.0.137", features = ["derive"] }