Update lotus and boxo versions (#1466)

* 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 <adin.schmahmann@gmail.com> Co-authored-by: hannahhoward <hannah@hannahhoward.net> --------- Co-authored-by: gammazero <gammazero@users.noreply.github.com> Co-authored-by: Adin Schmahmann <adin.schmahmann@gmail.com> Co-authored-by: hannahhoward <hannah@hannahhoward.net>
filecoin-project · Jun 23, 2023 · 8b51dae · 8b51dae
1 parent a9435e5
commit 8b51dae
Show file tree

Hide file tree

Showing 42 changed files with 432 additions and 618 deletions.
diff --git a/car/car_offset_writer.go b/car/car_offset_writer.go
@@ -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"
 )

diff --git a/car/car_offset_writer_test.go b/car/car_offset_writer_test.go
@@ -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"

diff --git a/car/car_reader_seeker_test.go b/car/car_reader_seeker_test.go
@@ -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"
 )
 

diff --git a/cmd/boost/provider_cmd.go b/cmd/boost/provider_cmd.go
@@ -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"
 )
@@ -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 ""
 		}

diff --git a/cmd/boost/retrieve_cmd.go b/cmd/boost/retrieve_cmd.go
@@ -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"
@@ -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"
@@ -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)
 		}

diff --git a/cmd/booster-bitswap/bitswap/bitswap.go b/cmd/booster-bitswap/bitswap/bitswap.go
@@ -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"
 )
 

diff --git a/cmd/booster-bitswap/client.go b/cmd/booster-bitswap/client.go
@@ -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"
@@ -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)
 	}

diff --git a/cmd/booster-bitswap/server.go b/cmd/booster-bitswap/server.go
@@ -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"
 )