Skip to content

Commit

Permalink
fix: lock version of hickory-client (#6716)
Browse files Browse the repository at this point in the history
### [ Motivation ]

Solves issues in repositories:
`universe`  => https://github.com/tari-project/universe
`tarigpuminer` => https://github.com/stringhandler/tarigpuminer

From what I understand `hickory-client` was implemented on version
`0.25.0-alpha.2`. Since that time there was release for version
`0.25.0-alpha.3` and `0.25.0-alpha.4` with breaking changes which
require code adjustments. Because we didn't lock version to
`0.25.0-alpha.2` here, in mentioned repositories during build when it
comes to building tari_core => tari_p2p it tries to use versions higher
then `0.25.0-alpha.2` which breaks the build. It also happens in this
repository when you delete Cargo.lock file.

To this moment we patched this in mentioned repositories by including
these packages with locked versions in Cargo.toml but it cause other
smaller problems
  • Loading branch information
Misieq01 authored Dec 9, 2024
1 parent d339598 commit 5f23ff0
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Cargo.lock

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

10 changes: 9 additions & 1 deletion base_layer/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,11 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
"keccak",
] }
dirs-next = "1.0.2"
hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dnssec-openssl"], optional = true }
hickory-client = { version = "=0.25.0-alpha.2", features = [
"dns-over-rustls",
"dnssec-openssl",
], optional = true }
hickory-proto = { version = "=0.25.0-alpha.2" }
anyhow = "1.0.53"

[dev-dependencies]
Expand Down Expand Up @@ -126,3 +130,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
'cfg(tari_target_network_nextnet)',
'cfg(tari_target_network_testnet)',
] }


[package.metadata.cargo-machete]
ignored = ["hickory-proto"]
11 changes: 9 additions & 2 deletions base_layer/p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ pgp = { version = "0.10", optional = true }
prost = "0.13.3"
rand = "0.8"
reqwest = { version = "0.11", optional = true, default-features = false }
rustls = { version = "0.23.13", default-features = false, features = ["logging", "std", "tls12"] }
rustls = { version = "0.23.13", default-features = false, features = [
"logging",
"std",
"tls12",
] }
semver = { version = "1.0.1", optional = true }
serde = "1.0.90"
thiserror = "1.0.26"
Expand All @@ -37,8 +41,9 @@ tokio-stream = { version = "0.1.9", default-features = false, features = [
"time",
] }
tower = "0.4.11"
hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls"] }
hickory-client = { version = "=0.25.0-alpha.2", features = ["dns-over-rustls"] }
hickory-resolver = "0.25.0-alpha.2"
hickory-proto = { version = "=0.25.0-alpha.2" }
webpki-roots = "0.26.6"

[dev-dependencies]
Expand All @@ -58,3 +63,5 @@ tari_common = { path = "../../common", features = [
test-mocks = []
auto-update = ["reqwest/default", "pgp", "semver"]

[package.metadata.cargo-machete]
ignored = ["hickory-proto"]

0 comments on commit 5f23ff0

Please sign in to comment.