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

Commit 9d82a58

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 5f0aa1f commit 9d82a58

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
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
2020
] }
2121
futures = "0.3.21"
2222
log = "0.4.17"
23-
merlin = "2.0"
23+
merlin = "3.0"
2424
num-bigint = "0.2.3"
2525
num-rational = "0.2.2"
2626
num-traits = "0.2.8"

primitives/consensus/babe/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1515
[dependencies]
1616
async-trait = { version = "0.1.50", optional = true }
1717
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
18-
merlin = { version = "2.0", default-features = false }
18+
merlin = { version = "3.0", default-features = false }
1919
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
2020
serde = { version = "1.0.136", features = ["derive"], optional = true }
2121
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }

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.18.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
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1616
async-trait = "0.1.50"
1717
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
1818
futures = "0.3.21"
19-
merlin = { version = "2.0", default-features = false }
19+
merlin = { version = "3.0", default-features = false }
2020
parking_lot = { version = "0.12.0", default-features = false }
2121
schnorrkel = { version = "0.9.1", default-features = false, features = ["preaudit_deprecated", "u64_backend"] }
2222
serde = { version = "1.0", optional = true }

0 commit comments

Comments
 (0)