Skip to content

Commit f0ce5cb

Browse files
parkanArkadiy Kukarkin
andauthored
feat!: disable bitswap and upgrade boxo to v0.35.0 (#516)
- bitswap APIs changed substantially in boxo v0.25.0+ and are unused - remove routing param from NewFromIpfsHost - upgrade go-graphsync to v0.18.0 for go-log compatibility - remove all bitswap-related code and tests BREAKING CHANGE: remove bitswap retrieval support and change NewFromIpfsHost signature Co-authored-by: Arkadiy Kukarkin <arkadiy@archive.org>
1 parent 87ab676 commit f0ce5cb

30 files changed

+248
-7329
lines changed

go.mod

Lines changed: 68 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,40 @@ require (
1010
github.com/filecoin-project/go-state-types v0.15.0
1111
github.com/google/uuid v1.6.0
1212
github.com/hannahhoward/go-pubsub v1.0.0
13-
github.com/ipfs/boxo v0.24.3
14-
github.com/ipfs/go-block-format v0.2.0
15-
github.com/ipfs/go-cid v0.4.1
16-
github.com/ipfs/go-datastore v0.6.0
17-
github.com/ipfs/go-graphsync v0.17.0
13+
github.com/ipfs/go-block-format v0.2.3
14+
github.com/ipfs/go-cid v0.5.0
15+
github.com/ipfs/go-datastore v0.9.0
16+
github.com/ipfs/go-graphsync v0.18.0
1817
github.com/ipfs/go-ipfs-blocksutil v0.0.2
19-
github.com/ipfs/go-ipfs-delay v0.0.1
20-
github.com/ipfs/go-ipld-format v0.6.0
21-
github.com/ipfs/go-log/v2 v2.5.1
22-
github.com/ipfs/go-unixfsnode v1.9.2
23-
github.com/ipld/go-car/v2 v2.14.2
24-
github.com/ipld/go-codec-dagpb v1.6.0
25-
github.com/ipld/go-fixtureplate v0.0.2
18+
github.com/ipfs/go-log/v2 v2.8.2
19+
github.com/ipfs/go-unixfsnode v1.10.2
20+
github.com/ipld/go-car/v2 v2.15.0
21+
github.com/ipld/go-codec-dagpb v1.7.0
2622
github.com/ipld/go-ipld-prime v0.21.0
2723
github.com/ipld/go-trustless-utils v0.4.1
28-
github.com/ipld/ipld/specs v0.0.0-20231012031213-54d3b21deda4
2924
github.com/ipni/go-libipni v0.6.14
30-
github.com/ipni/storetheindex v0.8.14
31-
github.com/libp2p/go-libp2p v0.37.2
32-
github.com/libp2p/go-libp2p-routing-helpers v0.7.4
33-
github.com/libp2p/go-libp2p-testing v0.12.0
25+
github.com/libp2p/go-libp2p v0.43.0
3426
github.com/mitchellh/go-server-timing v1.0.1
35-
github.com/multiformats/go-multiaddr v0.14.0
36-
github.com/multiformats/go-multicodec v0.9.0
27+
github.com/multiformats/go-multiaddr v0.16.1
28+
github.com/multiformats/go-multicodec v0.9.2
3729
github.com/multiformats/go-multihash v0.2.3
38-
github.com/stretchr/testify v1.10.0
30+
github.com/stretchr/testify v1.11.1
3931
github.com/urfave/cli/v2 v2.27.5
40-
go.opentelemetry.io/otel v1.33.0
41-
go.opentelemetry.io/otel/trace v1.33.0
32+
go.opentelemetry.io/otel v1.38.0
33+
go.opentelemetry.io/otel/trace v1.38.0
4234
go.uber.org/multierr v1.11.0
43-
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
4435
)
4536

4637
require (
47-
github.com/Jorropo/jsync v1.0.1 // indirect
4838
github.com/benbjohnson/clock v1.3.5 // indirect
4939
github.com/beorn7/perks v1.0.1 // indirect
5040
github.com/bep/debounce v1.2.1 // indirect
5141
github.com/cespare/xxhash v1.1.0 // indirect
5242
github.com/cespare/xxhash/v2 v2.3.0 // indirect
53-
github.com/containerd/cgroups v1.1.0 // indirect
54-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5543
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
56-
github.com/cskr/pubsub v1.0.2 // indirect
5744
github.com/davecgh/go-spew v1.1.1 // indirect
5845
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
59-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
60-
github.com/docker/go-units v0.5.0 // indirect
61-
github.com/elastic/gosigar v0.14.3 // indirect
46+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
6247
github.com/felixge/httpsnoop v1.0.4 // indirect
6348
github.com/filecoin-project/go-address v1.2.0 // indirect
6449
github.com/filecoin-project/go-amt-ipld/v4 v4.4.0 // indirect
@@ -69,51 +54,38 @@ require (
6954
github.com/filecoin-project/go-statestore v0.2.0 // indirect
7055
github.com/flynn/noise v1.1.0 // indirect
7156
github.com/francoispqt/gojay v1.2.13 // indirect
72-
github.com/go-logr/logr v1.4.2 // indirect
57+
github.com/go-logr/logr v1.4.3 // indirect
7358
github.com/go-logr/stdr v1.2.2 // indirect
74-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
75-
github.com/godbus/dbus/v5 v5.1.0 // indirect
7659
github.com/gogo/protobuf v1.3.2 // indirect
7760
github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5 // indirect
7861
github.com/google/gopacket v1.1.19 // indirect
79-
github.com/google/pprof v0.0.0-20241017200806-017d972448fc // indirect
8062
github.com/gorilla/websocket v1.5.3 // indirect
8163
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c // indirect
82-
github.com/hashicorp/errwrap v1.1.0 // indirect
83-
github.com/hashicorp/go-multierror v1.1.1 // indirect
84-
github.com/hashicorp/golang-lru v1.0.2 // indirect
85-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8664
github.com/huin/goupnp v1.3.0 // indirect
87-
github.com/ipfs/bbloom v0.0.4 // indirect
65+
github.com/ipfs/boxo v0.35.0 // indirect
8866
github.com/ipfs/go-bitfield v1.1.0 // indirect
89-
github.com/ipfs/go-ipfs-blockstore v1.3.1 // indirect
90-
github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
9167
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
92-
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
93-
github.com/ipfs/go-ipld-cbor v0.2.0 // indirect
68+
github.com/ipfs/go-ipld-cbor v0.2.1 // indirect
69+
github.com/ipfs/go-ipld-format v0.6.3 // indirect
9470
github.com/ipfs/go-log v1.0.5 // indirect
95-
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
96-
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
71+
github.com/ipfs/go-peertaskqueue v0.8.2 // indirect
9772
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
9873
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c // indirect
9974
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
100-
github.com/jbenet/goprocess v0.1.4 // indirect
10175
github.com/jpillora/backoff v1.0.0 // indirect
102-
github.com/klauspost/compress v1.17.11 // indirect
103-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
104-
github.com/koron/go-ssdp v0.0.4 // indirect
76+
github.com/klauspost/compress v1.18.0 // indirect
77+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
78+
github.com/koron/go-ssdp v0.0.6 // indirect
10579
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
106-
github.com/libp2p/go-flow-metrics v0.2.0 // indirect
80+
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
10781
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
108-
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
10982
github.com/libp2p/go-msgio v0.3.0 // indirect
110-
github.com/libp2p/go-nat v0.2.0 // indirect
111-
github.com/libp2p/go-netroute v0.2.1 // indirect
83+
github.com/libp2p/go-netroute v0.2.2 // indirect
11284
github.com/libp2p/go-reuseport v0.4.0 // indirect
113-
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
85+
github.com/libp2p/go-yamux/v5 v5.0.1 // indirect
11486
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
11587
github.com/mattn/go-isatty v0.0.20 // indirect
116-
github.com/miekg/dns v1.1.62 // indirect
88+
github.com/miekg/dns v1.1.68 // indirect
11789
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
11890
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
11991
github.com/minio/sha256-simd v1.0.1 // indirect
@@ -123,66 +95,68 @@ require (
12395
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
12496
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
12597
github.com/multiformats/go-multibase v0.2.0 // indirect
126-
github.com/multiformats/go-multistream v0.6.0 // indirect
98+
github.com/multiformats/go-multistream v0.6.1 // indirect
12799
github.com/multiformats/go-varint v0.0.7 // indirect
128100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
129-
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
130-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
131101
github.com/opentracing/opentracing-go v1.2.0 // indirect
132102
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
133103
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
134-
github.com/pion/datachannel v1.5.9 // indirect
104+
github.com/pion/datachannel v1.5.10 // indirect
135105
github.com/pion/dtls/v2 v2.2.12 // indirect
136-
github.com/pion/ice/v2 v2.3.36 // indirect
137-
github.com/pion/interceptor v0.1.37 // indirect
138-
github.com/pion/logging v0.2.2 // indirect
139-
github.com/pion/mdns v0.0.12 // indirect
106+
github.com/pion/dtls/v3 v3.0.6 // indirect
107+
github.com/pion/ice/v4 v4.0.10 // indirect
108+
github.com/pion/interceptor v0.1.40 // indirect
109+
github.com/pion/logging v0.2.3 // indirect
110+
github.com/pion/mdns/v2 v2.0.7 // indirect
140111
github.com/pion/randutil v0.1.0 // indirect
141-
github.com/pion/rtcp v1.2.14 // indirect
142-
github.com/pion/rtp v1.8.9 // indirect
143-
github.com/pion/sctp v1.8.33 // indirect
144-
github.com/pion/sdp/v3 v3.0.9 // indirect
145-
github.com/pion/srtp/v2 v2.0.20 // indirect
112+
github.com/pion/rtcp v1.2.15 // indirect
113+
github.com/pion/rtp v1.8.19 // indirect
114+
github.com/pion/sctp v1.8.39 // indirect
115+
github.com/pion/sdp/v3 v3.0.13 // indirect
116+
github.com/pion/srtp/v3 v3.0.6 // indirect
146117
github.com/pion/stun v0.6.1 // indirect
118+
github.com/pion/stun/v3 v3.0.0 // indirect
147119
github.com/pion/transport/v2 v2.2.10 // indirect
148-
github.com/pion/turn/v2 v2.1.6 // indirect
149-
github.com/pion/webrtc/v3 v3.3.4 // indirect
150-
github.com/pkg/errors v0.9.1 // indirect
120+
github.com/pion/transport/v3 v3.0.7 // indirect
121+
github.com/pion/turn/v4 v4.0.2 // indirect
122+
github.com/pion/webrtc/v4 v4.1.2 // indirect
151123
github.com/pmezard/go-difflib v1.0.0 // indirect
152124
github.com/polydawn/refmt v0.89.0 // indirect
153-
github.com/prometheus/client_golang v1.20.5 // indirect
154-
github.com/prometheus/client_model v0.6.1 // indirect
155-
github.com/prometheus/common v0.60.0 // indirect
156-
github.com/prometheus/procfs v0.15.1 // indirect
125+
github.com/prometheus/client_golang v1.23.2 // indirect
126+
github.com/prometheus/client_model v0.6.2 // indirect
127+
github.com/prometheus/common v0.66.1 // indirect
128+
github.com/prometheus/procfs v0.17.0 // indirect
157129
github.com/quic-go/qpack v0.5.1 // indirect
158-
github.com/quic-go/quic-go v0.49.1 // indirect
159-
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
160-
github.com/raulk/go-watchdog v1.3.0 // indirect
130+
github.com/quic-go/quic-go v0.54.0 // indirect
131+
github.com/quic-go/webtransport-go v0.9.0 // indirect
161132
github.com/russross/blackfriday/v2 v2.1.0 // indirect
162133
github.com/spaolacci/murmur3 v1.1.0 // indirect
163-
github.com/warpfork/go-testmark v0.12.1 // indirect
164134
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 // indirect
165-
github.com/whyrusleeping/cbor-gen v0.2.0 // indirect
135+
github.com/whyrusleeping/cbor-gen v0.3.1 // indirect
166136
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
167137
github.com/wlynxg/anet v0.0.5 // indirect
168138
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
169139
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
140+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
171141
go.uber.org/atomic v1.11.0 // indirect
172-
go.uber.org/dig v1.18.0 // indirect
173-
go.uber.org/fx v1.23.0 // indirect
174-
go.uber.org/mock v0.5.0 // indirect
142+
go.uber.org/dig v1.19.0 // indirect
143+
go.uber.org/fx v1.24.0 // indirect
144+
go.uber.org/mock v0.5.2 // indirect
175145
go.uber.org/zap v1.27.0 // indirect
176-
golang.org/x/crypto v0.45.0 // indirect
177-
golang.org/x/mod v0.29.0 // indirect
178-
golang.org/x/net v0.47.0 // indirect
179-
golang.org/x/sync v0.18.0 // indirect
180-
golang.org/x/sys v0.38.0 // indirect
181-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
182-
golang.org/x/text v0.31.0 // indirect
183-
golang.org/x/tools v0.38.0 // indirect
146+
go.yaml.in/yaml/v2 v2.4.2 // indirect
147+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
148+
golang.org/x/crypto v0.42.0 // indirect
149+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
150+
golang.org/x/mod v0.28.0 // indirect
151+
golang.org/x/net v0.44.0 // indirect
152+
golang.org/x/sync v0.17.0 // indirect
153+
golang.org/x/sys v0.36.0 // indirect
154+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
155+
golang.org/x/text v0.29.0 // indirect
156+
golang.org/x/time v0.12.0 // indirect
157+
golang.org/x/tools v0.37.0 // indirect
184158
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
185-
google.golang.org/protobuf v1.35.1 // indirect
159+
google.golang.org/protobuf v1.36.9 // indirect
186160
gopkg.in/yaml.v3 v3.0.1 // indirect
187-
lukechampine.com/blake3 v1.3.0 // indirect
161+
lukechampine.com/blake3 v1.4.1 // indirect
188162
)

0 commit comments

Comments
 (0)