Skip to content

Commit 5b10033

Browse files
sbackend123sbackend123
committed
Merge remote-tracking branch 'origin/master' into feat/pullsync-chunk-sum
2 parents 11eef37 + c331ad9 commit 5b10033

51 files changed

Lines changed: 2158 additions & 203 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/swarm-cli-bee-version.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Bump Bee version in Swarm CLI
2+
3+
# On a stable Bee release, trigger swarm-cli's update-bee-version workflow
4+
# (ethersphere/swarm-cli, added in #760), which bumps the Bee version in
5+
# quickstart.ts and opens a PR there. Cross-repo dispatch needs more than the
6+
# default GITHUB_TOKEN, so it uses the BEE_RUNNER GitHub App (the same App
7+
# swarm-cli's own workflow uses) scoped to swarm-cli.
8+
9+
on:
10+
release:
11+
types: [released] # stable releases only (skips drafts and pre-releases/RCs)
12+
workflow_dispatch: # manual trigger for testing / re-runs
13+
inputs:
14+
version:
15+
description: 'Bee version tag to send (e.g. v2.9.0)'
16+
required: true
17+
18+
permissions: {}
19+
20+
jobs:
21+
dispatch-swarm-cli:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Generate token for swarm-cli
25+
id: app-token
26+
uses: actions/create-github-app-token@v1
27+
with:
28+
app-id: ${{ secrets.BEE_RUNNER_APP_ID }}
29+
private-key: ${{ secrets.BEE_RUNNER_KEY }}
30+
owner: ethersphere
31+
repositories: swarm-cli
32+
33+
- name: Dispatch swarm-cli update-bee-version
34+
env:
35+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
36+
VERSION: ${{ github.event.release.tag_name || inputs.version }}
37+
run: |
38+
echo "Dispatching swarm-cli update-bee-version for ${VERSION}"
39+
gh workflow run update-bee-version.yaml \
40+
--repo ethersphere/swarm-cli \
41+
-f version="${VERSION}"

‎go.mod‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,15 @@ require (
5555
golang.org/x/sync v0.20.0
5656
golang.org/x/sys v0.45.0
5757
golang.org/x/term v0.43.0
58-
golang.org/x/time v0.12.0
59-
google.golang.org/grpc v1.80.0
58+
golang.org/x/time v0.14.0
59+
google.golang.org/grpc v1.82.1
6060
gopkg.in/yaml.v2 v2.4.0
6161
resenje.org/feed v0.1.2
6262
resenje.org/multex v0.1.0
6363
resenje.org/singleflight v0.4.0
6464
resenje.org/web v0.4.3
6565
)
6666

67-
require (
68-
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
69-
github.com/go-logr/logr v1.4.3 // indirect
70-
github.com/go-logr/stdr v1.2.2 // indirect
71-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
72-
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
73-
go.opentelemetry.io/otel/metric v1.43.0 // indirect
74-
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
75-
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 // indirect
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect
77-
)
78-
7967
require (
8068
filippo.io/bigmod v0.1.1-0.20260103110540-f8a47775ebe5 // indirect
8169
filippo.io/keygen v0.0.0-20260114151900-8e2790ea4c5b // indirect
@@ -88,6 +76,7 @@ require (
8876
github.com/bits-and-blooms/bitset v1.20.0 // indirect
8977
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
9078
github.com/caddyserver/zerossl v0.1.3 // indirect
79+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
9180
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9281
github.com/consensys/gnark-crypto v0.18.1 // indirect
9382
github.com/crate-crypto/go-eth-kzg v1.5.0 // indirect
@@ -103,12 +92,15 @@ require (
10392
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
10493
github.com/go-kit/log v0.2.1 // indirect
10594
github.com/go-logfmt/logfmt v0.6.0 // indirect
95+
github.com/go-logr/logr v1.4.3 // indirect
96+
github.com/go-logr/stdr v1.2.2 // indirect
10697
github.com/go-ole/go-ole v1.3.0 // indirect
10798
github.com/go-playground/locales v0.14.1 // indirect
10899
github.com/go-playground/universal-translator v0.18.1 // indirect
109100
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
110101
github.com/golang/snappy v1.0.0 // indirect
111102
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
103+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
112104
github.com/hashicorp/errwrap v1.1.0 // indirect
113105
github.com/hashicorp/hcl v1.0.0 // indirect
114106
github.com/holiman/uint256 v1.3.2 // indirect
@@ -149,7 +141,7 @@ require (
149141
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
150142
github.com/pelletier/go-toml v1.8.0 // indirect
151143
github.com/pion/datachannel v1.5.10 // indirect
152-
github.com/pion/dtls/v3 v3.1.2 // indirect
144+
github.com/pion/dtls/v3 v3.1.4 // indirect
153145
github.com/pion/ice/v4 v4.0.10 // indirect
154146
github.com/pion/interceptor v0.1.40 // indirect
155147
github.com/pion/logging v0.2.4 // indirect
@@ -160,9 +152,9 @@ require (
160152
github.com/pion/sctp v1.8.39 // indirect
161153
github.com/pion/sdp/v3 v3.0.18 // indirect
162154
github.com/pion/srtp/v3 v3.0.6 // indirect
163-
github.com/pion/stun/v3 v3.1.1 // indirect
155+
github.com/pion/stun/v3 v3.1.5 // indirect
164156
github.com/pion/transport/v3 v3.0.7 // indirect
165-
github.com/pion/transport/v4 v4.0.1 // indirect
157+
github.com/pion/transport/v4 v4.0.2 // indirect
166158
github.com/pion/turn/v4 v4.0.2 // indirect
167159
github.com/pion/webrtc/v4 v4.1.2 // indirect
168160
github.com/pkg/errors v0.9.1 // indirect
@@ -172,8 +164,8 @@ require (
172164
github.com/prometheus/procfs v0.16.1 // indirect
173165
github.com/prometheus/statsd_exporter v0.26.1 // indirect
174166
github.com/quic-go/qpack v0.6.0 // indirect
175-
github.com/quic-go/quic-go v0.59.1 // indirect
176-
github.com/quic-go/webtransport-go v0.10.0 // indirect
167+
github.com/quic-go/quic-go v0.60.0 // indirect
168+
github.com/quic-go/webtransport-go v0.11.1 // indirect
177169
github.com/shirou/gopsutil v3.21.5+incompatible // indirect
178170
github.com/spaolacci/murmur3 v1.1.0 // indirect
179171
github.com/spf13/cast v1.3.0 // indirect
@@ -188,6 +180,9 @@ require (
188180
github.com/wlynxg/anet v0.0.5 // indirect
189181
github.com/zeebo/blake3 v0.2.4 // indirect
190182
go.opencensus.io v0.24.0 // indirect
183+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
184+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
185+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
191186
go.uber.org/dig v1.19.0 // indirect
192187
go.uber.org/fx v1.24.0 // indirect
193188
go.uber.org/mock v0.5.2 // indirect
@@ -198,6 +193,8 @@ require (
198193
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa // indirect
199194
golang.org/x/text v0.37.0 // indirect
200195
golang.org/x/tools v0.44.0 // indirect
196+
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 // indirect
197+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect
201198
google.golang.org/protobuf v1.36.11 // indirect
202199
gopkg.in/ini.v1 v1.67.0 // indirect
203200
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,8 @@ github.com/pion/datachannel v1.5.10 h1:ly0Q26K1i6ZkGf42W7D4hQYR90pZwzFOjTq5AuCKk
756756
github.com/pion/datachannel v1.5.10/go.mod h1:p/jJfC9arb29W7WrxyKbepTU20CFgyx5oLo8Rs4Py/M=
757757
github.com/pion/dtls/v2 v2.2.12 h1:KP7H5/c1EiVAAKUmXyCzPiQe5+bCJrpOeKg/L05dunk=
758758
github.com/pion/dtls/v2 v2.2.12/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
759-
github.com/pion/dtls/v3 v3.1.2 h1:gqEdOUXLtCGW+afsBLO0LtDD8GnuBBjEy6HRtyofZTc=
760-
github.com/pion/dtls/v3 v3.1.2/go.mod h1:Hw/igcX4pdY69z1Hgv5x7wJFrUkdgHwAn/Q/uo7YHRo=
759+
github.com/pion/dtls/v3 v3.1.4 h1:QhvtMflMfu9Kf0RcDC5BJBle4caPskByrKQR6uuYqpY=
760+
github.com/pion/dtls/v3 v3.1.4/go.mod h1:cr/qotLISUw/9C1m83ZPNZtj9WnXkYLpfCptPqbkInc=
761761
github.com/pion/ice/v4 v4.0.10 h1:P59w1iauC/wPk9PdY8Vjl4fOFL5B+USq1+xbDcN6gT4=
762762
github.com/pion/ice/v4 v4.0.10/go.mod h1:y3M18aPhIxLlcO/4dn9X8LzLLSma84cx6emMSu14FGw=
763763
github.com/pion/interceptor v0.1.40 h1:e0BjnPcGpr2CFQgKhrQisBU7V3GXK6wrfYrGYaU6Jq4=
@@ -781,14 +781,14 @@ github.com/pion/srtp/v3 v3.0.6/go.mod h1:BxvziG3v/armJHAaJ87euvkhHqWe9I7iiOy50K2
781781
github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=
782782
github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=
783783
github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ=
784-
github.com/pion/stun/v3 v3.1.1 h1:CkQxveJ4xGQjulGSROXbXq94TAWu8gIX2dT+ePhUkqw=
785-
github.com/pion/stun/v3 v3.1.1/go.mod h1:qC1DfmcCTQjl9PBaMa5wSn3x9IPmKxSdcCsxBcDBndM=
784+
github.com/pion/stun/v3 v3.1.5 h1:Y1FHlhaI6+4UoC5i/zQf4F7JvdZtB24/05oyy/GF1x8=
785+
github.com/pion/stun/v3 v3.1.5/go.mod h1:zRUghXSQU32Lx5orJsz3uYMkIihweXb3mu5gIns02fs=
786786
github.com/pion/transport/v2 v2.2.10 h1:ucLBLE8nuxiHfvkFKnkDQRYWYfp8ejf4YBOPfaQpw6Q=
787787
github.com/pion/transport/v2 v2.2.10/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
788788
github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
789789
github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
790-
github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o=
791-
github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM=
790+
github.com/pion/transport/v4 v4.0.2 h1:ifYlPqNwsy6aKQ9y8yzxXlHae5431ZrH2avkD/Rn6Tk=
791+
github.com/pion/transport/v4 v4.0.2/go.mod h1:06hFI+jCFcok2X2MekVufNZ/uzNZXivGBPfviSVcjgM=
792792
github.com/pion/turn/v4 v4.0.2 h1:ZqgQ3+MjP32ug30xAbD6Mn+/K4Sxi3SdNOTFf+7mpps=
793793
github.com/pion/turn/v4 v4.0.2/go.mod h1:pMMKP/ieNAG/fN5cZiN4SDuyKsXtNTr0ccN7IToA1zs=
794794
github.com/pion/webrtc/v4 v4.1.2 h1:mpuUo/EJ1zMNKGE79fAdYNFZBX790KE7kQQpLMjjR54=
@@ -851,12 +851,14 @@ github.com/prometheus/statsd_exporter v0.26.1 h1:ucbIAdPmwAUcA+dU+Opok8Qt81Aw8Ha
851851
github.com/prometheus/statsd_exporter v0.26.1/go.mod h1:XlDdjAmRmx3JVvPPYuFNUg+Ynyb5kR69iPPkQjxXFMk=
852852
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
853853
github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSgwXEyGCt4=
854+
github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0=
855+
github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk=
854856
github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
855857
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
856-
github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
857-
github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
858-
github.com/quic-go/webtransport-go v0.10.0 h1:LqXXPOXuETY5Xe8ITdGisBzTYmUOy5eSj+9n4hLTjHI=
859-
github.com/quic-go/webtransport-go v0.10.0/go.mod h1:LeGIXr5BQKE3UsynwVBeQrU1TPrbh73MGoC6jd+V7ow=
858+
github.com/quic-go/quic-go v0.60.0 h1:xcQioE8OM66UQLeUMHltK1CCcOu3JbVB4JAQdDQSB+0=
859+
github.com/quic-go/quic-go v0.60.0/go.mod h1:wpKpjmPpftl30sL6pFh7REVpjbcCVy4zt2vDyK1TuJk=
860+
github.com/quic-go/webtransport-go v0.11.1 h1:rrFQMO+7/52ZDJ04fsrjIaWqn6q1z1MYo9iVFq6JtbA=
861+
github.com/quic-go/webtransport-go v0.11.1/go.mod h1:SHgEzUFVyj+9WUSuGB1P6Zd351Pww2leWV3SwlTovkA=
860862
github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
861863
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
862864
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -1294,8 +1296,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
12941296
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
12951297
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
12961298
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
1297-
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
1298-
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
1299+
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
1300+
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
12991301
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
13001302
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
13011303
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1445,8 +1447,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
14451447
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
14461448
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
14471449
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
1448-
google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
1449-
google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
1450+
google.golang.org/grpc v1.82.1 h1:NnAxzGRA0677vCa4BUkOAnO5+FfQqVl9iUXeD0IqcGE=
1451+
google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
14501452
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
14511453
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
14521454
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)