Skip to content

Commit

Permalink
Update lotus and boxo versions (#1466)
Browse files Browse the repository at this point in the history
* Update to use packages in go-libipni

* feat: update lotus version

* update boxo (#1492)

* feat: update boxo

* refactor: depend on repo:Jorropo/lotus branch:boxo2

* chore: temporarily update go-fil-markets with replace directive

* feat: switch itests framework ExtractFileFromCAR to use non-global IPLD registry

* feat: switch booster-bitswap client fetch to use the go-ipld-prime globals via go-ipld-legacy

* go fmt

* chore: update dependencies and migrate to boxo

* fix: update boost-gfm

* fix: stop itests framework from prematurely setting listenaddrs via go-libp2p defaults that conflict with lotus

* fix: docs gen

* chore(deps): update deps for boxo v0.10.0

* chore(deps): update boost-gfm

* fix(booster-http): update for boxo v0.10.0

* chore(deps): update to remove kubo dependency

* fix(gen): update docs gen

* feat: update boost-gfm to v1.26.6

* chore(deps): update lotus to master

---------

Co-authored-by: Adin Schmahmann <[email protected]>
Co-authored-by: hannahhoward <[email protected]>

---------

Co-authored-by: gammazero <[email protected]>
Co-authored-by: Adin Schmahmann <[email protected]>
Co-authored-by: hannahhoward <[email protected]>
  • Loading branch information
4 people authored Jun 23, 2023
1 parent a9435e5 commit 8b51dae
Show file tree
Hide file tree
Showing 42 changed files with 432 additions and 618 deletions.
8 changes: 4 additions & 4 deletions car/car_offset_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"fmt"
"io"

"github.com/ipfs/go-blockservice"
"github.com/ipfs/boxo/blockservice"
blockstore "github.com/ipfs/boxo/blockstore"
offline "github.com/ipfs/boxo/exchange/offline"
"github.com/ipfs/boxo/ipld/merkledag"
"github.com/ipfs/go-cid"
blockstore "github.com/ipfs/go-ipfs-blockstore"
offline "github.com/ipfs/go-ipfs-exchange-offline"
format "github.com/ipfs/go-ipld-format"
"github.com/ipfs/go-merkledag"
"github.com/ipld/go-car"
"github.com/ipld/go-car/util"
)
Expand Down
16 changes: 8 additions & 8 deletions car/car_offset_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ import (
"math/rand"
"testing"

"github.com/ipfs/go-blockservice"
"github.com/ipfs/boxo/blockservice"
bstore "github.com/ipfs/boxo/blockstore"
chunk "github.com/ipfs/boxo/chunker"
"github.com/ipfs/boxo/ipld/merkledag"
merkledagpb "github.com/ipfs/boxo/ipld/merkledag/pb"
"github.com/ipfs/boxo/ipld/unixfs/importer/balanced"
"github.com/ipfs/boxo/ipld/unixfs/importer/helpers"
blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-cidutil"
"github.com/ipfs/go-datastore"
dss "github.com/ipfs/go-datastore/sync"
bstore "github.com/ipfs/go-ipfs-blockstore"
chunk "github.com/ipfs/go-ipfs-chunker"
format "github.com/ipfs/go-ipld-format"
"github.com/ipfs/go-libipfs/blocks"
"github.com/ipfs/go-merkledag"
merkledagpb "github.com/ipfs/go-merkledag/pb"
"github.com/ipfs/go-unixfs/importer/balanced"
"github.com/ipfs/go-unixfs/importer/helpers"
"github.com/ipld/go-car"
mh "github.com/multiformats/go-multihash"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions car/car_reader_seeker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"math/rand"
"testing"

"github.com/ipfs/go-blockservice"
"github.com/ipfs/boxo/blockservice"
bstore "github.com/ipfs/boxo/blockstore"
"github.com/ipfs/boxo/ipld/merkledag"
"github.com/ipfs/go-datastore"
dss "github.com/ipfs/go-datastore/sync"
bstore "github.com/ipfs/go-ipfs-blockstore"
"github.com/ipfs/go-merkledag"
"github.com/stretchr/testify/require"
)

Expand Down
5 changes: 2 additions & 3 deletions cmd/boost/provider_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ import (
"github.com/filecoin-project/boost/retrievalmarket/lp2pimpl"
"github.com/filecoin-project/boostd-data/shared/cliutil"
"github.com/filecoin-project/go-address"
// TODO: This multiaddr util library should probably live in its own repo
multiaddrutil "github.com/filecoin-project/go-legs/httpsync/multiaddr"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
"github.com/ipfs/go-cid"
"github.com/ipni/go-libipni/maurl"
"github.com/multiformats/go-multiaddr"
"github.com/urfave/cli/v2"
)
Expand Down Expand Up @@ -398,7 +397,7 @@ var retrievalTransportsCmd = &cli.Command{
func multiaddrToNative(proto string, ma multiaddr.Multiaddr) string {
switch proto {
case "http", "https":
u, err := multiaddrutil.ToURL(ma)
u, err := maurl.ToURL(ma)
if err != nil {
return ""
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/boost/retrieve_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"time"

blockstore "github.com/ipfs/boxo/blockstore"
flatfs "github.com/ipfs/go-ds-flatfs"
levelds "github.com/ipfs/go-ds-leveldb"
blockstore "github.com/ipfs/go-ipfs-blockstore"
"github.com/mitchellh/go-homedir"

"github.com/dustin/go-humanize"
Expand All @@ -21,12 +21,12 @@ import (
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
"github.com/ipfs/go-blockservice"
"github.com/ipfs/boxo/blockservice"
offline "github.com/ipfs/boxo/exchange/offline"
"github.com/ipfs/boxo/files"
"github.com/ipfs/boxo/ipld/merkledag"
unixfile "github.com/ipfs/boxo/ipld/unixfs/file"
"github.com/ipfs/go-cid"
offline "github.com/ipfs/go-ipfs-exchange-offline"
"github.com/ipfs/go-libipfs/files"
"github.com/ipfs/go-merkledag"
unixfile "github.com/ipfs/go-unixfs/file"
"github.com/ipld/go-car"
"github.com/ipld/go-ipld-prime"
cidlink "github.com/ipld/go-ipld-prime/linking/cid"
Expand Down Expand Up @@ -165,7 +165,7 @@ var retrieveCmd = &cli.Command{
defer os.RemoveAll(bstoreTmpDir)

bstoreDatastore, err := flatfs.CreateOrOpen(bstoreTmpDir, flatfs.NextToLast(3), false)
bstore := blockstore.NewBlockstoreNoPrefix(bstoreDatastore)
bstore := blockstore.NewBlockstore(bstoreDatastore, blockstore.NoPrefix())
if err != nil {
return fmt.Errorf("could not open blockstore: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/booster-bitswap/bitswap/bitswap.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package bitswap

import (
"github.com/ipfs/go-libipfs/bitswap/network"
"github.com/ipfs/boxo/bitswap/network"
"github.com/libp2p/go-libp2p/core/protocol"
)

Expand Down
11 changes: 6 additions & 5 deletions cmd/booster-bitswap/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (

"github.com/filecoin-project/boost/cmd/booster-bitswap/bitswap"
lcli "github.com/filecoin-project/lotus/cli"
"github.com/ipfs/boxo/bitswap/client"
bsnetwork "github.com/ipfs/boxo/bitswap/network"
nilrouting "github.com/ipfs/boxo/routing/none"
blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-cid"
nilrouting "github.com/ipfs/go-ipfs-routing/none"
ipldlegacy "github.com/ipfs/go-ipld-legacy"
"github.com/ipfs/go-libipfs/bitswap/client"
bsnetwork "github.com/ipfs/go-libipfs/bitswap/network"
"github.com/ipfs/go-libipfs/blocks"
"github.com/ipld/go-car/v2/blockstore"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p/core/crypto"
Expand Down Expand Up @@ -181,7 +181,8 @@ func getBlocks(ctx context.Context, bsClient *client.Client, c cid.Cid, throttle

// Read the links from the block to child nodes in the DAG
var count = uint64(1)
nd, err := ipldlegacy.DecodeNode(ctx, blk)
ipldDecoder := ipldlegacy.NewDecoder()
nd, err := ipldDecoder.DecodeNode(ctx, blk)
if err != nil {
return 0, 0, fmt.Errorf("decoding node %s: %w", c, err)
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/booster-bitswap/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"time"

"github.com/filecoin-project/boost/protocolproxy"
bsnetwork "github.com/ipfs/boxo/bitswap/network"
"github.com/ipfs/boxo/bitswap/server"
blockstore "github.com/ipfs/boxo/blockstore"
nilrouting "github.com/ipfs/boxo/routing/none"
"github.com/ipfs/go-cid"
blockstore "github.com/ipfs/go-ipfs-blockstore"
nilrouting "github.com/ipfs/go-ipfs-routing/none"
bsnetwork "github.com/ipfs/go-libipfs/bitswap/network"
"github.com/ipfs/go-libipfs/bitswap/server"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/peer"
)
Expand Down
Loading

0 comments on commit 8b51dae

Please sign in to comment.