Merge branch 'master' into web-transport-quic

libp2p · Dec 29, 2023 · c1dca8c · c1dca8c
2 parents 94fd970 + 4fc911e
commit c1dca8c
Show file tree

Hide file tree

Showing 51 changed files with 60 additions and 60 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -24,7 +24,7 @@ jobs:
         echo "<meta http-equiv=\"refresh\" content=\"0; url=libp2p\">" > target/doc/index.html
         cp -r target/doc/* ./host-docs
     - name: Upload documentation
-      uses: actions/upload-pages-artifact@v2.0.0
+      uses: actions/upload-pages-artifact@v3.0.0
       with:
         path: "host-docs/"
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 either = "1.9"
 fnv = "1.0"
-futures = { version = "0.3.29", features = ["executor", "thread-pool"] }
+futures = { version = "0.3.30", features = ["executor", "thread-pool"] }
 futures-timer = "3"
 instant = "0.1.12"
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }

diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
@@ -17,7 +17,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 anyhow = "1.0.76"
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 tokio = { version = "1.35", features = ["full"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0"
 libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
 log = "0.4"

diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
@@ -13,7 +13,7 @@ serde = { version = "1.0", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 clap = { version = "4.4.11", features = ["derive"] }
 either = "1.9"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
@@ -13,7 +13,7 @@ tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
 async-trait = "0.1"
 clap = { version = "4.4.11", features = ["derive"] }
 env_logger = "0.10"
-futures = "0.3.29"
+futures = "0.3.30"
 anyhow = "1.0.76"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing = "0.1.37"

diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "io-std"] }
 async-trait = "0.1"
 either = "1.9"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
 libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
 opentelemetry = { version = "0.20.0", features = ["rt-tokio", "metrics"] }

diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.35.1", features = ["full"] }
 tracing = "0.1.37"

diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 clap = { version = "4.4.11", features = ["derive"] }
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.2"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
@@ -11,7 +11,7 @@ release = false
 [dependencies]
 async-std = { version = "1.12", features = ["attributes"] }
 async-trait = "0.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
 tokio = { version = "1.35", features = ["rt-multi-thread", "macros", "time"] }
 tracing = "0.1.37"

diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 

diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1"
 env_logger = "0.10.1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
 tracing = "0.1.37"
 redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }

diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 anyhow = "1"
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1.37"

diff --git a/misc/futures-bounded/Cargo.toml b/misc/futures-bounded/Cargo.toml
@@ -18,7 +18,7 @@ futures-timer = "3.0.2"
 
 [dev-dependencies]
 tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
-futures = "0.3.28"
+futures = "0.3.30"
 
 [lints]
 workspace = true
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -19,7 +19,7 @@ ping = ["libp2p-ping"]
 relay = ["libp2p-relay"]
 
 [dependencies]
-futures = "0.3.26"
+futures = "0.3.30"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }

diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
@@ -19,7 +19,7 @@ quick-protobuf = "0.8"
 
 [dev-dependencies]
 criterion = "0.5.1"
-futures = "0.3.28"
+futures = "0.3.30"
 quickcheck = { workspace = true }
 
 [[bench]]

diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 pin-project = "1.1.3"
 static_assertions = "1"
 

diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 bytes = "1"
-futures = "0.3.29"
+futures = "0.3.30"
 asynchronous-codec = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
@@ -12,7 +12,7 @@ release = false
 
 [dependencies]
 libp2p-core = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 futures_ringbuf = "0.4.0"
 tracing = "0.1.37"

diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 thiserror = "1.0"
 yamux012 = { version = "0.12.1", package = "yamux" }

diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0"
 instant = "0.1.12"
 libp2p-core = { workspace = true }

diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
@@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
 cuckoofilter = "0.5.0"
 fnv = "1.0"
 bytes = "1.5"
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }

diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -20,7 +20,7 @@ byteorder = "1.5.0"
 bytes = "1.5"
 either = "1.9"
 fnv = "1.0.7"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-ticker = "0.0.3"
 getrandom = "0.2.11"
 hex_fmt = "0.3.0"

diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 futures-bounded = { workspace = true }
 libp2p-core = { workspace = true }

diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "1"
 either = "1.9"
 fnv = "1.0"
 asynchronous-codec = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 futures-bounded = { workspace = true }

diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.2.2", optional = true }
 data-encoding = "2.5.0"
-futures = "0.3.29"
+futures = "0.3.30"
 if-watch = "3.2.0"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }

diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 anyhow = "1"
 clap = { version = "4.4.11", features = ["derive"] }
-futures = "0.3.29"
+futures = "0.3.30"
 futures-bounded = { workspace = true }
 futures-timer = "3.0"
 instant = "0.1.12"

diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 instant = "0.1.12"
 libp2p-core = { workspace = true }

diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 asynchronous-codec = { workspace = true }
 bytes = "1"
 either = "1.9.0"
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3"
 futures-bounded = { workspace = true }
 instant = "0.1.12"

diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 async-trait = "0.1"
 cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
-futures = "0.3.29"
+futures = "0.3.30"
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }

diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["network-programming", "asynchronous"]
 publish = true
 
 [dependencies]
-futures = "0.3.29"
+futures = "0.3.30"
 futures-timer = "3.0.2"
 igd-next = "0.14.2"
 libp2p-core = { workspace = true }

diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
@@ -19,7 +19,7 @@ libp2p-plaintext = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["async-std"] }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 libp2p-yamux = { workspace = true }
-futures = "0.3.29"
+futures = "0.3.30"
 rand = "0.8.5"
 tracing = "0.1.37"
 futures-timer = "3.0.2"