Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/futures-rustls-0.26.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs authored Mar 25, 2024
2 parents 3c5e09e + 38e2f7a commit 639b306
Show file tree
Hide file tree
Showing 22 changed files with 136 additions and 135 deletions.
209 changes: 105 additions & 104 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ quick-protobuf = "0.8"
rand = "0.8"
rw-stream-sink = { workspace = true }
serde = { version = "1", optional = true, features = ["derive"] }
smallvec = "1.13.1"
smallvec = "1.13.2"
thiserror = "1.0"
tracing = "0.1.37"
unsigned-varint = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webrtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tracing = "0.1.37"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
axum = "0.7.4"
axum = "0.7.5"
libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
libp2p-webrtc = { workspace = true, features = ["tokio"] }
rust-embed = { version = "8.3.0", features = ["include-exclude", "interpolate-folder-path"] }
Expand Down
8 changes: 4 additions & 4 deletions examples/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ release = false
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.21.0", features = ["metrics"] }
opentelemetry-otlp = { version = "0.14.0", features = ["metrics"] }
opentelemetry_sdk = { version = "0.21.2", features = ["rt-tokio", "metrics"] }
opentelemetry = { version = "0.22.0", features = ["metrics"] }
opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] }
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "metrics"] }
prometheus-client = { workspace = true }
tokio = { version = "1", features = ["full"] }
tracing = "0.1.37"
tracing-opentelemetry = "0.22.0"
tracing-opentelemetry = "0.23.0"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["cryptography"]

[dependencies]
asn1_der = { version = "0.7.6", optional = true }
bs58 = { version = "0.5.0", optional = true }
bs58 = { version = "0.5.1", optional = true }
ed25519-dalek = { version = "2.1", optional = true }
hkdf = { version = "0.12.4", optional = true }
libsecp256k1 = { version = "0.7.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion misc/multistream-select/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bytes = "1"
futures = "0.3"
tracing = "0.1.37"
pin-project = "1.1.4"
smallvec = "1.13.1"
smallvec = "1.13.2"
unsigned-varint = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion muxers/mplex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libp2p-identity = { workspace = true }
nohash-hasher = "0.2"
parking_lot = "0.12"
rand = "0.8"
smallvec = "1.13.1"
smallvec = "1.13.2"
tracing = "0.1.37"
unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }

Expand Down
6 changes: 3 additions & 3 deletions protocols/floodsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = { workspace = true }
cuckoofilter = "0.5.0"
fnv = "1.0"
bytes = "1.5"
bytes = "1.6"
futures = "0.3.30"
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true }
quick-protobuf = "0.8"
quick-protobuf-codec = { workspace = true }
rand = "0.8"
smallvec = "1.13.1"
thiserror = "1.0.57"
smallvec = "1.13.2"
thiserror = "1.0.58"
tracing = "0.1.37"

# Passing arguments to the docsrs builder in order to properly document cfg's.
Expand Down
6 changes: 3 additions & 3 deletions protocols/gossipsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
asynchronous-codec = { workspace = true }
base64 = "0.21.7"
byteorder = "1.5.0"
bytes = "1.5"
bytes = "1.6"
either = "1.9"
fnv = "1.0.7"
futures = "0.3.30"
Expand All @@ -31,10 +31,10 @@ libp2p-swarm = { workspace = true }
quick-protobuf = "0.8"
quick-protobuf-codec = { workspace = true }
rand = "0.8"
regex = "1.10.3"
regex = "1.10.4"
serde = { version = "1", optional = true, features = ["derive"] }
sha2 = "0.10.8"
smallvec = "1.13.1"
smallvec = "1.13.2"
tracing = "0.1.37"
void = "1.0.2"

Expand Down
2 changes: 1 addition & 1 deletion protocols/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
lru = "0.12.2"
quick-protobuf-codec = { workspace = true }
quick-protobuf = "0.8"
smallvec = "1.13.1"
smallvec = "1.13.2"
thiserror = "1.0"
tracing = "0.1.37"
void = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion protocols/kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ quick-protobuf-codec = { workspace = true }
libp2p-identity = { workspace = true, features = ["rand"] }
rand = "0.8"
sha2 = "0.10.8"
smallvec = "1.13.1"
smallvec = "1.13.2"
uint = "0.9"
void = "1.0"
futures-timer = "3.0.3"
Expand Down
2 changes: 1 addition & 1 deletion protocols/mdns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true }
rand = "0.8.3"
smallvec = "1.13.1"
smallvec = "1.13.2"
socket2 = { version = "0.5.6", features = ["all"] }
tokio = { version = "1.36", default-features = false, features = ["net", "time"], optional = true}
tracing = "0.1.37"
Expand Down
2 changes: 1 addition & 1 deletion protocols/request-response/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ libp2p-identity = { workspace = true }
rand = "0.8"
serde = { version = "1.0", optional = true}
serde_json = { version = "1.0.114", optional = true }
smallvec = "1.13.1"
smallvec = "1.13.2"
tracing = "0.1.37"
void = "1.0.2"
futures-timer = "3.0.3"
Expand Down
2 changes: 1 addition & 1 deletion swarm-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ proc-macro = true
[dependencies]
heck = "0.5"
quote = "1.0"
syn = { version = "2.0.52", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
syn = { version = "2.0.55", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
proc-macro2 = "1.0"

# Passing arguments to the docsrs builder in order to properly document cfg's.
Expand Down
2 changes: 1 addition & 1 deletion swarm-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.77"
async-trait = "0.1.78"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true, features = ["rand"] }
libp2p-plaintext = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion swarm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lru = "0.12.2"
multistream-select = { workspace = true }
once_cell = "1.19.0"
rand = "0.8"
smallvec = "1.13.1"
smallvec = "1.13.2"
tracing = "0.1.37"
void = "1"
wasm-bindgen-futures = { version = "0.4.42", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions transports/dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
async-std-resolver = { version = "0.24", optional = true }
async-trait = "0.1.77"
async-trait = "0.1.78"
futures = "0.3.30"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
parking_lot = "0.12.0"
hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
smallvec = "1.13.1"
smallvec = "1.13.2"
tracing = "0.1.37"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion transports/noise/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ quick-protobuf = "0.8"
rand = "0.8.3"
sha2 = "0.10.8"
static_assertions = "1"
thiserror = "1.0.57"
thiserror = "1.0.58"
tracing = "0.1.37"
x25519-dalek = "2"
zeroize = "1"
Expand Down
4 changes: 2 additions & 2 deletions transports/quic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT"

[dependencies]
async-std = { version = "1.12.0", optional = true }
bytes = "1.5.0"
bytes = "1.6.0"
futures = "0.3.30"
futures-timer = "3.0.3"
if-watch = "3.2.0"
Expand All @@ -21,7 +21,7 @@ parking_lot = "0.12.0"
quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
rand = "0.8.5"
rustls = { version = "0.21.9", default-features = false }
thiserror = "1.0.57"
thiserror = "1.0.58"
tokio = { version = "1.36.0", default-features = false, features = ["net", "rt", "time"], optional = true }
tracing = "0.1.37"
socket2 = "0.5.6"
Expand Down
2 changes: 1 addition & 1 deletion transports/tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
rcgen = "0.11.3"
ring = "0.16.20"
thiserror = "1.0.57"
thiserror = "1.0.58"
webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
x509-parser = "0.15.1"
yasna = "0.5.2"
Expand Down
4 changes: 2 additions & 2 deletions transports/websocket-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]

[dependencies]
bytes = "1.4.0"
bytes = "1.6.0"
futures = "0.3.30"
js-sys = "0.3.67"
libp2p-core = { workspace = true }
tracing = "0.1.37"
parking_lot = "0.12.1"
send_wrapper = "0.6.0"
thiserror = "1.0.57"
thiserror = "1.0.58"
wasm-bindgen = "0.2.90"
web-sys = { version = "0.3.68", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }

Expand Down
2 changes: 1 addition & 1 deletion transports/webtransport-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
multiaddr = { workspace = true }
multihash = { workspace = true }
send_wrapper = { version = "0.6.0", features = ["futures"] }
thiserror = "1.0.57"
thiserror = "1.0.58"
tracing = "0.1.37"
wasm-bindgen = "0.2.90"
wasm-bindgen-futures = "0.4.42"
Expand Down

0 comments on commit 639b306

Please sign in to comment.