From 9d82a58a35a28c8f20a48e2c406e7b3486cb5ab7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 13:31:40 +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 17d2e82596526..3c8472ff911da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4248,6 +4248,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 = "minimal-lexical"
 version = "0.2.1"
@@ -8036,7 +8048,7 @@ dependencies = [
  "fork-tree",
  "futures",
  "log",
- "merlin",
+ "merlin 3.0.0",
  "num-bigint",
  "num-rational 0.2.4",
  "num-traits",
@@ -9038,7 +9050,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",
@@ -9627,7 +9639,7 @@ name = "sp-consensus-babe"
 version = "0.10.0-dev"
 dependencies = [
  "async-trait",
- "merlin",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -9700,7 +9712,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "merlin",
+ "merlin 3.0.0",
  "num-traits",
  "parity-scale-codec",
  "parity-util-mem",
@@ -9851,7 +9863,7 @@ version = "0.12.0"
 dependencies = [
  "async-trait",
  "futures",
- "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 765fc367f424f..c4115749f1e53 100644
--- a/client/consensus/babe/Cargo.toml
+++ b/client/consensus/babe/Cargo.toml
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
 ] }
 futures = "0.3.21"
 log = "0.4.17"
-merlin = "2.0"
+merlin = "3.0"
 num-bigint = "0.2.3"
 num-rational = "0.2.2"
 num-traits = "0.2.8"
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 736a78ab67b1a..40c4623ebb906 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { version = "0.1.50", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-merlin = { version = "2.0", default-features = false }
+merlin = { version = "3.0", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.136", features = ["derive"], optional = true }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index cdc12c677e4f3..ee896390f7769 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.18.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 3c3b7933c50da..49e13a4042d2f 100644
--- a/primitives/keystore/Cargo.toml
+++ b/primitives/keystore/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = "0.1.50"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 futures = "0.3.21"
-merlin = { version = "2.0", default-features = false }
+merlin = { version = "3.0", default-features = false }
 parking_lot = { version = "0.12.0", default-features = false }
 schnorrkel = { version = "0.9.1", default-features = false, features = ["preaudit_deprecated", "u64_backend"] }
 serde = { version = "1.0", optional = true }