chore: bump boxo for verifcid breaking changes
This is a Q&D fix to get kubo building again, this is completely equivalent to what we used to have. I'll submit a patch that DI the verifcid.Allowlist interface with fx later but this is needed to unblock something else.
Jorropo committed
Aug 17, 2023 at 13:01 UTC
b4f415088f0d04916a4de6f6fa1e9ddf16c6bd53
10 files changed
+18
-18
core/commands/cid.go
+1
-1
@@ -377,7 +377,7 @@ var hashesCmd = &cmds.Command{
377
var res []CodeAndName
378
// use mhash.Codes in case at some point there are multiple names for a given code
379
for code, name := range mhash.Codes {
380
- if !verifcid.IsGoodHash(code) {
380
+ if !verifcid.DefaultAllowlist.IsAllowed(code) {
381
continue
382
}
383
res = append(res, CodeAndName{int(code), name})
core/commands/pin/pin.go
+1
-1
@@ -688,7 +688,7 @@ func pinVerify(ctx context.Context, n *core.IpfsNode, opts pinVerifyOpts, enc ci
688
return status
689
}
690
691
- if err := verifcid.ValidateCid(root); err != nil {
691
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, root); err != nil {
692
status := PinStatus{Ok: false}
693
if opts.explain {
694
status.BadNodes = []BadNode{{Cid: enc.Encode(key), Err: err.Error()}}
docs/examples/kubo-as-a-library/go.mod
+1
-1
@@ -7,7 +7,7 @@ go 1.18
7
replace github.com/ipfs/kubo => ./../../..
8
9
require (
10
- github.com/ipfs/boxo v0.11.0
10
+ github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f
11
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
12
github.com/libp2p/go-libp2p v0.29.2
13
github.com/multiformats/go-multiaddr v0.10.1
docs/examples/kubo-as-a-library/go.sum
+2
-2
@@ -301,8 +301,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
301
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
302
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
303
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
304
-github.com/ipfs/boxo v0.11.0 h1:urMxhZ3xoF4HssJVD3+0ssGT9pptEfHfbL8DYdoWFlg=
305
-github.com/ipfs/boxo v0.11.0/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
304
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f h1:sXqGLIATCsBdHse7S9n6e328NhORvVM64+4IRuFlpmI=
305
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
306
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
307
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
308
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
gc/gc.go
+1
-1
@@ -156,7 +156,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
156
// to walk the tree.
157
func Descendants(ctx context.Context, getLinks dag.GetLinks, set *cid.Set, roots <-chan pin.StreamedCid) error {
158
verifyGetLinks := func(ctx context.Context, c cid.Cid) ([]*ipld.Link, error) {
159
- err := verifcid.ValidateCid(c)
159
+ err := verifcid.ValidateCid(verifcid.DefaultAllowlist, c)
160
if err != nil {
161
return nil, err
162
}
go.mod
+1
-1
@@ -15,7 +15,7 @@ require (
15
github.com/fsnotify/fsnotify v1.6.0
16
github.com/google/uuid v1.3.0
17
github.com/hashicorp/go-multierror v1.1.1
18
- github.com/ipfs/boxo v0.11.0
18
+ github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f
19
github.com/ipfs/go-block-format v0.1.2
20
github.com/ipfs/go-cid v0.4.1
21
github.com/ipfs/go-cidutil v0.1.0
go.sum
+2
-2
@@ -337,8 +337,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
337
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
338
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
339
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
340
-github.com/ipfs/boxo v0.11.0 h1:urMxhZ3xoF4HssJVD3+0ssGT9pptEfHfbL8DYdoWFlg=
341
-github.com/ipfs/boxo v0.11.0/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
340
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f h1:sXqGLIATCsBdHse7S9n6e328NhORvVM64+4IRuFlpmI=
341
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
342
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
343
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
344
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
test/dependencies/go.mod
+1
-1
@@ -7,7 +7,7 @@ replace github.com/ipfs/kubo => ../../
7
require (
8
github.com/Kubuxu/gocovmerge v0.0.0-20161216165753-7ecaa51963cd
9
github.com/golangci/golangci-lint v1.49.0
10
- github.com/ipfs/boxo v0.11.0
10
+ github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f
11
github.com/ipfs/go-cid v0.4.1
12
github.com/ipfs/go-cidutil v0.1.0
13
github.com/ipfs/go-datastore v0.6.0
test/dependencies/go.sum
+2
-2
@@ -395,8 +395,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
395
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
396
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
397
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
398
-github.com/ipfs/boxo v0.11.0 h1:urMxhZ3xoF4HssJVD3+0ssGT9pptEfHfbL8DYdoWFlg=
399
-github.com/ipfs/boxo v0.11.0/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
398
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f h1:sXqGLIATCsBdHse7S9n6e328NhORvVM64+4IRuFlpmI=
399
+github.com/ipfs/boxo v0.11.1-0.20230817061817-1d2f5e511e9f/go.mod h1:8IfDmp+FzFGcF4zjAgHMVPpwYw4AjN9ePEzDfkaYJ1w=
400
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
401
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
402
github.com/ipfs/go-block-format v0.1.2 h1:GAjkfhVx1f4YTODS6Esrj1wt2HhrtwTnhEr+DyPUaJo=
thirdparty/verifbs/verifbs.go
+6
-6
@@ -14,7 +14,7 @@ type VerifBSGC struct {
14
}
15
16
func (bs *VerifBSGC) Put(ctx context.Context, b blocks.Block) error {
17
- if err := verifcid.ValidateCid(b.Cid()); err != nil {
17
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, b.Cid()); err != nil {
18
return err
19
}
20
return bs.GCBlockstore.Put(ctx, b)
@@ -22,7 +22,7 @@ func (bs *VerifBSGC) Put(ctx context.Context, b blocks.Block) error {
22
23
func (bs *VerifBSGC) PutMany(ctx context.Context, blks []blocks.Block) error {
24
for _, b := range blks {
25
- if err := verifcid.ValidateCid(b.Cid()); err != nil {
25
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, b.Cid()); err != nil {
26
return err
27
}
28
}
@@ -30,7 +30,7 @@ func (bs *VerifBSGC) PutMany(ctx context.Context, blks []blocks.Block) error {
30
}
31
32
func (bs *VerifBSGC) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
33
- if err := verifcid.ValidateCid(c); err != nil {
33
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, c); err != nil {
34
return nil, err
35
}
36
return bs.GCBlockstore.Get(ctx, c)
@@ -41,7 +41,7 @@ type VerifBS struct {
41
}
42
43
func (bs *VerifBS) Put(ctx context.Context, b blocks.Block) error {
44
- if err := verifcid.ValidateCid(b.Cid()); err != nil {
44
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, b.Cid()); err != nil {
45
return err
46
}
47
return bs.Blockstore.Put(ctx, b)
@@ -49,7 +49,7 @@ func (bs *VerifBS) Put(ctx context.Context, b blocks.Block) error {
49
50
func (bs *VerifBS) PutMany(ctx context.Context, blks []blocks.Block) error {
51
for _, b := range blks {
52
- if err := verifcid.ValidateCid(b.Cid()); err != nil {
52
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, b.Cid()); err != nil {
53
return err
54
}
55
}
@@ -57,7 +57,7 @@ func (bs *VerifBS) PutMany(ctx context.Context, blks []blocks.Block) error {
57
}
58
59
func (bs *VerifBS) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
60
- if err := verifcid.ValidateCid(c); err != nil {
60
+ if err := verifcid.ValidateCid(verifcid.DefaultAllowlist, c); err != nil {
61
return nil, err
62
}
63
return bs.Blockstore.Get(ctx, c)