From e4b275232a28a1434e6b890977f884103c91d0cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 02:00:20 +0000
Subject: [PATCH] Bump merlin from 2.0.0 to 3.0.0

Bumps [merlin](https://github.com/zkcrypto/merlin) from 2.0.0 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.0...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                           | 24 ++++++++++++++++++------
 node/core/approval-voting/Cargo.toml |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e6f6123422e..b46e3731976e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4251,6 +4251,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"
@@ -6486,7 +6498,7 @@ dependencies = [
  "kvdb",
  "kvdb-memorydb",
  "lru 0.8.0",
- "merlin",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "polkadot-node-jaeger",
@@ -8877,7 +8889,7 @@ dependencies = [
  "fork-tree",
  "futures",
  "log",
- "merlin",
+ "merlin 2.0.1",
  "num-bigint 0.2.6",
  "num-rational 0.2.4",
  "num-traits",
@@ -9741,7 +9753,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",
@@ -10306,7 +10318,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",
@@ -10369,7 +10381,7 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "merlin",
+ "merlin 2.0.1",
  "num-traits",
  "parity-scale-codec",
  "parity-util-mem",
@@ -10527,7 +10539,7 @@ 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",
diff --git a/node/core/approval-voting/Cargo.toml b/node/core/approval-voting/Cargo.toml
index 25fb51eb712b..5d895f628620 100644
--- a/node/core/approval-voting/Cargo.toml
+++ b/node/core/approval-voting/Cargo.toml
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.1.5", default-features = false, features = [
 gum = { package = "tracing-gum", path = "../../gum" }
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 lru = "0.8"
-merlin = "2.0"
+merlin = "3.0"
 schnorrkel = "0.9.1"
 kvdb = "0.12.0"
 derive_more = "0.99.17"