deals: Almost sealing client data

node/modules/chain.go

@@ -5,7 +5,6 @@ import (
 	"context"
 
 	"github.com/ipfs/go-bitswap"
-	"github.com/ipfs/go-bitswap/network"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-car"
 	"github.com/ipfs/go-datastore"
@@ -17,13 +16,16 @@ import (
 
 	"github.com/filecoin-project/go-lotus/chain/store"
 	"github.com/filecoin-project/go-lotus/chain/types"
+	"github.com/filecoin-project/go-lotus/lib/nsbsnet"
 	"github.com/filecoin-project/go-lotus/node/modules/dtypes"
 	"github.com/filecoin-project/go-lotus/node/modules/helpers"
 	"github.com/filecoin-project/go-lotus/node/repo"
 )
 
 func ChainExchange(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.Routing, bs dtypes.ChainGCBlockstore) dtypes.ChainExchange {
-	bitswapNetwork := network.NewFromIpfsHost(host, rt)
+	// prefix protocol for chain bitswap
+	// (so bitswap uses /chain/ipfs/bitswap/1.0.0 internally for chain sync stuff)
+	bitswapNetwork := nsbsnet.NewFromIpfsHost(host, rt, "/chain")
 	exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, bs)
 	lc.Append(fx.Hook{
 		OnStop: func(ctx context.Context) error {

node/modules/client.go

@@ -2,6 +2,11 @@ package modules
 
 import (
 	"context"
+	"github.com/filecoin-project/go-lotus/node/modules/helpers"
+	"github.com/ipfs/go-bitswap"
+	"github.com/ipfs/go-bitswap/network"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/routing"
 	"path/filepath"
 
 	"github.com/ipfs/go-blockservice"
@@ -9,7 +14,6 @@ import (
 	"github.com/ipfs/go-datastore/namespace"
 	"github.com/ipfs/go-filestore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	"github.com/ipfs/go-merkledag"
 	"go.uber.org/fx"
 
@@ -32,9 +36,13 @@ func ClientFstore(r repo.LockedRepo) (dtypes.ClientFilestore, error) {
 	return filestore.NewFilestore(bs, fm), nil
 }
 
-func ClientDAG(lc fx.Lifecycle, fstore dtypes.ClientFilestore) dtypes.ClientDAG {
+func ClientDAG(mctx helpers.MetricsCtx, lc fx.Lifecycle, fstore dtypes.ClientFilestore, rt routing.Routing, h host.Host) dtypes.ClientDAG {
 	ibs := blockstore.NewIdStore((*filestore.Filestore)(fstore))
-	bsvc := blockservice.New(ibs, offline.Exchange(ibs))
+
+	bitswapNetwork := network.NewFromIpfsHost(h, rt)
+	exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, ibs)
+
+	bsvc := blockservice.New(ibs, exch)
 	dag := merkledag.NewDAGService(bsvc)
 
 	lc.Append(fx.Hook{

node/modules/dtypes/storage.go

@@ -22,3 +22,5 @@ type ChainBlockService bserv.BlockService
 
 type ClientFilestore *filestore.Filestore
 type ClientDAG ipld.DAGService
+
+type StagingDAG ipld.DAGService

node/modules/storageminer.go

@@ -2,9 +2,15 @@ package modules
 
 import (
 	"context"
+	"github.com/ipfs/go-bitswap"
+	"github.com/ipfs/go-bitswap/network"
+	"github.com/libp2p/go-libp2p-core/routing"
 	"path/filepath"
 
+	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-datastore"
+	blockstore "github.com/ipfs/go-ipfs-blockstore"
+	"github.com/ipfs/go-merkledag"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/mitchellh/go-homedir"
 	"go.uber.org/fx"
@@ -16,6 +22,7 @@ import (
 	"github.com/filecoin-project/go-lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/go-lotus/node/modules/dtypes"
 	"github.com/filecoin-project/go-lotus/node/modules/helpers"
+	"github.com/filecoin-project/go-lotus/node/repo"
 	"github.com/filecoin-project/go-lotus/storage"
 )
 
@@ -99,3 +106,27 @@ func StorageMiner(mctx helpers.MetricsCtx, lc fx.Lifecycle, api api.FullNode, h
 func HandleDeals(h host.Host, handler *deals.Handler) {
 	h.SetStreamHandler(deals.ProtocolID, handler.HandleStream)
 }
+
+func StagingDAG(mctx helpers.MetricsCtx, lc fx.Lifecycle, r repo.LockedRepo, rt routing.Routing, h host.Host) (dtypes.StagingDAG, error) {
+	stagingds, err := r.Datastore("/staging")
+	if err != nil {
+		return nil, err
+	}
+
+	bs := blockstore.NewBlockstore(stagingds)
+	ibs := blockstore.NewIdStore(bs)
+
+	bitswapNetwork := network.NewFromIpfsHost(h, rt)
+	exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, bs)
+
+	bsvc := blockservice.New(ibs, exch)
+	dag := merkledag.NewDAGService(bsvc)
+
+	lc.Append(fx.Hook{
+		OnStop: func(_ context.Context) error {
+			return bsvc.Close()
+		},
+	})
+
+	return dag, nil
+}