Feat/lt/refactor updatedealstatus api

api/impl/v0api/v1_wrapper.go

@@ -0,0 +1,20 @@
+package v0api
+
+import (
+	"context"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	"github.com/filecoin-project/go-state-types/abi"
+
+	v1API "github.com/filecoin-project/venus/venus-shared/api/market/v1"
+	"github.com/filecoin-project/venus/venus-shared/types/market"
+)
+
+type WrapperV1IMarket struct {
+	v1API.IMarket
+}
+
+func (w WrapperV1IMarket) UpdateDealStatus(ctx context.Context, miner address.Address, dealID abi.DealID, pieceStatus market.PieceStatus) error {
+	return w.IMarket.UpdateDealStatus(ctx, miner, dealID, pieceStatus, storagemarket.StorageDealAwaitingPreCommit)
+}

api/impl/venus_market.go

@@ -40,7 +40,7 @@ import (
 	"github.com/filecoin-project/venus/pkg/constants"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 	gatewayAPIV2 "github.com/filecoin-project/venus/venus-shared/api/gateway/v2"
-	marketAPI "github.com/filecoin-project/venus/venus-shared/api/market"
+	marketAPI "github.com/filecoin-project/venus/venus-shared/api/market/v1"
 	vTypes "github.com/filecoin-project/venus/venus-shared/types"
 	gatewayTypes "github.com/filecoin-project/venus/venus-shared/types/gateway"
 	types "github.com/filecoin-project/venus/venus-shared/types/market"
@@ -51,14 +51,6 @@ var (
 	log                   = logging.Logger("market_api")
 )
 
-var (
-	// ErrorPermissionDeny is the error message returned when a user does not have permission to perform an action
-	ErrorPermissionDeny = fmt.Errorf("permission deny")
-
-	// ErrorUserNotFound is the error message returned when a user is not found in context
-	ErrorUserNotFound = fmt.Errorf("user not found")
-)
-
 type MarketNodeImpl struct {
 	fx.In
 
@@ -121,15 +113,15 @@ type MarketNodeImpl struct {
 	SetMaxMarketBalanceAddFeeFunc config.SetMaxMarketBalanceAddFeeFunc
 }
 
-func (m MarketNodeImpl) ResponseMarketEvent(ctx context.Context, resp *gatewayTypes.ResponseEvent) error {
+func (m *MarketNodeImpl) ResponseMarketEvent(ctx context.Context, resp *gatewayTypes.ResponseEvent) error {
 	return m.IMarketServiceProvider.ResponseMarketEvent(ctx, resp)
 }
 
-func (m MarketNodeImpl) ListenMarketEvent(ctx context.Context, policy *gatewayTypes.MarketRegisterPolicy) (<-chan *gatewayTypes.RequestEvent, error) {
+func (m *MarketNodeImpl) ListenMarketEvent(ctx context.Context, policy *gatewayTypes.MarketRegisterPolicy) (<-chan *gatewayTypes.RequestEvent, error) {
 	return m.IMarketServiceProvider.ListenMarketEvent(ctx, policy)
 }
 
-func (m MarketNodeImpl) ActorList(ctx context.Context) ([]types.User, error) {
+func (m *MarketNodeImpl) ActorList(ctx context.Context) ([]types.User, error) {
 	actors, err := m.UserMgr.ActorList(ctx)
 	if err != nil {
 		return nil, err
@@ -143,14 +135,14 @@ func (m MarketNodeImpl) ActorList(ctx context.Context) ([]types.User, error) {
 	return ret, nil
 }
 
-func (m MarketNodeImpl) ActorExist(ctx context.Context, addr address.Address) (bool, error) {
+func (m *MarketNodeImpl) ActorExist(ctx context.Context, addr address.Address) (bool, error) {
 	if err := jwtclient.CheckPermissionByMiner(ctx, m.AuthClient, addr); err != nil {
 		return false, err
 	}
 	return m.UserMgr.Has(ctx, addr), nil
 }
 
-func (m MarketNodeImpl) ActorSectorSize(ctx context.Context, addr address.Address) (abi.SectorSize, error) {
+func (m *MarketNodeImpl) ActorSectorSize(ctx context.Context, addr address.Address) (abi.SectorSize, error) {
 	if err := jwtclient.CheckPermissionByMiner(ctx, m.AuthClient, addr); err != nil {
 		return 0, err
 	}
@@ -192,7 +184,7 @@ func (m *MarketNodeImpl) MarketListDeals(ctx context.Context, addrs []address.Ad
 	return m.listDeals(ctx, addrs)
 }
 
-// todo add user isolate when is available to get miner from retrieve deal
+// MarketListRetrievalDeals todo add user isolate when is available to get miner from retrieve deal
 // 检索订单没法按 `miner address` 过滤
 func (m *MarketNodeImpl) MarketListRetrievalDeals(ctx context.Context) ([]types.ProviderDealState, error) {
 	var out []types.ProviderDealState
@@ -381,7 +373,7 @@ func (m *MarketNodeImpl) MarketPendingDeals(ctx context.Context) ([]types.Pendin
 	return ret, nil
 }
 
-func (m *MarketNodeImpl) MarketPublishPendingDeals(ctx context.Context) error {
+func (m *MarketNodeImpl) MarketPublishPendingDeals(_ context.Context) error {
 	m.DealPublisher.ForcePublishPendingDeals()
 	return nil
 }
@@ -687,7 +679,7 @@ func (m *MarketNodeImpl) ID(context.Context) (peer.ID, error) {
 	return m.Host.ID(), nil
 }
 
-func (m *MarketNodeImpl) DagstoreListShards(ctx context.Context) ([]types.DagstoreShardInfo, error) {
+func (m *MarketNodeImpl) DagstoreListShards(_ context.Context) ([]types.DagstoreShardInfo, error) {
 	info := m.DAGStore.AllShardsInfo()
 	ret := make([]types.DagstoreShardInfo, 0, len(info))
 	for k, i := range info {
@@ -982,11 +974,11 @@ func (m *MarketNodeImpl) UpdateDealOnPacking(ctx context.Context, miner address.
 	return m.DealAssigner.UpdateDealOnPacking(ctx, miner, dealId, sectorid, offset)
 }
 
-func (m *MarketNodeImpl) UpdateDealStatus(ctx context.Context, miner address.Address, dealId abi.DealID, status types.PieceStatus) error {
+func (m *MarketNodeImpl) UpdateDealStatus(ctx context.Context, miner address.Address, dealId abi.DealID, pieceStatus types.PieceStatus, dealStatus storagemarket.StorageDealStatus) error {
 	if err := jwtclient.CheckPermissionByMiner(ctx, m.AuthClient, miner); err != nil {
 		return err
 	}
-	return m.DealAssigner.UpdateDealStatus(ctx, miner, dealId, status)
+	return m.DealAssigner.UpdateDealStatus(ctx, miner, dealId, pieceStatus, dealStatus)
 }
 
 func (m *MarketNodeImpl) DealsImportData(ctx context.Context, dealPropCid cid.Cid, fname string) error {
@@ -1024,7 +1016,7 @@ func (m *MarketNodeImpl) PaychVoucherList(ctx context.Context, pch address.Addre
 	return m.PaychAPI.PaychVoucherList(ctx, pch)
 }
 
-func (m *MarketNodeImpl) AddFsPieceStorage(ctx context.Context, name string, path string, readonly bool) error {
+func (m *MarketNodeImpl) AddFsPieceStorage(_ context.Context, name string, path string, readonly bool) error {
 	ifs := &config.FsPieceStorage{ReadOnly: readonly, Path: path, Name: name}
 	fsps, err := piecestorage.NewFsPieceStorage(ifs)
 	if err != nil {
@@ -1040,7 +1032,7 @@ func (m *MarketNodeImpl) AddFsPieceStorage(ctx context.Context, name string, pat
 	return m.Config.AddFsPieceStorage(ifs)
 }
 
-func (m *MarketNodeImpl) AddS3PieceStorage(ctx context.Context, name, endpoit, bucket, subdir, accessKeyID, secretAccessKey, token string, readonly bool) error {
+func (m *MarketNodeImpl) AddS3PieceStorage(_ context.Context, name, endpoit, bucket, subdir, accessKeyID, secretAccessKey, token string, readonly bool) error {
 	ifs := &config.S3PieceStorage{
 		ReadOnly:  readonly,
 		EndPoint:  endpoit,
@@ -1065,11 +1057,11 @@ func (m *MarketNodeImpl) AddS3PieceStorage(ctx context.Context, name, endpoit, b
 	return m.Config.AddS3PieceStorage(ifs)
 }
 
-func (m *MarketNodeImpl) ListPieceStorageInfos(ctx context.Context) types.PieceStorageInfos {
+func (m *MarketNodeImpl) ListPieceStorageInfos(_ context.Context) types.PieceStorageInfos {
 	return m.PieceStorageMgr.ListStorageInfos()
 }
 
-func (m *MarketNodeImpl) RemovePieceStorage(ctx context.Context, name string) error {
+func (m *MarketNodeImpl) RemovePieceStorage(_ context.Context, name string) error {
 	err := m.PieceStorageMgr.RemovePieceStorage(name)
 	if err != nil {
 		return err
@@ -1085,7 +1077,7 @@ func (m *MarketNodeImpl) OfflineDealImport(ctx context.Context, deal types.Miner
 	return m.StorageProvider.ImportOfflineDeal(ctx, deal)
 }
 
-func (m *MarketNodeImpl) Version(ctx context.Context) (vTypes.Version, error) {
+func (m *MarketNodeImpl) Version(_ context.Context) (vTypes.Version, error) {
 	return vTypes.Version{Version: version.UserVersion()}, nil
 }
 

cli/util.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/filecoin-project/venus/venus-shared/api"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
-	marketapi "github.com/filecoin-project/venus/venus-shared/api/market"
 	clientapi "github.com/filecoin-project/venus/venus-shared/api/market/client"
+	marketapi "github.com/filecoin-project/venus/venus-shared/api/market/v1"
 	types "github.com/filecoin-project/venus/venus-shared/types/market"
 )
 

cmd/market-client/client_retr.go

@@ -10,16 +10,17 @@ import (
 	"strings"
 	"time"
 
-	cli2 "github.com/filecoin-project/venus-market/v2/cli"
-	clientapi "github.com/filecoin-project/venus/venus-shared/api/market/client"
-	"github.com/filecoin-project/venus/venus-shared/types"
-	"github.com/filecoin-project/venus/venus-shared/types/market/client"
 	"github.com/ipfs/go-cid"
 	"github.com/urfave/cli/v2"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-state-types/big"
+
+	cli2 "github.com/filecoin-project/venus-market/v2/cli"
+	clientapi "github.com/filecoin-project/venus/venus-shared/api/market/client"
+	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/filecoin-project/venus/venus-shared/types/market/client"
 )
 
 const DefaultMaxRetrievePrice = "0"

cmd/market-client/main.go

@@ -298,5 +298,8 @@ func marketClient(cctx *cli.Context) error {
 	var marketCli clientapi.IMarketClientStruct
 	permission.PermissionProxy((clientapi.IMarketClient)(resAPI), &marketCli)
 
-	return rpc.ServeRPC(ctx, cfg, &cfg.API, mux.NewRouter(), 1000, cli2.API_NAMESPACE_MARKET_CLIENT, nil, &marketCli, finishCh)
+	apiHandles := []rpc.APIHandle{
+		{Path: "/rpc/v0", API: &marketCli},
+	}
+	return rpc.ServeRPC(ctx, cfg, &cfg.API, mux.NewRouter(), 1000, cli2.API_NAMESPACE_MARKET_CLIENT, nil, apiHandles, finishCh)
 }

cmd/venus-market/run.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/filecoin-project/venus-market/v2/api/clients"
 	"github.com/filecoin-project/venus-market/v2/api/impl"
+	"github.com/filecoin-project/venus-market/v2/api/impl/v0api"
 	cli2 "github.com/filecoin-project/venus-market/v2/cli"
 	"github.com/filecoin-project/venus-market/v2/cmd"
 	"github.com/filecoin-project/venus-market/v2/config"
@@ -32,7 +33,7 @@ import (
 	types2 "github.com/filecoin-project/venus-market/v2/types"
 	"github.com/filecoin-project/venus-market/v2/utils"
 
-	marketapi "github.com/filecoin-project/venus/venus-shared/api/market"
+	marketapiV1 "github.com/filecoin-project/venus/venus-shared/api/market/v1"
 	"github.com/filecoin-project/venus/venus-shared/api/permission"
 )
 
@@ -230,8 +231,13 @@ func runDaemon(cctx *cli.Context) error {
 		return fmt.Errorf("handle 'resource' failed: %w", err)
 	}
 
-	var fullAPI marketapi.IMarketStruct
-	permission.PermissionProxy(marketapi.IMarket(resAPI), &fullAPI)
+	var iMarket marketapiV1.IMarketStruct
+	permission.PermissionProxy(marketapiV1.IMarket(resAPI), &iMarket)
 
-	return rpc.ServeRPC(ctx, cfg, &cfg.API, router, 1000, cli2.API_NAMESPACE_VENUS_MARKET, authClient, &fullAPI, finishCh)
+	api := (marketapiV1.IMarket)(&iMarket)
+	apiHandles := []rpc.APIHandle{
+		{Path: "/rpc/v1", API: api},
+		{Path: "/rpc/v0", API: v0api.WrapperV1IMarket{IMarket: api}},
+	}
+	return rpc.ServeRPC(ctx, cfg, &cfg.API, router, 1000, cli2.API_NAMESPACE_VENUS_MARKET, authClient, apiHandles, finishCh)
 }

dagstore/blockstore.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
+	"github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/dagstore"
 )
@@ -21,14 +21,14 @@ type Blockstore struct {
 
 var _ bstore.Blockstore = (*Blockstore)(nil)
 
-func (b *Blockstore) DeleteBlock(ctx context.Context, c cid.Cid) error {
-	return fmt.Errorf("deleteBlock called but not implemented")
+func (b *Blockstore) DeleteBlock(context.Context, cid.Cid) error {
+	return fmt.Errorf("DeleteBlock called but not implemented")
 }
 
-func (b *Blockstore) Put(ctx context.Context, block blocks.Block) error {
-	return fmt.Errorf("put called but not implemented")
+func (b *Blockstore) Put(context.Context, blocks.Block) error {
+	return fmt.Errorf("Put called but not implemented")
 }
 
-func (b *Blockstore) PutMany(ctx context.Context, blocks []blocks.Block) error {
-	return fmt.Errorf("putMany called but not implemented")
+func (b *Blockstore) PutMany(context.Context, []blocks.Block) error {
+	return fmt.Errorf("PutMany called but not implemented")
 }

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/filecoin-project/go-statestore v0.2.0
 	github.com/filecoin-project/specs-actors/v2 v2.3.6
 	github.com/filecoin-project/specs-actors/v7 v7.0.1
-	github.com/filecoin-project/venus v1.10.0-rc2
+	github.com/filecoin-project/venus v1.10.0-rc4.0.20230228082648-37c695a9446f
 	github.com/filecoin-project/venus-auth v1.10.0-rc2
 	github.com/filecoin-project/venus-messager v1.10.0-rc2
 	github.com/golang/mock v1.6.0
@@ -40,7 +40,7 @@ require (
 	github.com/ipfs-force-community/metrics v1.0.1-0.20220824061112-ac916bacf2ea
 	github.com/ipfs-force-community/venus-common-utils v0.0.0-20220217030526-e5e4c6bc14f7
 	github.com/ipfs-force-community/venus-gateway v1.10.0-rc2
-	github.com/ipfs/go-block-format v0.0.3
+	github.com/ipfs/go-block-format v0.1.1 // indirect
 	github.com/ipfs/go-blockservice v0.4.0
 	github.com/ipfs/go-cid v0.3.2
 	github.com/ipfs/go-cidutil v0.1.0
@@ -90,6 +90,8 @@ require (
 	gorm.io/gorm v1.21.12
 )
 
+require github.com/ipfs/go-libipfs v0.4.1
+
 require (
 	contrib.go.opencensus.io/exporter/graphite v0.0.0-20200424223504-26b90655e0ce // indirect
 	contrib.go.opencensus.io/exporter/jaeger v0.2.1 // indirect
@@ -180,12 +182,11 @@ require (
 	github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
 	github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
 	github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
-	github.com/ipfs/go-ipfs-pq v0.0.2 // indirect
+	github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
 	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
 	github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
-	github.com/ipfs/go-libipfs v0.1.0 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
-	github.com/ipfs/go-peertaskqueue v0.8.0 // indirect
+	github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
 	github.com/ipfs/go-unixfsnode v1.4.0 // indirect
 	github.com/ipfs/go-verifcid v0.0.2 // indirect
 	github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0 // indirect

go.sum

@@ -455,8 +455,8 @@ github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893
 github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893/go.mod h1:S7590oDimBvXMUtzWsBXoshu9HtYKwtXl47zAK9rcP8=
 github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
 github.com/filecoin-project/venus v1.2.4/go.mod h1:hJULXHGAnWuq5S5KRtPkwbT8DqgM9II7NwyNU7t59D0=
-github.com/filecoin-project/venus v1.10.0-rc2 h1:bSPtGuLnLFTALFdHuHRpo9bkN4bnZ/2RlpNyiKC68Fs=
-github.com/filecoin-project/venus v1.10.0-rc2/go.mod h1:khIm31fH1i/2q1aLBgRo5ULB+LbSKiNsKfwQORKD+PY=
+github.com/filecoin-project/venus v1.10.0-rc4.0.20230228082648-37c695a9446f h1:CX3b8w3jsTxvznAEiNQ8kiPhoe7v0iWxskyZ0v+Mz38=
+github.com/filecoin-project/venus v1.10.0-rc4.0.20230228082648-37c695a9446f/go.mod h1:kKhxyint2LSRKk1yJRDlSEKlNe0dnpfiY6iaTCSsH6c=
 github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU=
 github.com/filecoin-project/venus-auth v1.10.0-rc2 h1:mC2kRcUmXaL2nPky8iiogFjrygMTUXGXHjvEV9msPgk=
 github.com/filecoin-project/venus-auth v1.10.0-rc2/go.mod h1:bJT0owiiQfQq7u8QBpIf22JHNRZdsx9rAr4wMEsg+ds=
@@ -837,8 +837,9 @@ github.com/ipfs/go-bitswap v0.6.0/go.mod h1:Hj3ZXdOC5wBJvENtdqsixmzzRukqd8EHLxZL
 github.com/ipfs/go-bitswap v0.10.2 h1:B81RIwkTnIvSYT1ZCzxjYTeF0Ek88xa9r1AMpTfk+9Q=
 github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
-github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc=
 github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
+github.com/ipfs/go-block-format v0.1.1 h1:129vSO3zwbsYADcyQWcOYiuCpAqt462SFfqFHdFJhhI=
+github.com/ipfs/go-block-format v0.1.1/go.mod h1:+McEIT+g52p+zz5xGAABGSOKrzmrdX97bc0USBdWPUs=
 github.com/ipfs/go-blockservice v0.0.7/go.mod h1:EOfb9k/Y878ZTRY/CH0x5+ATtaipfbRhbvNSdgc/7So=
 github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
 github.com/ipfs/go-blockservice v0.1.4/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
@@ -960,13 +961,14 @@ github.com/ipfs/go-ipfs-pinner v0.2.1/go.mod h1:l1AtLL5bovb7opnG77sh4Y10waINz3Y1
 github.com/ipfs/go-ipfs-posinfo v0.0.1 h1:Esoxj+1JgSjX0+ylc0hUmJCOv6V2vFoZiETLR6OtpRs=
 github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A=
 github.com/ipfs/go-ipfs-pq v0.0.1/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
-github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY=
 github.com/ipfs/go-ipfs-pq v0.0.2/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
+github.com/ipfs/go-ipfs-pq v0.0.3 h1:YpoHVJB+jzK15mr/xsWC574tyDLkezVrDNeaalQBsTE=
+github.com/ipfs/go-ipfs-pq v0.0.3/go.mod h1:btNw5hsHBpRcSSgZtiNm/SLj5gYIZ18AKtv3kERkRb4=
 github.com/ipfs/go-ipfs-provider v0.7.1/go.mod h1:QwdDYRYnC5sYGLlOwVDY/0ZB6T3zcMtu+5+GdGeUuw8=
 github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
 github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
-github.com/ipfs/go-ipfs-routing v0.2.1 h1:E+whHWhJkdN9YeoHZNj5itzc+OR292AJ2uE9FFiW0BY=
 github.com/ipfs/go-ipfs-routing v0.2.1/go.mod h1:xiNNiwgjmLqPS1cimvAw6EyB9rkVDbiocA4yY+wRNLM=
+github.com/ipfs/go-ipfs-routing v0.3.0 h1:9W/W3N+g+y4ZDeffSgqhgo7BsBSJwPMcyssET9OWevc=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
 github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
@@ -989,8 +991,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
 github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-ipns v0.1.2/go.mod h1:ioQ0j02o6jdIVW+bmi18f4k2gRf0AV3kZ9KeHYHICnQ=
 github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
-github.com/ipfs/go-libipfs v0.1.0 h1:I6CrHHp4cIiqsWJPVU3QBH4BZrRWSljS2aAbA3Eg9AY=
-github.com/ipfs/go-libipfs v0.1.0/go.mod h1:qX0d9h+wu53PFtCTXxdXVBakd6ZCvGDdkZUKmdLMLx0=
+github.com/ipfs/go-libipfs v0.4.1 h1:tyu3RRMKFQUyUQt5jyt5SmDnls93H4Tr3HifL50zihg=
+github.com/ipfs/go-libipfs v0.4.1/go.mod h1:Ad8ybPqwCkl2cNiNUMvM/iaVc/5bwNpHu8RPZ5te1hw=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.0/go.mod h1:JO7RzlMK6rA+CIxFMLOuB6Wf5b81GDiKElL7UPSIKjA=
 github.com/ipfs/go-log v1.0.1/go.mod h1:HuWlQttfN6FWNHRhlY5yMk/lW7evQC0HHGOxEwMRR8I=
@@ -1036,8 +1038,8 @@ github.com/ipfs/go-peertaskqueue v0.1.1/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3
 github.com/ipfs/go-peertaskqueue v0.2.0/go.mod h1:5/eNrBEbtSKWCG+kQK8K8fGNixoYUnr+P7jivavs9lY=
 github.com/ipfs/go-peertaskqueue v0.7.0/go.mod h1:M/akTIE/z1jGNXMU7kFB4TeSEFvj68ow0Rrb04donIU=
 github.com/ipfs/go-peertaskqueue v0.7.1/go.mod h1:M/akTIE/z1jGNXMU7kFB4TeSEFvj68ow0Rrb04donIU=
-github.com/ipfs/go-peertaskqueue v0.8.0 h1:JyNO144tfu9bx6Hpo119zvbEL9iQ760FHOiJYsUjqaU=
-github.com/ipfs/go-peertaskqueue v0.8.0/go.mod h1:cz8hEnnARq4Du5TGqiWKgMr/BOSQ5XOgMOh1K5YYKKM=
+github.com/ipfs/go-peertaskqueue v0.8.1 h1:YhxAs1+wxb5jk7RvS0LHdyiILpNmRIRnZVztekOF0pg=
+github.com/ipfs/go-peertaskqueue v0.8.1/go.mod h1:Oxxd3eaK279FxeydSPPVGHzbwVeHjatZ2GA8XD+KbPU=
 github.com/ipfs/go-pinning-service-http-client v0.1.0/go.mod h1:tcCKmlkWWH9JUUkKs8CrOZBanacNc1dmKLfjlyXAMu4=
 github.com/ipfs/go-unixfs v0.2.2-0.20190827150610-868af2e9e5cb/go.mod h1:IwAAgul1UQIcNZzKPYZWOCijryFBeCV79cNubPzol+k=
 github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=

retrievalprovider/lazyblockstore.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"sync"
 
-	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
+	"github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/dagstore"
 )