Skip to content

chore(iroh): Update hickory to 0.26.0-beta.4 and use exact-version deps for prereleased crates #4117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dignifiedquire merged 6 commits into from
Apr 16, 2026
Merged

chore(iroh): Update hickory to 0.26.0-beta.4 and use exact-version deps for prereleased crates #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aca5ef6
chore(iroh): Update hickory to 0.26.0-beta.4
matheus23 Apr 14, 2026
56ffcde
Fix contradicting version bounds
matheus23 Apr 14, 2026
c3d6f77
Fix contradicting `sha1` version bound
matheus23 Apr 14, 2026
fe61787
Use correct swarm-discovery version bound
matheus23 Apr 14, 2026
03e0e5d
Update to released swarm-discovery
matheus23 Apr 16, 2026
81473e7
fixup
dignifiedquire Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions iroh-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ time = { version = "0.3.37", optional = true }
tokio-rustls-acme = { version = "0.9", optional = true }
tokio-websockets = { version = "0.13", features = ["rustls-bring-your-own-connector", "getrandom", "rand", "server", "sha1_smol"], optional = true } # server-side websocket implementation
simdutf8 = { version = "0.1.5", optional = true } # minimal version fix
sha1 = { version = "0.11.0-rc.2", optional = true }
sha1 = { version = "=0.11.0-rc.5", optional = true }
Comment thread
matheus23 marked this conversation as resolved.
toml = { version = "1.0", optional = true }
serde_json = { version = "1", optional = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true }

# non-wasm-in-browser dependencies
[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
hickory-resolver = { version = "=0.26.0-beta.1", features = ["tokio", "system-config"] }
hickory-resolver = { version = "=0.26.0-beta.4", features = ["tokio", "system-config"] }
tokio = { version = "1", features = [
"io-util",
"macros",
Expand Down
8 changes: 4 additions & 4 deletions iroh-relay/src/dns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ impl Resolver for HickoryResolver {
let lookup = resolver.ipv4_lookup(host).await?;
let iter: BoxIter<Ipv4Addr> =
Box::new(lookup.answers().to_vec().into_iter().filter_map(|record| {
match record.data() {
match &record.data {
RData::A(addr) => Some(addr.0),
_ => None,
}
Expand All @@ -600,7 +600,7 @@ impl Resolver for HickoryResolver {
let lookup = resolver.ipv6_lookup(host).await?;
let iter: BoxIter<Ipv6Addr> =
Box::new(lookup.answers().to_vec().into_iter().filter_map(|record| {
match record.data() {
match &record.data {
RData::AAAA(addr) => Some(addr.0),
_ => None,
}
Expand All @@ -615,12 +615,12 @@ impl Resolver for HickoryResolver {
let lookup = resolver.txt_lookup(host).await?;
let iter: BoxIter<TxtRecordData> =
Box::new(lookup.answers().to_vec().into_iter().filter_map(|record| {
match record.data() {
match &record.data {
RData::TXT(txt) => {
// I don't know a way of avoiding this deep copy, even if it's agonizing.
// The representation of `TxtRecrodData` and `hickory_proto::rr::rdata::TXT`
// is identical.
Some(TxtRecordData::from(txt.txt_data().to_vec()))
Some(TxtRecordData::from(txt.txt_data.to_vec()))
}
_ => None,
}
Expand Down
4 changes: 2 additions & 2 deletions iroh-relay/src/endpoint_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,8 +961,8 @@ mod tests {
let lookup = lookup
.answers()
.iter()
.filter_map(|record| match record.data() {
RData::TXT(txt) => Some(TxtRecordData::from(txt.txt_data().to_vec())),
.filter_map(|record| match &record.data {
RData::TXT(txt) => Some(TxtRecordData::from(txt.txt_data.to_vec())),
_ => None,
});

Expand Down
7 changes: 4 additions & 3 deletions iroh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bytes = "1.11"
ctutils = { version = "0.4.0", default-features = false }
data-encoding = "2.2"
derive_more = { version = "2.0.1", features = ["debug", "display", "from", "try_into", "deref", "from_str", "into_iterator"] }
ed25519-dalek = { version = "3.0.0-pre.1", features = ["serde", "rand_core", "zeroize", "pkcs8", "pem"] }
ed25519-dalek = { version = "=3.0.0-pre.6", features = ["serde", "rand_core", "zeroize", "pkcs8", "pem"] }
Comment thread
matheus23 marked this conversation as resolved.
http = "1"
ipnet = "2"
iroh-base = { version = "0.97.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
Expand Down Expand Up @@ -69,7 +69,7 @@ pkcs8 = "0.11.0-rc.9"
iroh-metrics = { version = "0.38", default-features = false }

# mdns
swarm-discovery = { version = "0.6.0-alpha.1", optional = true }
swarm-discovery = { version = "=0.6.0-alpha.2", optional = true }
futures-util = "0.3"

# test_utils
Expand All @@ -78,7 +78,8 @@ sync_wrapper = { version = "1.0.2", features = ["futures"] }

# non-wasm-in-browser dependencies
[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
hickory-resolver = { version = "=0.26.0-beta.1", default-features = false }

hickory-resolver = { version = "=0.26.0-beta.4", default-features = false }
portmapper = { version = "0.16", optional = true, default-features = false }
noq = { version = "0.18.0", default-features = false, features = ["runtime-tokio", "rustls"] }
tokio = { version = "1", features = [
Expand Down
6 changes: 3 additions & 3 deletions iroh/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ pub(crate) mod dns_server {
buf: &[u8],
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
let packet = Message::from_bytes(buf)?;
debug!(queries = ?packet.queries(), %from, "received query");
let mut reply = packet.to_response();
debug!(queries = ?packet.queries, %from, "received query");
let mut reply = packet.clone().into_response();
self.resolver.resolve(&packet, &mut reply).await?;
debug!(?reply, %from, "send reply");
let buf = reply.to_vec()?;
Expand Down Expand Up @@ -449,7 +449,7 @@ pub(crate) mod pkarr_dns_state {
reply: &mut hickory_resolver::proto::op::Message,
ttl: u32,
) -> std::io::Result<()> {
for query in query.queries() {
for query in &query.queries {
let domain_name = query.name().to_string();
let Some(endpoint_id) = endpoint_id_from_domain_name(&domain_name) else {
continue;
Expand Down
Loading