Skip to content

Commit

Permalink
Bump merlin from 2.0.1 to 3.0.0
Browse files Browse the repository at this point in the history
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](zkcrypto/merlin@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>
  • Loading branch information
dependabot[bot] authored Mar 9, 2022
1 parent 9d96262 commit e89190a
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
22 changes: 17 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ parking_lot = "0.11.2"
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"
Expand Down
2 changes: 1 addition & 1 deletion primitives/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-application-crypto = { version = "5.0.0", default-features = false, path = "../../application-crypto" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
scale-info = { version = "1.0", 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" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ sha2 = { version = "0.10.0", default-features = false, optional = true }
hex = { version = "0.4", default-features = false, optional = true }
twox-hash = { version = "1.6.2", default-features = false, optional = true }
libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true }
merlin = { version = "2.0", default-features = false, optional = true }
merlin = { version = "3.0", default-features = false, 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 }
sp-runtime-interface = { version = "5.0.0", default-features = false, path = "../runtime-interface" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/keystore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ thiserror = "1.0"

codec = { package = "parity-scale-codec", version = "2.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 = "5.0.0", path = "../core" }
sp-externalities = { version = "0.11.0", path = "../externalities", default-features = false }

Expand Down

0 comments on commit e89190a

Please sign in to comment.