From e5cfe33d3e67fe215d2cda3fcb4d2647a82e2265 Mon Sep 17 00:00:00 2001 From: Misieq01 Date: Fri, 6 Dec 2024 13:18:25 +0100 Subject: [PATCH 1/2] mvp --- Cargo.lock | 2 ++ base_layer/core/Cargo.toml | 6 +++++- base_layer/p2p/Cargo.toml | 10 +++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index feaa1927c5..b49daf934c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6650,6 +6650,7 @@ dependencies = [ "futures 0.3.29", "hex", "hickory-client", + "hickory-proto", "integer-encoding", "libsqlite3-sys", "lmdb-zero", @@ -6892,6 +6893,7 @@ dependencies = [ "fs2", "futures 0.3.29", "hickory-client", + "hickory-proto", "hickory-resolver", "lmdb-zero", "log", diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 0b7a7b11bb..a92814f981 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -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] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 5cb7b19714..2a0d19865a 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -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" @@ -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] @@ -57,4 +62,3 @@ tari_common = { path = "../../common", features = [ [features] test-mocks = [] auto-update = ["reqwest/default", "pgp", "semver"] - From 4cf1fee209c499a25cac9ef8148545894a35b68e Mon Sep 17 00:00:00 2001 From: Misieq01 Date: Mon, 9 Dec 2024 09:24:54 +0100 Subject: [PATCH 2/2] add hickory-proto to machete ignored --- base_layer/core/Cargo.toml | 4 ++++ base_layer/p2p/Cargo.toml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index a92814f981..488a487bd5 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -130,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"] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 2a0d19865a..01e7d5f154 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -62,3 +62,6 @@ tari_common = { path = "../../common", features = [ [features] test-mocks = [] auto-update = ["reqwest/default", "pgp", "semver"] + +[package.metadata.cargo-machete] +ignored = ["hickory-proto"]