Skip to content
This repository was archived by the owner on Oct 3, 2025. It is now read-only.

Commit 4f22f12

Browse files
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](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] <[email protected]>
1 parent 1f4cd99 commit 4f22f12

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

Cargo.lock

Lines changed: 17 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/consensus/babe/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ parking_lot = "0.12.0"
4848
log = "0.4.8"
4949
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated"] }
5050
rand = "0.7.2"
51-
merlin = "2.0"
51+
merlin = "3.0"
5252
thiserror = "1.0"
5353
retain_mut = "0.1.4"
5454
async-trait = "0.1.50"

primitives/consensus/babe/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1616
sp-application-crypto = { version = "6.0.0", default-features = false, path = "../../application-crypto" }
1717
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1818
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
19-
merlin = { version = "2.0", default-features = false }
19+
merlin = { version = "3.0", default-features = false }
2020
sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
2121
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
2222
sp-consensus = { version = "0.10.0-dev", optional = true, path = "../common" }

primitives/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ schnorrkel = { version = "0.9.1", features = [
5555
], default-features = false, optional = true }
5656
hex = { version = "0.4", default-features = false, optional = true }
5757
libsecp256k1 = { version = "0.7", default-features = false, features = ["static-context"], optional = true }
58-
merlin = { version = "2.0", default-features = false, optional = true }
58+
merlin = { version = "3.0", default-features = false, optional = true }
5959
secp256k1 = { version = "0.21.2", default-features = false, features = ["recovery", "alloc"], optional = true }
6060
ss58-registry = { version = "1.11.0", default-features = false }
6161
sp-core-hashing = { version = "4.0.0", path = "./hashing", default-features = false, optional = true }

primitives/keystore/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ thiserror = "1.0"
2121

2222
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
2323
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
24-
merlin = { version = "2.0", default-features = false }
24+
merlin = { version = "3.0", default-features = false }
2525
sp-core = { version = "6.0.0", path = "../core" }
2626
sp-externalities = { version = "0.12.0", path = "../externalities", default-features = false }
2727

0 commit comments

Comments
 (0)