Skip to content

Commit b08e0ea

Browse files
marten-seemannmarten-seemann
committed
update go-libp2p to v0.24.0
1 parent f87f903 commit b08e0ea

File tree

7 files changed

+225
-598
lines changed

7 files changed

+225
-598
lines changed

‎core/node/libp2p/rcmgr.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"go.opencensus.io/stats/view"
2020
"go.uber.org/fx"
2121

22-
config "github.com/ipfs/kubo/config"
22+
"github.com/ipfs/kubo/config"
2323
"github.com/ipfs/kubo/core/node/helpers"
2424
"github.com/ipfs/kubo/repo"
2525
)
@@ -113,7 +113,7 @@ func ResourceManager(cfg config.SwarmConfig) interface{} {
113113
manager = lrm
114114
} else {
115115
log.Debug("libp2p resource manager is disabled")
116-
manager = network.NullResourceManager
116+
manager = &network.NullResourceManager{}
117117
}
118118

119119
opts.Opts = append(opts.Opts, libp2p.ResourceManager(manager))

‎core/node/libp2p/smux.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@ func yamuxTransport() network.Multiplexer {
1919
if os.Getenv("YAMUX_DEBUG") != "" {
2020
tpt.LogOutput = os.Stderr
2121
}
22-
2322
return &tpt
2423
}
2524

2625
func makeSmuxTransportOption(tptConfig config.Transports) (libp2p.Option, error) {
2726
const yamuxID = "/yamux/1.0.0"
2827
const mplexID = "/mplex/6.7.0"
2928

30-
ymxtpt := *yamux.DefaultTransport
31-
ymxtpt.AcceptBacklog = 512
32-
3329
if prefs := os.Getenv("LIBP2P_MUX_PREFS"); prefs != "" {
3430
// Using legacy LIBP2P_MUX_PREFS variable.
3531
log.Error("LIBP2P_MUX_PREFS is now deprecated.")
@@ -47,7 +43,7 @@ func makeSmuxTransportOption(tptConfig config.Transports) (libp2p.Option, error)
4743
}
4844
switch tpt {
4945
case yamuxID:
50-
opts = append(opts, libp2p.Muxer(tpt, yamuxTransport))
46+
opts = append(opts, libp2p.Muxer(tpt, yamuxTransport()))
5147
case mplexID:
5248
opts = append(opts, libp2p.Muxer(tpt, mplex.DefaultTransport))
5349
default:
@@ -59,7 +55,7 @@ func makeSmuxTransportOption(tptConfig config.Transports) (libp2p.Option, error)
5955
return prioritizeOptions([]priorityOption{{
6056
priority: tptConfig.Multiplexers.Yamux,
6157
defaultPriority: 100,
62-
opt: libp2p.Muxer(yamuxID, yamuxTransport),
58+
opt: libp2p.Muxer(yamuxID, yamuxTransport()),
6359
}, {
6460
priority: tptConfig.Multiplexers.Mplex,
6561
defaultPriority: 200,

‎core/node/libp2p/transport.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Transports(tptConfig config.Transports) interface{} {
3737
)
3838
}
3939
// TODO(9290): Make WithMetrics configurable
40-
opts.Opts = append(opts.Opts, libp2p.Transport(quic.NewTransport, quic.WithMetrics()))
40+
opts.Opts = append(opts.Opts, libp2p.Transport(quic.NewTransport))
4141
}
4242

4343
// TODO(9292): Remove the false && to allows it enabled by default

‎docs/examples/kubo-as-a-library/go.mod‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ replace github.com/ipfs/kubo => ./../../..
88

99
require (
1010
github.com/ipfs/go-ipfs-files v0.2.0
11-
github.com/ipfs/interface-go-ipfs-core v0.7.0
12-
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
13-
github.com/libp2p/go-libp2p v0.23.4
11+
github.com/ipfs/interface-go-ipfs-core v0.7.1-0.20221120203801-f89bb275e3a9
12+
github.com/ipfs/kubo v0.14.0-rc1
13+
github.com/libp2p/go-libp2p v0.24.0
1414
github.com/multiformats/go-multiaddr v0.8.0
1515
)
1616

@@ -27,7 +27,7 @@ require (
2727
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2828
github.com/ceramicnetwork/go-dag-jose v0.1.0 // indirect
2929
github.com/cespare/xxhash v1.1.0 // indirect
30-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3131
github.com/containerd/cgroups v1.0.4 // indirect
3232
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3333
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
@@ -42,7 +42,6 @@ require (
4242
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect
4343
github.com/flynn/noise v1.0.0 // indirect
4444
github.com/francoispqt/gojay v1.2.13 // indirect
45-
github.com/fsnotify/fsnotify v1.6.0 // indirect
4645
github.com/go-logr/logr v1.2.3 // indirect
4746
github.com/go-logr/stdr v1.2.2 // indirect
4847
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
@@ -52,6 +51,7 @@ require (
5251
github.com/golang/protobuf v1.5.2 // indirect
5352
github.com/golang/snappy v0.0.4 // indirect
5453
github.com/google/gopacket v1.1.19 // indirect
54+
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
5555
github.com/google/uuid v1.3.0 // indirect
5656
github.com/gorilla/websocket v1.5.0 // indirect
5757
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
@@ -62,9 +62,9 @@ require (
6262
github.com/huin/goupnp v1.0.3 // indirect
6363
github.com/ipfs/bbloom v0.0.4 // indirect
6464
github.com/ipfs/go-bitfield v1.0.0 // indirect
65-
github.com/ipfs/go-bitswap v0.10.2 // indirect
65+
github.com/ipfs/go-bitswap v0.10.3-0.20221120205136-477864bef226 // indirect
6666
github.com/ipfs/go-block-format v0.0.3 // indirect
67-
github.com/ipfs/go-blockservice v0.4.0 // indirect
67+
github.com/ipfs/go-blockservice v0.4.1-0.20221120205542-2802d799fc41 // indirect
6868
github.com/ipfs/go-cid v0.3.2 // indirect
6969
github.com/ipfs/go-cidutil v0.1.0 // indirect
7070
github.com/ipfs/go-datastore v0.6.0 // indirect
@@ -76,19 +76,19 @@ require (
7676
github.com/ipfs/go-fetcher v1.6.1 // indirect
7777
github.com/ipfs/go-filestore v1.2.0 // indirect
7878
github.com/ipfs/go-fs-lock v0.0.7 // indirect
79-
github.com/ipfs/go-graphsync v0.13.1 // indirect
79+
github.com/ipfs/go-graphsync v0.14.1-0.20221120210616-975d7aaeb15b // indirect
8080
github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
8181
github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect
8282
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
8383
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
8484
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
8585
github.com/ipfs/go-ipfs-exchange-offline v0.3.0 // indirect
86-
github.com/ipfs/go-ipfs-keystore v0.0.2 // indirect
86+
github.com/ipfs/go-ipfs-keystore v0.0.3-0.20221120211101-3b22462bc06a // indirect
8787
github.com/ipfs/go-ipfs-pinner v0.2.1 // indirect
8888
github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
8989
github.com/ipfs/go-ipfs-pq v0.0.2 // indirect
90-
github.com/ipfs/go-ipfs-provider v0.7.1 // indirect
91-
github.com/ipfs/go-ipfs-routing v0.2.1 // indirect
90+
github.com/ipfs/go-ipfs-provider v0.7.2-0.20221120212241-08a55de158e8 // indirect
91+
github.com/ipfs/go-ipfs-routing v0.3.0 // indirect
9292
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
9393
github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
9494
github.com/ipfs/go-ipld-format v0.4.0 // indirect
@@ -100,9 +100,9 @@ require (
100100
github.com/ipfs/go-merkledag v0.8.1 // indirect
101101
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
102102
github.com/ipfs/go-mfs v0.2.1 // indirect
103-
github.com/ipfs/go-namesys v0.5.0 // indirect
103+
github.com/ipfs/go-namesys v0.5.1-0.20221120211645-2da84aa78e80 // indirect
104104
github.com/ipfs/go-path v0.3.0 // indirect
105-
github.com/ipfs/go-peertaskqueue v0.7.1 // indirect
105+
github.com/ipfs/go-peertaskqueue v0.8.0 // indirect
106106
github.com/ipfs/go-unixfs v0.4.1 // indirect
107107
github.com/ipfs/go-unixfsnode v1.4.0 // indirect
108108
github.com/ipfs/go-verifcid v0.0.2 // indirect
@@ -113,18 +113,17 @@ require (
113113
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
114114
github.com/jbenet/goprocess v0.1.4 // indirect
115115
github.com/klauspost/compress v1.15.12 // indirect
116-
github.com/klauspost/cpuid/v2 v2.1.2 // indirect
116+
github.com/klauspost/cpuid/v2 v2.2.1 // indirect
117117
github.com/koron/go-ssdp v0.0.3 // indirect
118118
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
119119
github.com/libp2p/go-cidranger v1.1.0 // indirect
120120
github.com/libp2p/go-doh-resolver v0.4.0 // indirect
121121
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
122122
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
123-
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
124-
github.com/libp2p/go-libp2p-kad-dht v0.18.0 // indirect
125-
github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
123+
github.com/libp2p/go-libp2p-kad-dht v0.18.1-0.20221120203245-43eacaff1f99 // indirect
124+
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
126125
github.com/libp2p/go-libp2p-pubsub v0.8.1 // indirect
127-
github.com/libp2p/go-libp2p-pubsub-router v0.5.0 // indirect
126+
github.com/libp2p/go-libp2p-pubsub-router v0.6.0 // indirect
128127
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
129128
github.com/libp2p/go-libp2p-routing-helpers v0.4.1 // indirect
130129
github.com/libp2p/go-libp2p-xor v0.1.0 // indirect
@@ -136,12 +135,12 @@ require (
136135
github.com/libp2p/go-reuseport v0.2.0 // indirect
137136
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
138137
github.com/libp2p/zeroconf/v2 v2.2.0 // indirect
139-
github.com/lucas-clemente/quic-go v0.29.1 // indirect
138+
github.com/lucas-clemente/quic-go v0.31.0 // indirect
140139
github.com/marten-seemann/qpack v0.3.0 // indirect
141140
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
142141
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
143142
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
144-
github.com/marten-seemann/webtransport-go v0.1.1 // indirect
143+
github.com/marten-seemann/webtransport-go v0.4.1 // indirect
145144
github.com/mattn/go-isatty v0.0.16 // indirect
146145
github.com/mattn/go-pointer v0.0.1 // indirect
147146
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -152,16 +151,15 @@ require (
152151
github.com/mitchellh/go-homedir v1.1.0 // indirect
153152
github.com/mr-tron/base58 v1.2.0 // indirect
154153
github.com/multiformats/go-base32 v0.1.0 // indirect
155-
github.com/multiformats/go-base36 v0.1.0 // indirect
154+
github.com/multiformats/go-base36 v0.2.0 // indirect
156155
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
157156
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
158157
github.com/multiformats/go-multibase v0.1.1 // indirect
159158
github.com/multiformats/go-multicodec v0.7.0 // indirect
160159
github.com/multiformats/go-multihash v0.2.1 // indirect
161160
github.com/multiformats/go-multistream v0.3.3 // indirect
162-
github.com/multiformats/go-varint v0.0.6 // indirect
163-
github.com/nxadm/tail v1.4.8 // indirect
164-
github.com/onsi/ginkgo v1.16.5 // indirect
161+
github.com/multiformats/go-varint v0.0.7 // indirect
162+
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
165163
github.com/opencontainers/runtime-spec v1.0.2 // indirect
166164
github.com/opentracing/opentracing-go v1.2.0 // indirect
167165
github.com/openzipkin/zipkin-go v0.4.0 // indirect
@@ -175,15 +173,14 @@ require (
175173
github.com/raulk/go-watchdog v1.3.0 // indirect
176174
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
177175
github.com/spaolacci/murmur3 v1.1.0 // indirect
178-
github.com/stretchr/objx v0.4.0 // indirect
179-
github.com/syndtr/goleveldb v1.0.0 // indirect
176+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
180177
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect
181178
github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect
182179
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
183180
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
184181
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
185182
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
186-
go.opencensus.io v0.23.0 // indirect
183+
go.opencensus.io v0.24.0 // indirect
187184
go.opentelemetry.io/otel v1.7.0 // indirect
188185
go.opentelemetry.io/otel/exporters/jaeger v1.7.0 // indirect
189186
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
@@ -196,24 +193,23 @@ require (
196193
go.opentelemetry.io/otel/trace v1.7.0 // indirect
197194
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
198195
go.uber.org/atomic v1.10.0 // indirect
199-
go.uber.org/dig v1.14.1 // indirect
200-
go.uber.org/fx v1.17.1 // indirect
196+
go.uber.org/dig v1.15.0 // indirect
197+
go.uber.org/fx v1.18.2 // indirect
201198
go.uber.org/multierr v1.8.0 // indirect
202-
go.uber.org/zap v1.23.0 // indirect
199+
go.uber.org/zap v1.24.0 // indirect
203200
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
204-
golang.org/x/crypto v0.1.0 // indirect
205-
golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
206-
golang.org/x/mod v0.6.0 // indirect
207-
golang.org/x/net v0.1.0 // indirect
201+
golang.org/x/crypto v0.3.0 // indirect
202+
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
203+
golang.org/x/mod v0.7.0 // indirect
204+
golang.org/x/net v0.3.0 // indirect
208205
golang.org/x/sync v0.1.0 // indirect
209-
golang.org/x/sys v0.2.0 // indirect
210-
golang.org/x/text v0.4.0 // indirect
211-
golang.org/x/tools v0.2.0 // indirect
206+
golang.org/x/sys v0.3.0 // indirect
207+
golang.org/x/text v0.5.0 // indirect
208+
golang.org/x/tools v0.3.0 // indirect
212209
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
213210
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
214211
google.golang.org/grpc v1.47.0 // indirect
215212
google.golang.org/protobuf v1.28.1 // indirect
216213
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
217-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
218214
lukechampine.com/blake3 v1.1.7 // indirect
219215
)

0 commit comments

Comments
 (0)