Skip to content

Commit 9efdb00

Browse files
committed
merge master@origin
2 parents 61d436a + 54228bf commit 9efdb00

File tree

18 files changed

+1616
-259
lines changed

18 files changed

+1616
-259
lines changed

Cargo.lock

Lines changed: 299 additions & 127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

protocols/gossipsub/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
- Fix underflow when shuffling peers after prunning.
66
See [PR 6183](https://github.com/libp2p/rust-libp2p/pull/6183)
77

8+
9+
- Implement gossipsub 1.3 extensions control message.
10+
See [PR 6119](https://github.com/libp2p/rust-libp2p/pull/6119)
11+
812
- Remove peer penalty for duplicate messages.
913
See [PR 6112](https://github.com/libp2p/rust-libp2p/pull/6112)
1014

@@ -26,6 +30,9 @@
2630
- Switch the internal `async-channel` used to dispatch messages from `NetworkBehaviour` to the `ConnectionHandler`
2731
with an internal priority queue. See [PR 6175](https://github.com/libp2p/rust-libp2p/pull/6175)
2832

33+
- Switch the internal `async-channel` used to dispatch messages from `NetworkBehaviour` to the `ConnectionHandler`
34+
with an internal priority queue. See [PR XXXX](https://github.com/libp2p/rust-libp2p/pull/XXXX)
35+
2936
## 0.49.2
3037

3138
- Relax `Behaviour::with_metrics` requirements, do not require DataTransform and TopicSubscriptionFilter to also impl Default

protocols/gossipsub/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ categories = ["network-programming", "asynchronous"]
1313
[features]
1414
wasm-bindgen = ["getrandom/js", "futures-timer/wasm-bindgen"]
1515
metrics = ["prometheus-client"]
16+
partial_messages = []
1617

1718
[dependencies]
1819
async-channel = "2.3.1"
@@ -28,23 +29,23 @@ getrandom = { workspace = true }
2829
hashlink = { workspace = true }
2930
hex_fmt = "0.3.0"
3031
web-time = { workspace = true }
31-
libp2p-core = { workspace = true }
32-
libp2p-identity = { workspace = true, features = ["rand"] }
33-
libp2p-swarm = { workspace = true }
32+
# Libp2p crates, updated to use crates.io versions so that we can use this gossipsub fork with
33+
# crates.io libp2p
34+
libp2p-core = "0.43"
35+
libp2p-identity = { version = "0.2", features = ["rand"] }
36+
libp2p-swarm = "0.47"
3437
quick-protobuf = "0.8"
35-
quick-protobuf-codec = { workspace = true }
38+
quick-protobuf-codec = "0.3.1"
3639
rand = "0.8"
3740
regex = "1.10.5"
3841
serde = { version = "1", optional = true, features = ["derive"] }
3942
sha2 = "0.10.8"
4043
tracing = { workspace = true }
4144

42-
# Metrics dependencies
43-
prometheus-client = { workspace = true, optional = true }
45+
prometheus-client = { version = "0.23", optional = true }
4446

4547
[dev-dependencies]
46-
libp2p-core = { workspace = true }
47-
libp2p-swarm-test = { path = "../../swarm-test" }
48+
libp2p-swarm-test = { version = "0.6.0", features = ["tokio"] }
4849
quickcheck = { workspace = true }
4950
tracing-subscriber = { workspace = true, features = ["env-filter"] }
5051
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }

0 commit comments

Comments
 (0)