Skip to content

Commit 341340a

Browse files
sdbondisdbondi
committed
Merge branch 'master' into add-sr25519-support
* master: (77 commits) feat(tcp): expose socket2 `set_linger` fix: use standard peer-record domain and payload type feat(gossipsub): log when sending and receiving gossipsub messages chore(gossipsub): improve test structure chore(ci): fix cargo deny to address RUSTSEC-2025-0134 fix(gossipsub): avoid direct casting from u128 to u64 fix(identity): make quick-protobuf dep optional refactor(gossipsub): in-place negative-score peer removal deps: bump Swatinem/rust-cache from 2.8.1 to 2.8.2 refactor(gossipsub): do early return in for an empty input fix(webtransport-websys): Allow `poll_flush` after `poll_close` chore(uds): Renamed UDS Confing to follow re-export convention chore: updated rustwasm links to new org home chore: fix clippy lints chore(ci): fix intra doc links job chore: prepare libp2p-upnp v0.6.0 (libp2p#6188) fix(gossisub): prevent mesh exceeding mesh_n_high chore(README.md): Add Links to mentioned tech chore(deps): bump quic-go/quic-go from 0.50.1 to 0.54.1 in /wasm-tests chore(dpes): bump `prometheus-client` ...
2 parents 7505305 + 5e3519f commit 341340a

File tree

179 files changed

+9421
-9159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+9421
-9159
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ updates:
1212
hickory-dns:
1313
patterns:
1414
- "hickory-*"
15-
- "async-std-resolver"
1615
opentelemetry:
1716
patterns:
1817
- "opentelemetry*"

‎.github/mergify.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
merge_queue:
2+
max_parallel_checks: 1
3+
14
pull_request_rules:
25
- name: Ask to resolve conflict
36
conditions:

‎.github/workflows/cache-factory.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
make_stable_rust_cache:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- uses: dtolnay/rust-toolchain@stable
2424

25-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
25+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
2626
with:
2727
shared-key: stable-cache
2828

‎.github/workflows/cargo-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
audit:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: actions-rs/audit-check@v1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ env:
1818
jobs:
1919
test:
2020
name: Test ${{ matrix.crate }}
21-
runs-on: ${{ fromJSON(
22-
github.repository == 'libp2p/rust-libp2p' && (
23-
(contains(fromJSON('["libp2p-webrtc", "libp2p"]'), matrix.crate) && '["self-hosted", "linux", "x64", "2xlarge"]') ||
24-
(contains(fromJSON('["libp2p-quic", "libp2p-perf"]'), matrix.crate) && '["self-hosted", "linux", "x64", "xlarge"]') ||
25-
'["self-hosted", "linux", "x64", "large"]'
26-
) || '"ubuntu-latest"') }}
21+
runs-on: ubuntu-latest
2722
timeout-minutes: 10
2823
needs: gather_published_crates
2924
strategy:
@@ -33,15 +28,15 @@ jobs:
3328
env:
3429
CRATE: ${{ matrix.crate }}
3530
steps:
36-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3732
with:
3833
fetch-depth: 0
3934

4035
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
4136

4237
- uses: dtolnay/rust-toolchain@stable
4338

44-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
39+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
4540
with:
4641
shared-key: stable-cache
4742
save-if: false
@@ -109,7 +104,7 @@ jobs:
109104
name: Run all WASM tests
110105
runs-on: ubuntu-latest
111106
steps:
112-
- uses: actions/checkout@v4
107+
- uses: actions/checkout@v5
113108

114109
- uses: dtolnay/rust-toolchain@stable
115110
with:
@@ -142,15 +137,15 @@ jobs:
142137
os: windows-latest
143138
runs-on: ${{ matrix.os }}
144139
steps:
145-
- uses: actions/checkout@v4
140+
- uses: actions/checkout@v5
146141

147142
- uses: dtolnay/rust-toolchain@stable
148143
with:
149144
target: ${{ matrix.target }}
150145

151146
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
152147

153-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
148+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
154149
with:
155150
key: ${{ matrix.target }}
156151
save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -161,7 +156,7 @@ jobs:
161156
name: Compile with MSRV
162157
runs-on: ubuntu-latest
163158
steps:
164-
- uses: actions/checkout@v4
159+
- uses: actions/checkout@v5
165160

166161
- name: Extract MSRV from workspace manifest
167162
shell: bash
@@ -175,7 +170,7 @@ jobs:
175170

176171
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
177172

178-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
173+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
179174
with:
180175
save-if: ${{ github.ref == 'refs/heads/master' }}
181176

@@ -188,15 +183,14 @@ jobs:
188183
matrix:
189184
include:
190185
- features: "mdns tcp dns tokio"
191-
- features: "mdns tcp dns async-std"
192186
steps:
193-
- uses: actions/checkout@v4
187+
- uses: actions/checkout@v5
194188

195189
- uses: dtolnay/rust-toolchain@stable
196190

197191
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
198192

199-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
193+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
200194
with:
201195
key: ${{ matrix.features }}
202196
save-if: ${{ github.ref == 'refs/heads/master' }}
@@ -207,13 +201,13 @@ jobs:
207201
name: Check rustdoc intra-doc links
208202
runs-on: ubuntu-latest
209203
steps:
210-
- uses: actions/checkout@v4
204+
- uses: actions/checkout@v5
211205

212206
- uses: dtolnay/rust-toolchain@stable
213207

214208
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
215209

216-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
210+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
217211
with:
218212
save-if: ${{ github.ref == 'refs/heads/master' }}
219213

@@ -230,7 +224,7 @@ jobs:
230224
beta,
231225
]
232226
steps:
233-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v5
234228

235229
- uses: dtolnay/rust-toolchain@master
236230
with:
@@ -239,7 +233,7 @@ jobs:
239233

240234
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
241235

242-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
236+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
243237
with:
244238
save-if: ${{ github.ref == 'refs/heads/master' }}
245239

@@ -249,13 +243,13 @@ jobs:
249243
name: IPFS Integration tests
250244
runs-on: ubuntu-latest
251245
steps:
252-
- uses: actions/checkout@v4
246+
- uses: actions/checkout@v5
253247

254248
- uses: dtolnay/rust-toolchain@stable
255249

256250
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
257251

258-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
252+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
259253
with:
260254
save-if: ${{ github.ref == 'refs/heads/master' }}
261255

@@ -268,13 +262,13 @@ jobs:
268262
examples:
269263
runs-on: ubuntu-latest
270264
steps:
271-
- uses: actions/checkout@v4
265+
- uses: actions/checkout@v5
272266

273267
- uses: dtolnay/rust-toolchain@stable
274268

275269
- uses: r7kamura/rust-problem-matchers@9fe7ca9f6550e5d6358e179d451cc25ea6b54f98 #v1.5.0
276270

277-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
271+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
278272
with:
279273
shared-key: stable-cache
280274
save-if: false
@@ -308,14 +302,14 @@ jobs:
308302
# https://github.com/obi1kenobi/cargo-semver-checks/issues/589
309303
RUSTFLAGS: ''
310304
steps:
311-
- uses: actions/checkout@v4
305+
- uses: actions/checkout@v5
312306
- uses: obi1kenobi/cargo-semver-checks-action@v2
313307
- run: cargo semver-checks
314308

315309
rustfmt:
316310
runs-on: ubuntu-latest
317311
steps:
318-
- uses: actions/checkout@v4
312+
- uses: actions/checkout@v5
319313

320314
- uses: dtolnay/rust-toolchain@nightly
321315
with:
@@ -329,7 +323,7 @@ jobs:
329323
manifest_lint:
330324
runs-on: ubuntu-latest
331325
steps:
332-
- uses: actions/checkout@v4
326+
- uses: actions/checkout@v5
333327

334328
- uses: dtolnay/rust-toolchain@stable
335329

@@ -350,7 +344,7 @@ jobs:
350344
outputs:
351345
members: ${{ steps.cargo-metadata.outputs.members }}
352346
steps:
353-
- uses: actions/checkout@v4
347+
- uses: actions/checkout@v5
354348

355349
- uses: dtolnay/rust-toolchain@stable
356350

@@ -363,9 +357,9 @@ jobs:
363357
name: Check for changes in proto files
364358
runs-on: ubuntu-latest
365359
steps:
366-
- uses: actions/checkout@v4
360+
- uses: actions/checkout@v5
367361

368-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
362+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
369363

370364
- run: cargo install --version 0.10.0 pb-rs --locked
371365

@@ -390,14 +384,14 @@ jobs:
390384
name: Ensure that `Cargo.lock` is up-to-date
391385
runs-on: ubuntu-latest
392386
steps:
393-
- uses: actions/checkout@v4
394-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
387+
- uses: actions/checkout@v5
388+
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
395389
- run: cargo metadata --locked --format-version=1 > /dev/null
396390

397391
cargo-deny:
398392
runs-on: ubuntu-latest
399393
steps:
400-
- uses: actions/checkout@v4
394+
- uses: actions/checkout@v5
401395
- uses: EmbarkStudios/cargo-deny-action@v2
402396
with:
403397
command: check advisories bans licenses sources

‎.github/workflows/docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
server:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- uses: docker/login-action@v3
1717
with:

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
- name: Install nightly toolchain
1515
run: rustup toolchain install nightly
1616
- name: Build Documentation
@@ -23,7 +23,7 @@ jobs:
2323
echo "<meta http-equiv=\"refresh\" content=\"0; url=libp2p\">" > target/doc/index.html
2424
cp -r target/doc/* ./host-docs
2525
- name: Upload documentation
26-
uses: actions/upload-pages-artifact@v3.0.1
26+
uses: actions/upload-pages-artifact@v4.0.0
2727
with:
2828
path: "host-docs/"
2929

‎.github/workflows/interop-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
run-transport-interop:
1414
name: Run transport interoperability tests
1515
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
16-
runs-on: ${{ fromJSON(github.repository == 'libp2p/rust-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
16+
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
1919
flavour: [chromium, native]
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- uses: docker/setup-buildx-action@v3
2424

@@ -47,7 +47,7 @@ jobs:
4747
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
4848
runs-on: ${{ fromJSON(github.repository == 'libp2p/rust-libp2p' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151
- uses: docker/setup-buildx-action@v3
5252
- name: Build image
5353
run: docker buildx build --load -t rust-libp2p-head . -f hole-punching-tests/Dockerfile

0 commit comments

Comments
 (0)