From 4f22f1214b184f243a5f3b2dba62d5bf811623d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 01:39:09 +0000
Subject: [PATCH] Bump merlin from 2.0.1 to 3.0.0

Bumps [merlin](https://github.com/zkcrypto/merlin) from 2.0.1 to 3.0.0.
- [Release notes](https://github.com/zkcrypto/merlin/releases)
- [Changelog](https://github.com/zkcrypto/merlin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/zkcrypto/merlin/compare/2.0.1...3.0.0)

---
updated-dependencies:
- dependency-name: merlin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                           | 22 +++++++++++++++++-----
 client/consensus/babe/Cargo.toml     |  2 +-
 primitives/consensus/babe/Cargo.toml |  2 +-
 primitives/core/Cargo.toml           |  2 +-
 primitives/keystore/Cargo.toml       |  2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5731874d8ca81..59b0939c2002d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4478,6 +4478,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"
@@ -8310,7 +8322,7 @@ dependencies = [
  "fork-tree",
  "futures 0.3.21",
  "log 0.4.14",
- "merlin",
+ "merlin 3.0.0",
  "num-bigint",
  "num-rational 0.2.4",
  "num-traits",
@@ -9253,7 +9265,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",
@@ -9881,7 +9893,7 @@ name = "sp-consensus-babe"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
- "merlin",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -9953,7 +9965,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log 0.4.14",
- "merlin",
+ "merlin 3.0.0",
  "num-traits",
  "parity-scale-codec",
  "parity-util-mem",
@@ -10104,7 +10116,7 @@ version = "0.12.0"
 dependencies = [
  "async-trait",
  "futures 0.3.21",
- "merlin",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "parking_lot 0.12.0",
  "rand 0.7.3",
diff --git a/client/consensus/babe/Cargo.toml b/client/consensus/babe/Cargo.toml
index 20cc359849f52..28f1b89c1c1ac 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -48,7 +48,7 @@ parking_lot = "0.12.0"
 log = "0.4.8"
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
 rand = "0.7.2"
-merlin = "2.0"
+merlin = "3.0"
 thiserror = "1.0"
 retain_mut = "0.1.4"
 async-trait = "0.1.50"
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 189dc5b2e80f7..54f39a879e3da 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "6.0.0", default-features = false, path = "../../application-crypto" }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
-merlin = { version = "2.0", default-features = false }
+merlin = { version = "3.0", default-features = false }
 sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
 sp-consensus = { version = "0.10.0-dev", optional = true, path = "../common" }
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 74a159b2e7d39..cd0a14a3d9117 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -55,7 +55,7 @@ schnorrkel = { version = "0.9.1", features = [
 ], default-features = false, optional = true }
 hex = { version = "0.4", default-features = false, optional = true }
 libsecp256k1 = { version = "0.7", default-features = false, features = ["static-context"], optional = true }
-merlin = { version = "2.0", default-features = false, optional = true }
+merlin = { version = "3.0", default-features = false, optional = true }
 secp256k1 = { version = "0.21.2", default-features = false, features = ["recovery", "alloc"], optional = true }
 ss58-registry = { version = "1.11.0", default-features = false }
 sp-core-hashing = { version = "4.0.0", path = "./hashing", default-features = false, optional = true }
diff --git a/primitives/keystore/Cargo.toml b/primitives/keystore/Cargo.toml
index f201cb8518bc6..f827501f10330 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -21,7 +21,7 @@ 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 }
-merlin = { version = "2.0", default-features = false }
+merlin = { version = "3.0", default-features = false }
 sp-core = { version = "6.0.0", path = "../core" }
 sp-externalities = { version = "0.12.0", path = "../externalities", default-features = false }