Skip to content

Commit 0d20f97

Browse files
committed
Update dependencies.
Includes latest "vole". As a result the mplex muxer has been removed (long deprecated from libp2p).
1 parent 6e97cd9 commit 0d20f97

File tree

5 files changed

+265
-320
lines changed

5 files changed

+265
-320
lines changed

daemon.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
dht "github.com/libp2p/go-libp2p-kad-dht"
1717
"github.com/libp2p/go-libp2p-kad-dht/fullrt"
1818
dhtpb "github.com/libp2p/go-libp2p-kad-dht/pb"
19-
mplex "github.com/libp2p/go-libp2p-mplex"
2019
record "github.com/libp2p/go-libp2p-record"
2120
"github.com/libp2p/go-libp2p/core/host"
2221
"github.com/libp2p/go-libp2p/core/peer"
@@ -67,8 +66,6 @@ func newDaemon(ctx context.Context, acceleratedDHT bool) (*daemon, error) {
6766
promRegistry := prometheus.NewRegistry()
6867

6968
h, err := libp2p.New(
70-
libp2p.DefaultMuxers,
71-
libp2p.Muxer(mplex.ID, mplex.DefaultTransport),
7269
libp2p.ConnectionManager(c),
7370
libp2p.ConnectionGater(&privateAddrFilterConnectionGater{}),
7471
libp2p.ResourceManager(rm),
@@ -116,8 +113,6 @@ func newDaemon(ctx context.Context, acceleratedDHT bool) (*daemon, error) {
116113
// See https://github.com/libp2p/go-libp2p/issues/2941
117114
return libp2p.New(
118115
libp2p.ConnectionGater(&privateAddrFilterConnectionGater{}),
119-
libp2p.DefaultMuxers,
120-
libp2p.Muxer("/mplex/6.7.0", mplex.DefaultTransport),
121116
libp2p.EnableHolePunching(),
122117
libp2p.UserAgent(userAgent),
123118
)

dht.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/libp2p/go-libp2p/core/protocol"
1212

1313
//lint:ignore SA1019 TODO migrate away from gogo pb
14-
"github.com/libp2p/go-msgio/protoio"
14+
"github.com/libp2p/go-msgio/pbio"
1515
)
1616

1717
func dhtProtocolMessenger(proto protocol.ID, h host.Host) (*dhtpb.ProtocolMessenger, error) {
@@ -42,12 +42,12 @@ func (ms *dhtMsgSender) SendRequest(ctx context.Context, p peer.ID, pmes *dhtpb.
4242
return nil, err
4343
}
4444

45-
w := protoio.NewDelimitedWriter(s)
45+
w := pbio.NewDelimitedWriter(s)
4646
if err := w.WriteMsg(pmes); err != nil {
4747
return nil, err
4848
}
4949

50-
r := protoio.NewDelimitedReader(s, network.MessageSizeMax)
50+
r := pbio.NewDelimitedReader(s, network.MessageSizeMax)
5151
tctx, cancel := context.WithTimeout(ctx, ms.timeout)
5252
defer cancel()
5353
defer func() { _ = s.Close() }()
@@ -61,9 +61,9 @@ func (ms *dhtMsgSender) SendRequest(ctx context.Context, p peer.ID, pmes *dhtpb.
6161
return msg, nil
6262
}
6363

64-
func ctxReadMsg(ctx context.Context, rc protoio.ReadCloser, mes *dhtpb.Message) error {
64+
func ctxReadMsg(ctx context.Context, rc pbio.ReadCloser, mes *dhtpb.Message) error {
6565
errc := make(chan error, 1)
66-
go func(r protoio.ReadCloser) {
66+
go func(r pbio.ReadCloser) {
6767
defer close(errc)
6868
err := r.ReadMsg(mes)
6969
errc <- err
@@ -85,7 +85,7 @@ func (ms *dhtMsgSender) SendMessage(ctx context.Context, p peer.ID, pmes *dhtpb.
8585
}
8686
defer func() { _ = s.Close() }()
8787

88-
w := protoio.NewDelimitedWriter(s)
88+
w := pbio.NewDelimitedWriter(s)
8989
return w.WriteMsg(pmes)
9090
}
9191

go.mod

Lines changed: 81 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ go 1.23
44

55
require (
66
github.com/gavv/httpexpect/v2 v2.16.0
7-
github.com/ipfs-shipyard/vole v0.0.0-20240801195547-d7b80a461193
8-
github.com/ipfs/boxo v0.24.0
9-
github.com/ipfs/go-block-format v0.2.0
10-
github.com/ipfs/go-cid v0.4.1
11-
github.com/ipfs/go-datastore v0.6.0
12-
github.com/libp2p/go-libp2p v0.36.5
13-
github.com/libp2p/go-libp2p-kad-dht v0.26.1
14-
github.com/libp2p/go-libp2p-mplex v0.9.0
15-
github.com/libp2p/go-libp2p-record v0.2.0
16-
github.com/libp2p/go-libp2p-routing-helpers v0.7.4
7+
github.com/ipfs-shipyard/vole v0.0.0-20250522150840-23e4bacebb03
8+
github.com/ipfs/boxo v0.30.0
9+
github.com/ipfs/go-block-format v0.2.1
10+
github.com/ipfs/go-cid v0.5.0
11+
github.com/ipfs/go-datastore v0.8.2
12+
github.com/libp2p/go-libp2p v0.41.1
13+
github.com/libp2p/go-libp2p-kad-dht v0.33.0
14+
github.com/libp2p/go-libp2p-record v0.3.1
1715
github.com/libp2p/go-msgio v0.3.0
18-
github.com/multiformats/go-multiaddr v0.13.0
16+
github.com/multiformats/go-multiaddr v0.15.0
1917
github.com/multiformats/go-multihash v0.2.3
20-
github.com/prometheus/client_golang v1.20.0
21-
github.com/stretchr/testify v1.9.0
22-
github.com/urfave/cli/v2 v2.27.3
18+
github.com/prometheus/client_golang v1.22.0
19+
github.com/stretchr/testify v1.10.0
20+
github.com/urfave/cli/v2 v2.27.6
2321
)
2422

2523
require (
@@ -31,20 +29,23 @@ require (
3129
github.com/benbjohnson/clock v1.3.5 // indirect
3230
github.com/beorn7/perks v1.0.1 // indirect
3331
github.com/cespare/xxhash/v2 v2.3.0 // indirect
34-
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
32+
github.com/cheggaaa/pb/v3 v3.1.7 // indirect
3533
github.com/containerd/cgroups v1.1.0 // indirect
3634
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
37-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
35+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
3836
github.com/cskr/pubsub v1.0.2 // indirect
3937
github.com/davecgh/go-spew v1.1.1 // indirect
4038
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
41-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
39+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
4240
github.com/docker/go-units v0.5.0 // indirect
4341
github.com/elastic/gosigar v0.14.3 // indirect
44-
github.com/fatih/color v1.17.0 // indirect
42+
github.com/fatih/color v1.18.0 // indirect
4543
github.com/fatih/structs v1.1.0 // indirect
44+
github.com/filecoin-project/go-clock v0.1.0 // indirect
4645
github.com/flynn/noise v1.1.0 // indirect
4746
github.com/francoispqt/gojay v1.2.13 // indirect
47+
github.com/gammazero/chanqueue v1.1.0 // indirect
48+
github.com/gammazero/deque v1.0.0 // indirect
4849
github.com/go-logr/logr v1.4.2 // indirect
4950
github.com/go-logr/stdr v1.2.2 // indirect
5051
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -53,105 +54,101 @@ require (
5354
github.com/gogo/protobuf v1.3.2 // indirect
5455
github.com/google/go-querystring v1.1.0 // indirect
5556
github.com/google/gopacket v1.1.19 // indirect
56-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
57+
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
5758
github.com/google/uuid v1.6.0 // indirect
5859
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
5960
github.com/gorilla/websocket v1.5.3 // indirect
60-
github.com/hashicorp/errwrap v1.1.0 // indirect
61-
github.com/hashicorp/go-multierror v1.1.1 // indirect
6261
github.com/hashicorp/golang-lru v1.0.2 // indirect
6362
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
6463
github.com/huin/goupnp v1.3.0 // indirect
6564
github.com/imkira/go-interpol v1.1.0 // indirect
6665
github.com/ipfs/bbloom v0.0.4 // indirect
6766
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
6867
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
69-
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
70-
github.com/ipfs/go-ipld-format v0.6.0 // indirect
68+
github.com/ipfs/go-ipld-format v0.6.1 // indirect
7169
github.com/ipfs/go-ipld-legacy v0.2.1 // indirect
72-
github.com/ipfs/go-log v1.0.5 // indirect
73-
github.com/ipfs/go-log/v2 v2.5.1 // indirect
74-
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
75-
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
76-
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
70+
github.com/ipfs/go-log/v2 v2.6.0 // indirect
71+
github.com/ipfs/go-metrics-interface v0.3.0 // indirect
72+
github.com/ipfs/go-peertaskqueue v0.8.2 // indirect
73+
github.com/ipld/go-codec-dagpb v1.7.0 // indirect
7774
github.com/ipld/go-ipld-prime v0.21.0 // indirect
7875
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
7976
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
80-
github.com/jbenet/goprocess v0.1.4 // indirect
81-
github.com/klauspost/compress v1.17.9 // indirect
82-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
83-
github.com/koron/go-ssdp v0.0.4 // indirect
77+
github.com/klauspost/compress v1.18.0 // indirect
78+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
79+
github.com/koron/go-ssdp v0.0.6 // indirect
8480
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
8581
github.com/libp2p/go-cidranger v1.1.0 // indirect
86-
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
82+
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
8783
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
88-
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
84+
github.com/libp2p/go-libp2p-kbucket v0.7.0 // indirect
85+
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
8986
github.com/libp2p/go-libp2p-xor v0.1.0 // indirect
90-
github.com/libp2p/go-mplex v0.7.0 // indirect
91-
github.com/libp2p/go-nat v0.2.0 // indirect
92-
github.com/libp2p/go-netroute v0.2.1 // indirect
87+
github.com/libp2p/go-netroute v0.2.2 // indirect
9388
github.com/libp2p/go-reuseport v0.4.0 // indirect
94-
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
89+
github.com/libp2p/go-yamux/v5 v5.0.0 // indirect
9590
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
96-
github.com/mattn/go-colorable v0.1.13 // indirect
91+
github.com/mattn/go-colorable v0.1.14 // indirect
9792
github.com/mattn/go-isatty v0.0.20 // indirect
9893
github.com/mattn/go-runewidth v0.0.16 // indirect
99-
github.com/miekg/dns v1.1.62 // indirect
94+
github.com/miekg/dns v1.1.66 // indirect
10095
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
10196
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
10297
github.com/minio/sha256-simd v1.0.1 // indirect
10398
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
10499
github.com/mr-tron/base58 v1.2.0 // indirect
105100
github.com/multiformats/go-base32 v0.1.0 // indirect
106101
github.com/multiformats/go-base36 v0.2.0 // indirect
107-
github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect
102+
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
108103
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
109104
github.com/multiformats/go-multibase v0.2.0 // indirect
110105
github.com/multiformats/go-multicodec v0.9.0 // indirect
111-
github.com/multiformats/go-multistream v0.5.0 // indirect
106+
github.com/multiformats/go-multistream v0.6.0 // indirect
112107
github.com/multiformats/go-varint v0.0.7 // indirect
113108
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
114-
github.com/onsi/ginkgo/v2 v2.20.0 // indirect
115-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
116-
github.com/opentracing/opentracing-go v1.2.0 // indirect
109+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
110+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
117111
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
118-
github.com/pion/datachannel v1.5.8 // indirect
112+
github.com/pion/datachannel v1.5.10 // indirect
119113
github.com/pion/dtls/v2 v2.2.12 // indirect
120-
github.com/pion/ice/v2 v2.3.34 // indirect
121-
github.com/pion/interceptor v0.1.30 // indirect
122-
github.com/pion/logging v0.2.2 // indirect
123-
github.com/pion/mdns v0.0.12 // indirect
114+
github.com/pion/dtls/v3 v3.0.6 // indirect
115+
github.com/pion/ice/v4 v4.0.10 // indirect
116+
github.com/pion/interceptor v0.1.37 // indirect
117+
github.com/pion/logging v0.2.3 // indirect
118+
github.com/pion/mdns/v2 v2.0.7 // indirect
124119
github.com/pion/randutil v0.1.0 // indirect
125-
github.com/pion/rtcp v1.2.14 // indirect
126-
github.com/pion/rtp v1.8.9 // indirect
127-
github.com/pion/sctp v1.8.33 // indirect
128-
github.com/pion/sdp/v3 v3.0.9 // indirect
129-
github.com/pion/srtp/v2 v2.0.20 // indirect
120+
github.com/pion/rtcp v1.2.15 // indirect
121+
github.com/pion/rtp v1.8.15 // indirect
122+
github.com/pion/sctp v1.8.39 // indirect
123+
github.com/pion/sdp/v3 v3.0.12 // indirect
124+
github.com/pion/srtp/v3 v3.0.4 // indirect
130125
github.com/pion/stun v0.6.1 // indirect
126+
github.com/pion/stun/v3 v3.0.0 // indirect
131127
github.com/pion/transport/v2 v2.2.10 // indirect
132-
github.com/pion/turn/v2 v2.1.6 // indirect
133-
github.com/pion/webrtc/v3 v3.3.0 // indirect
128+
github.com/pion/transport/v3 v3.0.7 // indirect
129+
github.com/pion/turn/v4 v4.0.2 // indirect
130+
github.com/pion/webrtc/v4 v4.1.1 // indirect
134131
github.com/pkg/errors v0.9.1 // indirect
135132
github.com/pmezard/go-difflib v1.0.0 // indirect
136133
github.com/polydawn/refmt v0.89.0 // indirect
137-
github.com/prometheus/client_model v0.6.1 // indirect
138-
github.com/prometheus/common v0.55.0 // indirect
139-
github.com/prometheus/procfs v0.15.1 // indirect
140-
github.com/quic-go/qpack v0.4.0 // indirect
141-
github.com/quic-go/quic-go v0.46.0 // indirect
142-
github.com/quic-go/webtransport-go v0.8.0 // indirect
134+
github.com/prometheus/client_model v0.6.2 // indirect
135+
github.com/prometheus/common v0.64.0 // indirect
136+
github.com/prometheus/procfs v0.16.1 // indirect
137+
github.com/quic-go/qpack v0.5.1 // indirect
138+
github.com/quic-go/quic-go v0.52.0 // indirect
139+
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
143140
github.com/raulk/go-watchdog v1.3.0 // indirect
144141
github.com/rivo/uniseg v0.4.7 // indirect
145142
github.com/russross/blackfriday/v2 v2.1.0 // indirect
146-
github.com/samber/lo v1.39.0 // indirect
143+
github.com/samber/lo v1.47.0 // indirect
147144
github.com/sanity-io/litter v1.5.5 // indirect
148145
github.com/sergi/go-diff v1.3.1 // indirect
149146
github.com/smartystreets/assertions v1.13.0 // indirect
150147
github.com/spaolacci/murmur3 v1.1.0 // indirect
151148
github.com/valyala/bytebufferpool v1.0.0 // indirect
152149
github.com/valyala/fasthttp v1.55.0 // indirect
153150
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
154-
github.com/wlynxg/anet v0.0.4 // indirect
151+
github.com/wlynxg/anet v0.0.5 // indirect
155152
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
156153
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
157154
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -160,25 +157,27 @@ require (
160157
github.com/yudai/gojsondiff v1.0.0 // indirect
161158
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
162159
go.opencensus.io v0.24.0 // indirect
163-
go.opentelemetry.io/otel v1.28.0 // indirect
164-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
165-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
166-
go.uber.org/dig v1.18.0 // indirect
167-
go.uber.org/fx v1.22.2 // indirect
168-
go.uber.org/mock v0.4.0 // indirect
160+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
161+
go.opentelemetry.io/otel v1.36.0 // indirect
162+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
163+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
164+
go.uber.org/automaxprocs v1.6.0 // indirect
165+
go.uber.org/dig v1.19.0 // indirect
166+
go.uber.org/fx v1.24.0 // indirect
167+
go.uber.org/mock v0.5.2 // indirect
169168
go.uber.org/multierr v1.11.0 // indirect
170169
go.uber.org/zap v1.27.0 // indirect
171-
golang.org/x/crypto v0.26.0 // indirect
172-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
173-
golang.org/x/mod v0.20.0 // indirect
174-
golang.org/x/net v0.28.0 // indirect
175-
golang.org/x/sync v0.8.0 // indirect
176-
golang.org/x/sys v0.24.0 // indirect
177-
golang.org/x/text v0.17.0 // indirect
178-
golang.org/x/tools v0.24.0 // indirect
179-
gonum.org/v1/gonum v0.15.0 // indirect
180-
google.golang.org/protobuf v1.34.2 // indirect
170+
golang.org/x/crypto v0.38.0 // indirect
171+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
172+
golang.org/x/mod v0.24.0 // indirect
173+
golang.org/x/net v0.40.0 // indirect
174+
golang.org/x/sync v0.14.0 // indirect
175+
golang.org/x/sys v0.33.0 // indirect
176+
golang.org/x/text v0.25.0 // indirect
177+
golang.org/x/tools v0.33.0 // indirect
178+
gonum.org/v1/gonum v0.16.0 // indirect
179+
google.golang.org/protobuf v1.36.6 // indirect
181180
gopkg.in/yaml.v3 v3.0.1 // indirect
182-
lukechampine.com/blake3 v1.3.0 // indirect
181+
lukechampine.com/blake3 v1.4.1 // indirect
183182
moul.io/http2curl/v2 v2.3.0 // indirect
184183
)

0 commit comments

Comments
 (0)