Skip to content

chore: resolve merge conflicts with main (v0.96)#84

Merged
Frando merged 3 commits inton0-computer:Frando/wasmfrom
cbenhagen:fix/wasm-merge-conflicts
Feb 24, 2026
Merged

chore: resolve merge conflicts with main (v0.96)#84
Frando merged 3 commits inton0-computer:Frando/wasmfrom
cbenhagen:fix/wasm-merge-conflicts

Conversation

@cbenhagen
Copy link
Copy Markdown
Contributor

Resolves merge conflicts so #75 can merge cleanly into current main (v0.96).

Changes

  • Update dependency versions to 0.96 era, keep default-features = false
  • Drop iroh-blobs git dep (wasm time fixes are in released v0.98)
  • Use IntoAddressLookup API (renamed from IntoDiscovery in 0.96)
  • Keep main's cargo docs-rs CI approach
  • Regenerate Cargo.lock

Verified

  • cargo build --target wasm32-unknown-unknown --no-default-features — builds successfully
  • wasm-tools print --skeleton — no import "env" leaks
  • cargo test --lib — all 69 native unit tests pass
  • cargo clippy (wasm target) — no warnings

ramfox and others added 3 commits January 28, 2026 21:19
## Description

Also upgrades:
- iroh-quinn
- iroh-blobs
- iroh-gossip
- irpc
- Update dependency versions to 0.96 era, keep default-features=false
- Drop iroh-blobs git dep, use released v0.98
- Use IntoAddressLookup API (renamed from IntoDiscovery in 0.96)
- Keep main's docs-rs CI approach
- Regenerate Cargo.lock
@cbenhagen cbenhagen mentioned this pull request Feb 20, 2026
4 tasks
@n0bot n0bot bot added this to iroh Feb 20, 2026
@github-project-automation github-project-automation bot moved this to 🚑 Needs Triage in iroh Feb 20, 2026
@ramfox ramfox moved this from 🚑 Needs Triage to 🏗 In progress in iroh Feb 23, 2026
@Frando Frando merged commit 38d8bbb into n0-computer:Frando/wasm Feb 24, 2026
@github-project-automation github-project-automation bot moved this from 🏗 In progress to ✅ Done in iroh Feb 24, 2026
@Frando
Copy link
Copy Markdown
Member

Frando commented Feb 24, 2026

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

3 participants