Bump merlin from 2.0.1 to 3.0.0 (#22331)

* 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>

* [auto-commit] Update all Cargo lock files

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <dependabot-buildkite@noreply.solana.com>
This commit is contained in:
dependabot[bot] 2022-01-10 11:18:15 -07:00 committed by GitHub
parent 04a2c19c87
commit 0869f644fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

6
Cargo.lock generated
View File

@ -2525,13 +2525,13 @@ dependencies = [
[[package]]
name = "merlin"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
dependencies = [
"byteorder",
"keccak",
"rand_core 0.5.1",
"rand_core 0.6.3",
"zeroize",
]

View File

@ -1623,13 +1623,13 @@ dependencies = [
[[package]]
name = "merlin"
version = "2.0.1"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
dependencies = [
"byteorder 1.4.3",
"keccak",
"rand_core 0.5.1",
"rand_core 0.6.3",
"zeroize",
]

View File

@ -23,7 +23,7 @@ cipher = "0.3"
curve25519-dalek = { version = "3.2.0", features = ["serde"]}
getrandom = { version = "0.1", features = ["dummy"] }
lazy_static = "1.4.0"
merlin = "2"
merlin = "3"
rand = "0.7"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"