Merge branch 'main' into b5/iroh_start_simple

.github/workflows/ci.yml

@@ -50,6 +50,14 @@ jobs:
         echo "RELEASE_ARCH=${{ matrix.release-arch }}" >> $GITHUB_ENV
         echo "RELEASE_OS=${{ matrix.release-os }}" >> $GITHUB_ENV
     
+    - name: Claim back some disk space (ubuntu-latest)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /opt/ghc
+        sudo rm -rf "/usr/local/share/boost"
+        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
     - name: Install sccache (ubuntu-latest)
       if: matrix.os == 'ubuntu-latest'
       env:

Cargo.toml

@@ -25,7 +25,7 @@ members = [
 resolver = "2"
 
 [patch.crates-io]
-libp2p = { git = "https://github.com/dignifiedquire/rust-libp2p", branch = "iroh-0-49" }
+libp2p = { git = "https://github.com/dignifiedquire/rust-libp2p", branch = "iroh-0-50" }
 # libp2p = { path = "../rust-libp2p" }
 
 [profile.ci]

iroh-api/Cargo.toml

@@ -21,7 +21,7 @@ anyhow = "1"
 async-trait = "0.1.53"
 tokio = { version = "1" }
 bytes = "1.1.0"
-libp2p = "0.49"
+libp2p = "0.50"
 tracing = "0.1.34"
 futures = "0.3.21"
 async-stream = "0.3.3"

iroh-bitswap/Cargo.toml

@@ -15,7 +15,7 @@ tokio = { version = "1", features = ["sync"] }
 bytes = "1.1.0"
 cid = "0.8.0"
 futures = "0.3.21"
-libp2p = { version = "0.49", default-features = false, features = ["ping"] }
+libp2p = { version = "0.50", default-features = false, features = ["ping"] }
 multihash = "0.16.0"
 prost = "0.11"
 thiserror = "1.0.20"
@@ -41,11 +41,14 @@ derivative = "2.2.0"
 async-channel = "1.7.1"
 awaitgroup = "0.6.0"
 async-broadcast = "0.4.1"
+tokio-stream = "0.1.11"
+tokio-context = "0.1.3"
+deadqueue = "0.2.3"
 
 [dev-dependencies]
 criterion = "0.4.0"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
-libp2p = { version = "0.49", features = ["yamux", "noise", "tcp-tokio"], default-features = false }
+libp2p = { version = "0.50", features = ["yamux", "noise", "tcp", "tokio"], default-features = false }
 tokio = { version = "1", features = ["macros", "net", "rt"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 

iroh-bitswap/src/client.rs

@@ -20,7 +20,6 @@ mod block_presence_manager;
 mod message_queue;
 mod peer_manager;
 mod peer_want_manager;
-mod provider_query_manager;
 mod session;
 mod session_interest_manager;
 mod session_manager;