Skip to content

Commit a4d314b

Browse files
committed
Merge branch 'master' into wasm-second-iteration
Resolved conflicts by: - Updating dependencies to newer versions from master - Preserving WASM-specific packages (go-wasm-http-server, go-libp2p-wasmws) - Maintaining platform-split architecture for node.go and libp2p.go - Integrating bug fixes and improvements from master
2 parents 665ce9b + c92d8c5 commit a4d314b

52 files changed

Lines changed: 2152 additions & 959 deletions

Some content is hidden

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

.github/workflows/beekeeper.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ jobs:
158158
- name: Test manifest
159159
id: manifest
160160
run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-manifest
161+
- name: Test manifest v1
162+
id: manifest-v1
163+
run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-manifest-v1
161164
- name: Test postage stamps
162165
id: postage-stamps
163166
run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks ci-postage
@@ -173,6 +176,9 @@ jobs:
173176
- name: Test act
174177
id: act
175178
run: timeout ${TIMEOUT} bash -c 'until beekeeper check --cluster-name local-dns --checks ci-act; do echo "waiting for act..."; sleep .3; done'
179+
- name: Test feeds v1
180+
id: feeds-v1
181+
run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-feed-v1
176182
- name: Test feeds
177183
id: feeds
178184
run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-feed
@@ -190,6 +196,9 @@ jobs:
190196
if ${{ steps.pushsync-chunks-2.outcome=='failure' }}; then FAILED=pushsync-chunks-2; fi
191197
if ${{ steps.retrieval.outcome=='failure' }}; then FAILED=retrieval; fi
192198
if ${{ steps.manifest.outcome=='failure' }}; then FAILED=manifest; fi
199+
if ${{ steps.manifest-v1.outcome=='failure' }}; then FAILED=manifest-v1; fi
200+
if ${{ steps.feeds.outcome=='failure' }}; then FAILED=feeds; fi
201+
if ${{ steps.feeds-v1.outcome=='failure' }}; then FAILED=feeds-v1; fi
193202
if ${{ steps.act.outcome=='failure' }}; then FAILED=act; fi
194203
curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.TUNSHELL_KEY }}
195204
echo "Failed test: ${FAILED}"

.github/workflows/go.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ jobs:
2727
with:
2828
cache: true
2929
go-version-file: go.mod
30+
- name: Increase UDP buffer sizes (Ubuntu)
31+
if: matrix.os == 'ubuntu-latest'
32+
run: |
33+
sudo sysctl -w net.core.rmem_max=7500000
34+
sudo sysctl -w net.core.wmem_max=7500000
35+
- name: Increase UDP buffer sizes (macOS)
36+
if: matrix.os == 'macos-latest'
37+
run: |
38+
sudo sysctl -w kern.ipc.maxsockbuf=6291456
3039
- name: Build
3140
run: make build
3241
- name: Test with race detector (Ubuntu and MacOS)
@@ -66,6 +75,8 @@ jobs:
6675
- name: Commit linting
6776
if: github.ref != 'refs/heads/master'
6877
uses: wagoid/commitlint-github-action@v5
78+
with:
79+
configFile: commitlint.config.js
6980
- name: GolangCI-Lint
7081
uses: golangci/golangci-lint-action@v8
7182
with:

.github/workflows/pr-title.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: PR Title Lint
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, edited]
6+
7+
jobs:
8+
lint-title:
9+
name: Lint PR Title
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v4
14+
- name: Setup Node
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: '20'
18+
- name: Install commitlint
19+
run: npm install --save-dev @commitlint/cli @commitlint/config-conventional
20+
- name: PR title linting
21+
env:
22+
PR_TITLE: ${{ github.event.pull_request.title }}
23+
run: echo "$PR_TITLE" | npx commitlint --config ./commitlint.config.js

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.idea
33
/.vscode
44
/tmp
5+
/vendor
56

67
# Compiled Object files, Static and Dynamic libs (Shared Objects)
78
*.o

go.mod

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ require (
1616
github.com/ethersphere/go-storage-incentives-abi v0.9.4
1717
github.com/ethersphere/go-sw3-abi v0.6.9
1818
github.com/ethersphere/langos v1.0.0
19-
github.com/go-playground/validator/v10 v10.11.1
19+
github.com/go-playground/validator/v10 v10.19.0
2020
github.com/gogo/protobuf v1.3.2
2121
github.com/google/go-cmp v0.7.0
2222
github.com/google/uuid v1.6.0
2323
github.com/gorilla/handlers v1.4.2
24-
github.com/gorilla/mux v1.8.0
24+
github.com/gorilla/mux v1.8.1
2525
github.com/gorilla/websocket v1.5.3
2626
github.com/hashicorp/go-multierror v1.1.1
2727
github.com/hashicorp/golang-lru/v2 v2.0.7
2828
github.com/ipfs/go-cid v0.6.0
29-
github.com/ipshipyard/p2p-forge v0.6.1
29+
github.com/ipshipyard/p2p-forge v0.7.0
3030
github.com/kardianos/service v1.2.2
3131
github.com/klauspost/reedsolomon v1.11.8
32-
github.com/libp2p/go-libp2p v0.45.0
32+
github.com/libp2p/go-libp2p v0.46.0
3333
github.com/multiformats/go-multiaddr v0.16.1
3434
github.com/multiformats/go-multiaddr-dns v0.4.1
3535
github.com/multiformats/go-multihash v0.2.3
@@ -44,7 +44,7 @@ require (
4444
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
4545
github.com/uber/jaeger-client-go v2.24.0+incompatible
4646
github.com/v1rtl/go-libp2p-wasmws v0.0.0-20251207155153-95835dee8ae4
47-
github.com/vmihailenco/msgpack/v5 v5.3.4
47+
github.com/vmihailenco/msgpack/v5 v5.4.1
4848
github.com/wealdtech/go-ens/v3 v3.5.1
4949
gitlab.com/nolash/go-mockbytes v0.0.7
5050
go.uber.org/atomic v1.11.0
@@ -61,17 +61,7 @@ require (
6161
resenje.org/web v0.4.3
6262
)
6363

64-
require (
65-
github.com/coder/websocket v1.8.14 // indirect
66-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
67-
github.com/hack-pad/safejs v0.1.1 // indirect
68-
github.com/nlepage/go-js-promise v1.0.0 // indirect
69-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
70-
github.com/sagikazarmark/locafero v0.11.0 // indirect
71-
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
72-
go.yaml.in/yaml/v3 v3.0.4 // indirect
73-
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
74-
)
64+
require golang.org/x/net v0.47.0 // indirect
7565

7666
require (
7767
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -83,10 +73,11 @@ require (
8373
github.com/caddyserver/zerossl v0.1.3 // indirect
8474
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8575
github.com/codahale/hdrhistogram v0.0.0-00010101000000-000000000000 // indirect
76+
github.com/coder/websocket v1.8.14 // indirect
8677
github.com/consensys/gnark-crypto v0.18.1 // indirect
8778
github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect
8879
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
89-
github.com/davecgh/go-spew v1.1.1 // indirect
80+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9081
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
9182
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
9283
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
@@ -95,15 +86,18 @@ require (
9586
github.com/felixge/fgprof v0.9.5
9687
github.com/flynn/noise v1.1.0 // indirect
9788
github.com/fsnotify/fsnotify v1.9.0 // indirect
89+
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
9890
github.com/go-kit/log v0.2.1 // indirect
99-
github.com/go-logfmt/logfmt v0.5.1 // indirect
91+
github.com/go-logfmt/logfmt v0.6.0 // indirect
10092
github.com/go-ole/go-ole v1.3.0 // indirect
101-
github.com/go-playground/locales v0.14.0 // indirect
102-
github.com/go-playground/universal-translator v0.18.0 // indirect
93+
github.com/go-playground/locales v0.14.1 // indirect
94+
github.com/go-playground/universal-translator v0.18.1 // indirect
95+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
10396
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10497
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
10598
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
106-
github.com/hashicorp/errwrap v1.0.0 // indirect
99+
github.com/hack-pad/safejs v0.1.1 // indirect
100+
github.com/hashicorp/errwrap v1.1.0 // indirect
107101
github.com/holiman/uint256 v1.3.2 // indirect
108102
github.com/huin/goupnp v1.3.0 // indirect
109103
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -112,7 +106,7 @@ require (
112106
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
113107
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
114108
github.com/koron/go-ssdp v0.0.6 // indirect
115-
github.com/leodido/go-urn v1.2.1 // indirect
109+
github.com/leodido/go-urn v1.4.0 // indirect
116110
github.com/libdns/libdns v0.2.2 // indirect
117111
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
118112
github.com/libp2p/go-flow-metrics v0.2.0 // indirect
@@ -136,7 +130,9 @@ require (
136130
github.com/multiformats/go-multicodec v0.10.0 // indirect
137131
github.com/multiformats/go-varint v0.1.0
138132
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
133+
github.com/nlepage/go-js-promise v1.0.0 // indirect
139134
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
135+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
140136
github.com/pion/datachannel v1.5.10 // indirect
141137
github.com/pion/dtls/v2 v2.2.12 // indirect
142138
github.com/pion/dtls/v3 v3.0.6 // indirect
@@ -161,11 +157,14 @@ require (
161157
github.com/prometheus/client_model v0.6.2 // indirect
162158
github.com/prometheus/common v0.64.0
163159
github.com/prometheus/procfs v0.16.1 // indirect
164-
github.com/prometheus/statsd_exporter v0.22.7 // indirect
165-
github.com/quic-go/qpack v0.5.1 // indirect
166-
github.com/quic-go/quic-go v0.56.0 // indirect
160+
github.com/prometheus/statsd_exporter v0.26.1 // indirect
161+
github.com/quic-go/qpack v0.6.0 // indirect
162+
github.com/quic-go/quic-go v0.57.1 // indirect
167163
github.com/quic-go/webtransport-go v0.9.0 // indirect
164+
github.com/rogpeppe/go-internal v1.13.1 // indirect
165+
github.com/sagikazarmark/locafero v0.11.0 // indirect
168166
github.com/shirou/gopsutil v3.21.5+incompatible // indirect
167+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
169168
github.com/spaolacci/murmur3 v1.1.0 // indirect
170169
github.com/spf13/cast v1.10.0 // indirect
171170
github.com/spf13/pflag v1.0.10 // indirect
@@ -185,9 +184,10 @@ require (
185184
go.uber.org/multierr v1.11.0 // indirect
186185
go.uber.org/zap v1.27.0
187186
go.uber.org/zap/exp v0.3.0 // indirect
187+
go.yaml.in/yaml/v3 v3.0.4 // indirect
188188
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
189189
golang.org/x/mod v0.30.0 // indirect
190-
golang.org/x/net v0.47.0 // indirect
190+
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
191191
golang.org/x/text v0.31.0 // indirect
192192
golang.org/x/tools v0.39.0 // indirect
193193
google.golang.org/protobuf v1.36.10 // indirect

0 commit comments

Comments
 (0)