Merge pull request #397 from ipfs-force-community/chore/update-deps

chore: update venus & go-data-transfer

api/clients/mix_msgclient.go

@@ -2,6 +2,7 @@ package clients
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -18,6 +19,8 @@ import (
 	msgTypes "github.com/filecoin-project/venus/venus-shared/types/messager"
 )
 
+var ErrMarkFailedMessageByMessager = errors.New("mark failed message by messager")
+
 type IMixMessage interface {
 	GetMessage(ctx context.Context, mid cid.Cid) (*types.Message, error)
 	PushMessage(ctx context.Context, msg *types.Message, msgSendSpec *types.MessageSendSpec) (cid.Cid, error)
@@ -166,7 +169,7 @@ func (msgClient *MixMsgClient) WaitMsg(ctx context.Context, mCid cid.Cid, confid
 				if msg.Receipt != nil {
 					reason = string(msg.Receipt.Return)
 				}
-				return nil, fmt.Errorf("msg failed due to %s", reason)
+				return nil, fmt.Errorf("msg failed due to %s, %w", reason, ErrMarkFailedMessageByMessager)
 			}
 
 		case <-tm.C:

api/impl/venus_market.go

@@ -12,7 +12,7 @@ import (
 	"github.com/filecoin-project/dagstore"
 	"github.com/filecoin-project/dagstore/shard"
 	"github.com/filecoin-project/go-address"
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/piecestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"

cli/data_transfer.go

@@ -10,7 +10,7 @@ import (
 
 	tm "github.com/buger/goterm"
 
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/venus/venus-shared/types/market"
 	"github.com/libp2p/go-libp2p/core/peer"

cli/retrieval-deals.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"strconv"
@@ -172,14 +173,18 @@ var retrievalDealStateCmd = &cli.Command{
 func outputRetrievalDeal(deal *market.ProviderDealState) error {
 	var channelID, pieceCID string
 	var raw []byte
+	var err error
 	if deal.ChannelID != nil {
 		channelID = deal.ChannelID.String()
 	}
 	if deal.PieceCID != nil {
 		pieceCID = deal.PieceCID.String()
 	}
-	if deal.Selector != nil {
-		raw = deal.Selector.Raw
+	if !deal.Selector.IsNull() {
+		raw, err = json.Marshal(deal.Selector)
+		if err != nil {
+			return err
+		}
 	}
 	data := []kv{
 		{"Receiver", deal.Receiver},

cli/util.go

@@ -26,7 +26,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/filecoin-project/go-address"
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-jsonrpc"
 	"github.com/filecoin-project/go-state-types/abi"

client/client.go

@@ -14,9 +14,9 @@ import (
 
 	"go.uber.org/fx"
 
+	bstore "github.com/ipfs/boxo/blockstore"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
-	bstore "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-libipfs/files"
@@ -47,7 +47,7 @@ import (
 	cborutil "github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/go-commp-utils/ffiwrapper"
 	"github.com/filecoin-project/go-commp-utils/writer"
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/discovery"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"

client/client_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 
 	types "github.com/filecoin-project/venus/venus-shared/types/market/client"
+	blockstore "github.com/ipfs/boxo/blockstore"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	"github.com/ipfs/go-libipfs/files"
 	"github.com/ipfs/go-merkledag"

client/import.go

@@ -8,10 +8,10 @@ import (
 	"os"
 
 	"github.com/filecoin-project/go-fil-markets/stores"
+	bstore "github.com/ipfs/boxo/blockstore"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-cidutil"
-	bstore "github.com/ipfs/go-ipfs-blockstore"
 	chunker "github.com/ipfs/go-ipfs-chunker"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	ipld "github.com/ipfs/go-ipld-format"

client/modules.go

@@ -7,16 +7,16 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/filecoin-project/go-data-transfer/channelmonitor"
+	"github.com/filecoin-project/go-data-transfer/v2/channelmonitor"
 	"github.com/ipfs-force-community/droplet/v2/models/badger"
 	"github.com/ipfs-force-community/metrics"
 
 	"github.com/libp2p/go-libp2p/core/host"
 	"go.uber.org/fx"
 
-	dtimpl "github.com/filecoin-project/go-data-transfer/impl"
-	dtnet "github.com/filecoin-project/go-data-transfer/network"
-	dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync"
+	dtimpl "github.com/filecoin-project/go-data-transfer/v2/impl"
+	dtnet "github.com/filecoin-project/go-data-transfer/v2/network"
+	dtgstransport "github.com/filecoin-project/go-data-transfer/v2/transport/graphsync"
 	"github.com/filecoin-project/go-fil-markets/discovery"
 	discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"

cmd/droplet-client/retrieval.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/go-units"
 	"github.com/fatih/color"
 	"github.com/filecoin-project/go-address"
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/venus/venus-shared/types"
 	"github.com/ipfs/go-cid"

cmd/droplet-client/storage.go

@@ -29,7 +29,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/filecoin-project/go-address"
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"

cmd/droplet-client/transfer.go

@@ -13,7 +13,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/urfave/cli/v2"
 
-	datatransfer "github.com/filecoin-project/go-data-transfer"
+	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 
 	cli2 "github.com/ipfs-force-community/droplet/v2/cli"
 )

dagstore/blockstore.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
+	bstore "github.com/ipfs/boxo/blockstore"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	bstore "github.com/ipfs/go-ipfs-blockstore"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/dagstore"
 )