Skip to content

Commit be04b86

Browse files
guseggertguseggert
committed
feat: upgrade to go-libp2p-kad-dht@v0.16.0
1 parent b1c051d commit be04b86

File tree

7 files changed

+102
-78
lines changed

7 files changed

+102
-78
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ Below is an outline of all that is in this release, so you get a sense of all th
5353
- Now lists codecs from [go-multicodec](https://github.com/multiformats/go-multicodec) library.
5454
- `ipfs cid codecs --supported` can be passed to only show codecs supported in various go-ipfs commands.
5555

56+
#### `ipfs cid format` command
57+
- CidV0 Now correctly requires the `dag-pb` codec, instead of the `protobuf` codec.
58+
5659
#### `Swarm` configuration
5760
- Daemon will refuse to start if long-deprecated RelayV1 config key `Swarm.EnableAutoRelay` or `Swarm.DisableRelay` is set to `true`.
5861
- If `Swarm.Transports.Network.Relay` is disabled, then `Swarm.RelayService` and `Swarm.RelayClient` are also disabled (unless they have been explicitly enabled).

‎core/commands/cid.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import (
1111
cidutil "github.com/ipfs/go-cidutil"
1212
cmds "github.com/ipfs/go-ipfs-cmds"
1313
verifcid "github.com/ipfs/go-verifcid"
14-
"github.com/ipld/go-ipld-prime/multicodec"
14+
ipldmulticodec "github.com/ipld/go-ipld-prime/multicodec"
1515
mbase "github.com/multiformats/go-multibase"
16+
"github.com/multiformats/go-multicodec"
1617
mc "github.com/multiformats/go-multicodec"
1718
mhash "github.com/multiformats/go-multihash"
1819
)
@@ -70,11 +71,12 @@ The optional format string is a printf style format string:
7071
opts.fmtStr = fmtStr
7172

7273
if codecStr != "" {
73-
codec, ok := cid.Codecs[codecStr]
74-
if !ok {
75-
return fmt.Errorf("unknown IPLD codec: %q", codecStr)
74+
var codec multicodec.Code
75+
err := codec.Set(codecStr)
76+
if err != nil {
77+
return err
7678
}
77-
opts.newCodec = codec
79+
opts.newCodec = uint64(codec)
7880
} // otherwise, leave it as 0 (not a valid IPLD codec)
7981

8082
switch verStr {
@@ -324,10 +326,10 @@ var codecsCmd = &cmds.Command{
324326
listSupported, _ := req.Options[codecsSupportedOptionName].(bool)
325327
supportedCodecs := make(map[uint64]struct{})
326328
if listSupported {
327-
for _, code := range multicodec.ListEncoders() {
329+
for _, code := range ipldmulticodec.ListEncoders() {
328330
supportedCodecs[code] = struct{}{}
329331
}
330-
for _, code := range multicodec.ListDecoders() {
332+
for _, code := range ipldmulticodec.ListDecoders() {
331333
supportedCodecs[code] = struct{}{}
332334
}
333335
// add libp2p-key

‎go.mod

+25-25
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require (
44
bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
55
contrib.go.opencensus.io/exporter/prometheus v0.4.0
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/cenkalti/backoff/v4 v4.1.2
7+
github.com/cenkalti/backoff/v4 v4.1.3
88
github.com/ceramicnetwork/go-dag-jose v0.1.0
99
github.com/cespare/xxhash v1.1.0
1010
github.com/cheggaaa/pb v1.0.29
@@ -18,8 +18,8 @@ require (
1818
github.com/ipfs/go-bitswap v0.6.0
1919
github.com/ipfs/go-block-format v0.0.3
2020
github.com/ipfs/go-blockservice v0.3.0
21-
github.com/ipfs/go-cid v0.1.0
22-
github.com/ipfs/go-cidutil v0.0.2
21+
github.com/ipfs/go-cid v0.2.0
22+
github.com/ipfs/go-cidutil v0.1.0
2323
github.com/ipfs/go-datastore v0.5.1
2424
github.com/ipfs/go-detect-race v0.0.1
2525
github.com/ipfs/go-ds-badger v0.3.0
@@ -72,7 +72,7 @@ require (
7272
github.com/libp2p/go-libp2p-core v0.15.1
7373
github.com/libp2p/go-libp2p-discovery v0.6.0
7474
github.com/libp2p/go-libp2p-http v0.2.1
75-
github.com/libp2p/go-libp2p-kad-dht v0.15.0
75+
github.com/libp2p/go-libp2p-kad-dht v0.16.0
7676
github.com/libp2p/go-libp2p-kbucket v0.4.7
7777
github.com/libp2p/go-libp2p-loggables v0.1.0
7878
github.com/libp2p/go-libp2p-mplex v0.7.0
@@ -108,21 +108,21 @@ require (
108108
github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1
109109
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
110110
go.opencensus.io v0.23.0
111-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0
112-
go.opentelemetry.io/otel v1.6.3
113-
go.opentelemetry.io/otel/exporters/jaeger v1.6.3
114-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.3
115-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.3
116-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3
117-
go.opentelemetry.io/otel/exporters/zipkin v1.6.3
118-
go.opentelemetry.io/otel/sdk v1.6.3
119-
go.opentelemetry.io/otel/trace v1.6.3
111+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0
112+
go.opentelemetry.io/otel v1.7.0
113+
go.opentelemetry.io/otel/exporters/jaeger v1.7.0
114+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
115+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.7.0
116+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0
117+
go.opentelemetry.io/otel/exporters/zipkin v1.7.0
118+
go.opentelemetry.io/otel/sdk v1.7.0
119+
go.opentelemetry.io/otel/trace v1.7.0
120120
go.uber.org/dig v1.14.0
121121
go.uber.org/fx v1.16.0
122122
go.uber.org/zap v1.21.0
123-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
123+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
124124
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
125-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
125+
golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e
126126
)
127127

128128
require (
@@ -137,7 +137,7 @@ require (
137137
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
138138
github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 // indirect
139139
github.com/beorn7/perks v1.0.1 // indirect
140-
github.com/btcsuite/btcd v0.22.0-beta // indirect
140+
github.com/btcsuite/btcd v0.22.1 // indirect
141141
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
142142
github.com/cespare/xxhash/v2 v2.1.2 // indirect
143143
github.com/cheekybits/genny v1.0.0 // indirect
@@ -150,7 +150,7 @@ require (
150150
github.com/dgraph-io/ristretto v0.0.2 // indirect
151151
github.com/docker/go-units v0.4.0 // indirect
152152
github.com/elastic/gosigar v0.14.2 // indirect
153-
github.com/felixge/httpsnoop v1.0.2 // indirect
153+
github.com/felixge/httpsnoop v1.0.3 // indirect
154154
github.com/flynn/noise v1.0.0 // indirect
155155
github.com/francoispqt/gojay v1.2.13 // indirect
156156
github.com/go-kit/log v0.2.0 // indirect
@@ -168,7 +168,7 @@ require (
168168
github.com/gorilla/websocket v1.5.0 // indirect
169169
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
170170
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
171-
github.com/hashicorp/errwrap v1.0.0 // indirect
171+
github.com/hashicorp/errwrap v1.1.0 // indirect
172172
github.com/hashicorp/golang-lru v0.5.4 // indirect
173173
github.com/huin/goupnp v1.0.3 // indirect
174174
github.com/ipfs/bbloom v0.0.4 // indirect
@@ -192,7 +192,7 @@ require (
192192
github.com/libp2p/go-libp2p-nat v0.1.0 // indirect
193193
github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
194194
github.com/libp2p/go-libp2p-transport-upgrader v0.7.1 // indirect
195-
github.com/libp2p/go-libp2p-xor v0.0.0-20210714161855-5c005aca55db // indirect
195+
github.com/libp2p/go-libp2p-xor v0.1.0 // indirect
196196
github.com/libp2p/go-mplex v0.7.0 // indirect
197197
github.com/libp2p/go-msgio v0.2.0 // indirect
198198
github.com/libp2p/go-nat v0.1.0 // indirect
@@ -248,24 +248,24 @@ require (
248248
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
249249
github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 // indirect
250250
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
251-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect
252-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.3 // indirect
253-
go.opentelemetry.io/otel/metric v0.28.0 // indirect
254-
go.opentelemetry.io/proto/otlp v0.15.0 // indirect
251+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
252+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 // indirect
253+
go.opentelemetry.io/otel/metric v0.30.0 // indirect
254+
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
255255
go.uber.org/atomic v1.9.0 // indirect
256256
go.uber.org/multierr v1.8.0 // indirect
257257
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
258258
golang.org/x/exp v0.0.0-20210615023648-acb5c1269671 // indirect
259259
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
260-
golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 // indirect
260+
golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 // indirect
261261
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
262262
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
263263
golang.org/x/text v0.3.7 // indirect
264264
golang.org/x/tools v0.1.10 // indirect
265265
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
266266
google.golang.org/appengine v1.6.6 // indirect
267267
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
268-
google.golang.org/grpc v1.45.0 // indirect
268+
google.golang.org/grpc v1.46.0 // indirect
269269
google.golang.org/protobuf v1.28.0 // indirect
270270
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
271271
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

0 commit comments

Comments
 (0)