Set DealParams.RemoveUnsealedCopy to !netprops.FastRetrieval (#126)

* .idea/ in .gitignore

* bump deps for go-libp2p-resource-manager

* Switch to go-libp2p/core

* go-data-transfer/v2 and bump boost enough for RemoveUnsealedCopy flag in DealParams

* Undo go-data-transfer/v2 and lower go-graphsync for compat

* Match boost and lotus deps

* Downgrade storetheindex to match lotus

Author: neelvirdy

.gitignore

@@ -1,3 +1,3 @@
 build/.*
 
-.idea
+.idea

channelid.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	datatransfer "github.com/filecoin-project/go-data-transfer"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 func ChannelIDFromString(id string) (*datatransfer.ChannelID, error) {

filc/cmds.go

@@ -37,12 +37,12 @@ import (
 	"github.com/ipld/go-ipld-prime/traversal/selector"
 	"github.com/ipld/go-ipld-prime/traversal/selector/builder"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
-	"github.com/libp2p/go-libp2p-core/host"
-	inet "github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
+	"github.com/libp2p/go-libp2p/core/host"
+	inet "github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multiaddr"
-	cli "github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 )
 

filc/disk.go

@@ -23,11 +23,11 @@ import (
 	levelds "github.com/ipfs/go-ds-leveldb"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	"github.com/libp2p/go-libp2p"
-	"github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/host"
-	metrics "github.com/libp2p/go-libp2p-core/metrics"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
-	cli "github.com/urfave/cli/v2"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 type dealData struct {

filclient.go

@@ -42,7 +42,7 @@ import (
 	rpcstmgr "github.com/filecoin-project/lotus/chain/stmgr/rpc"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/wallet"
-	paychmgr "github.com/filecoin-project/lotus/paychmgr"
+	"github.com/filecoin-project/lotus/paychmgr"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
@@ -51,21 +51,21 @@ import (
 	gsimpl "github.com/ipfs/go-graphsync/impl"
 	gsnet "github.com/ipfs/go-graphsync/network"
 	"github.com/ipfs/go-graphsync/peerstate"
-	storeutil "github.com/ipfs/go-graphsync/storeutil"
+	"github.com/ipfs/go-graphsync/storeutil"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	logging "github.com/ipfs/go-log/v2"
-	car "github.com/ipld/go-car"
-	"github.com/libp2p/go-libp2p-core/host"
-	inet "github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
+	"github.com/ipld/go-car"
+	"github.com/libp2p/go-libp2p/core/host"
+	inet "github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/multiformats/go-multiaddr"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
 
-var Tracer trace.Tracer = otel.Tracer("filclient")
+var Tracer = otel.Tracer("filclient")
 
 var log = logging.Logger("filclient")
 var retrievalLogger = logging.Logger("filclient-retrieval")
@@ -666,6 +666,7 @@ func (fc *FilClient) SendProposalV120(ctx context.Context, dbid uint, netprop ne
 			Params:   transferParams,
 			Size:     netprop.Piece.RawBlockSize,
 		},
+		RemoveUnsealedCopy: !netprop.FastRetrieval,
 	}
 
 	var resp smtypes.DealResponse

filclient_test.go

@@ -30,7 +30,7 @@ import (
 	chunk "github.com/ipfs/go-ipfs-chunker"
 	"github.com/ipfs/go-merkledag"
 	"github.com/ipfs/go-unixfs/importer"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"