diff --git a/Cargo.lock b/Cargo.lock index ba64b224a..fb7058c83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4151,9 +4151,9 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merlin" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78" +checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" dependencies = [ "byteorder", "keccak", @@ -4161,6 +4161,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.1", + "zeroize", +] + [[package]] name = "metered-channel" version = "0.9.9" @@ -6078,7 +6090,7 @@ dependencies = [ "kvdb-memorydb", "lru", "maplit", - "merlin", + "merlin 3.0.0", "parity-scale-codec", "parking_lot 0.11.1", "polkadot-node-jaeger", @@ -8379,7 +8391,7 @@ dependencies = [ "fork-tree", "futures 0.3.16", "log", - "merlin", + "merlin 2.0.1", "num-bigint", "num-rational 0.2.4", "num-traits", @@ -9143,7 +9155,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.0", "getrandom 0.1.14", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -9652,7 +9664,7 @@ version = "0.10.0-dev" source = "git+https://github.com/compound-finance/substrate?branch=gateway#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "serde", "sp-api", @@ -9708,7 +9720,7 @@ dependencies = [ "lazy_static", "libsecp256k1 0.6.0", "log", - "merlin", + "merlin 2.0.1", "num-traits", "parity-scale-codec", "parity-util-mem", @@ -9839,7 +9851,7 @@ dependencies = [ "async-trait", "derive_more", "futures 0.3.16", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.11.1", "schnorrkel", diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml index fe9013bb5..3953f9557 100644 --- a/node/core/approval-voting/Cargo.toml +++ b/node/core/approval-voting/Cargo.toml @@ -11,7 +11,7 @@ parity-scale-codec = { version = "2.0.0", default-features = false, features = [ tracing = "0.1.26" bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } lru = "0.6" -merlin = "2.0" +merlin = "3.0" schnorrkel = "0.9.1" kvdb = "0.10.0" derive_more = "0.99.14"