feat: venus-shared: introduce apis & types from venus-market

go.mod

@@ -30,6 +30,7 @@ require (
 	github.com/filecoin-project/go-crypto v0.0.1
 	github.com/filecoin-project/go-data-transfer v1.12.1
 	github.com/filecoin-project/go-fil-commcid v0.1.0
+	github.com/filecoin-project/go-fil-markets v1.14.1
 	github.com/filecoin-project/go-jsonrpc v0.1.4-0.20210217175800-45ea43ac2bec
 	github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543
 	github.com/filecoin-project/go-paramfetch v0.0.4

venus-devtool/api-gen/common.go

@@ -10,6 +10,8 @@ import (
 
 	"github.com/filecoin-project/venus/venus-devtool/util"
 	gatewayv1 "github.com/filecoin-project/venus/venus-shared/api/gateway/v1"
+	"github.com/filecoin-project/venus/venus-shared/api/market"
+	market_client "github.com/filecoin-project/venus/venus-shared/api/market/client"
 	"github.com/filecoin-project/venus/venus-shared/api/messager"
 	"github.com/filecoin-project/venus/venus-shared/api/wallet"
 )
@@ -47,6 +49,26 @@ func init() {
 				MethodNamespace: "Gateway",
 			},
 		},
+		util.APIMeta{
+			Type: reflect.TypeOf((*market.IMarket)(nil)).Elem(),
+			ParseOpt: util.InterfaceParseOption{
+				ImportPath: "github.com/filecoin-project/venus/venus-shared/api/market",
+				IncludeAll: true,
+			},
+			RPCMeta: util.RPCMeta{
+				MethodNamespace: "VENUS_MARKET",
+			},
+		},
+		util.APIMeta{
+			Type: reflect.TypeOf((*market_client.IMarketClient)(nil)).Elem(),
+			ParseOpt: util.InterfaceParseOption{
+				ImportPath: "github.com/filecoin-project/venus/venus-shared/api/market/client",
+				IncludeAll: true,
+			},
+			RPCMeta: util.RPCMeta{
+				MethodNamespace: "VENUS_MARKET_CLIENT",
+			},
+		},
 	)
 }
 

venus-devtool/api-gen/example.go

@@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
+	"github.com/filecoin-project/go-fil-markets/filestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-jsonrpc/auth"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -30,6 +31,7 @@ import (
 	"github.com/filecoin-project/venus/pkg/constants"
 	"github.com/filecoin-project/venus/venus-shared/api"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/filecoin-project/venus/venus-shared/types/market/client"
 	"github.com/filecoin-project/venus/venus-shared/types/messager"
 	"github.com/filecoin-project/venus/venus-shared/types/wallet"
 )
@@ -223,6 +225,15 @@ func init() {
 
 	// used in gateway
 	addExample(commontypes.PaddedByteIndex(10))
+
+	// used in market
+	addExample(filestore.Path("/some/path"))
+
+	clientDataSelector := client.DataSelector("/ipld/a/b/c")
+	addExample(clientDataSelector)
+	addExample(&clientDataSelector)
+
+	addExample(client.ImportID(1234))
 }
 
 func ExampleValue(method string, t, parent reflect.Type) interface{} {
@@ -255,6 +266,7 @@ func ExampleValue(method string, t, parent reflect.Type) interface{} {
 			// ExampleValues[t] = es
 			return es
 		}
+
 	case reflect.Interface:
 		if t.Implements(reflect.TypeOf((*error)(nil)).Elem()) {
 			return fmt.Errorf("empty error")

venus-devtool/cborgen/main.go

@@ -7,6 +7,7 @@ import (
 	"github.com/filecoin-project/venus/venus-shared/libp2p/exchange"
 	"github.com/filecoin-project/venus/venus-shared/libp2p/hello"
 	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/filecoin-project/venus/venus-shared/types/market"
 
 	gen "github.com/whyrusleeping/cbor-gen"
 )
@@ -59,6 +60,18 @@ func main() {
 				types.Message{},
 			},
 		},
+		{
+			dir: "../venus-shared/types/market",
+			types: []interface{}{
+				market.FundedAddressState{},
+				market.MsgInfo{},
+				market.ChannelInfo{},
+				market.VoucherInfo{},
+				market.MinerDeal{},
+				market.RetrievalAsk{},
+				market.ProviderDealState{},
+			},
+		},
 	}
 
 	for _, target := range targets {

venus-shared/TODO.md

@@ -1 +1,6 @@
 - [ ] tests in actors
+- [ ] venus-market
+  - [ ] 类型考虑再细分到不同的命名空间下
+  - [ ] 对于 `venus-messager`、`venus-gateway` 的部分接口转发需要考虑更优雅的方式
+
+- [ ] venus-devtool 中的 `lotus` 需要保持更新

venus-shared/api/market/api.go

@@ -0,0 +1,149 @@
+package market
+
+import (
+	"context"
+	"time"
+
+	"github.com/ipfs/go-cid"
+	"github.com/libp2p/go-libp2p-core/peer"
+
+	"github.com/filecoin-project/go-address"
+	datatransfer "github.com/filecoin-project/go-data-transfer"
+	"github.com/filecoin-project/go-fil-markets/piecestore"
+	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
+	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/venus/venus-shared/actors/builtin/paych"
+
+	"github.com/filecoin-project/venus/venus-shared/types"
+	"github.com/filecoin-project/venus/venus-shared/types/gateway"
+	"github.com/filecoin-project/venus/venus-shared/types/market"
+)
+
+type IMarket interface {
+	ActorList(context.Context) ([]market.User, error)                         //perm:read
+	ActorExist(ctx context.Context, addr address.Address) (bool, error)       //perm:read
+	ActorSectorSize(context.Context, address.Address) (abi.SectorSize, error) //perm:read
+
+	MarketImportDealData(ctx context.Context, propcid cid.Cid, path string) error                                                                                                                               //perm:write
+	MarketListDeals(ctx context.Context, addrs []address.Address) ([]types.MarketDeal, error)                                                                                                                   //perm:read
+	MarketListRetrievalDeals(ctx context.Context, mAddr address.Address) ([]market.ProviderDealState, error)                                                                                                    //perm:read
+	MarketGetDealUpdates(ctx context.Context) (<-chan storagemarket.MinerDeal, error)                                                                                                                           //perm:read
+	MarketListIncompleteDeals(ctx context.Context, mAddr address.Address) ([]storagemarket.MinerDeal, error)                                                                                                    //perm:read
+	MarketSetAsk(ctx context.Context, mAddr address.Address, price types.BigInt, verifiedPrice types.BigInt, duration abi.ChainEpoch, minPieceSize abi.PaddedPieceSize, maxPieceSize abi.PaddedPieceSize) error //perm:admin
+	MarketGetAsk(ctx context.Context, mAddr address.Address) (*storagemarket.SignedStorageAsk, error)                                                                                                           //perm:read
+	MarketListAsk(ctx context.Context) ([]*storagemarket.SignedStorageAsk, error)                                                                                                                               //perm:read
+	MarketSetRetrievalAsk(ctx context.Context, mAddr address.Address, rask *retrievalmarket.Ask) error                                                                                                          //perm:admin
+	MarketGetRetrievalAsk(ctx context.Context, mAddr address.Address) (*retrievalmarket.Ask, error)                                                                                                             //perm:read
+	MarketListRetrievalAsk(ctx context.Context) ([]*market.RetrievalAsk, error)                                                                                                                                 //perm:read
+	MarketListDataTransfers(ctx context.Context) ([]market.DataTransferChannel, error)                                                                                                                          //perm:write
+	MarketDataTransferUpdates(ctx context.Context) (<-chan market.DataTransferChannel, error)                                                                                                                   //perm:write
+	// MarketRestartDataTransfer attempts to restart a data transfer with the given transfer ID and other peer
+	MarketRestartDataTransfer(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error //perm:write
+	// MarketCancelDataTransfer cancels a data transfer with the given transfer ID and other peer
+	MarketCancelDataTransfer(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error //perm:write
+	MarketPendingDeals(ctx context.Context) ([]market.PendingDealInfo, error)                                                    //perm:write
+	MarketPublishPendingDeals(ctx context.Context) error                                                                         //perm:admin
+
+	PiecesListPieces(ctx context.Context) ([]cid.Cid, error)                                 //perm:read
+	PiecesListCidInfos(ctx context.Context) ([]cid.Cid, error)                               //perm:read
+	PiecesGetPieceInfo(ctx context.Context, pieceCid cid.Cid) (*piecestore.PieceInfo, error) //perm:read
+	PiecesGetCIDInfo(ctx context.Context, payloadCid cid.Cid) (*piecestore.CIDInfo, error)   //perm:read
+
+	DealsImportData(ctx context.Context, dealPropCid cid.Cid, file string) error //perm:admin
+	DealsConsiderOnlineStorageDeals(context.Context) (bool, error)               //perm:admin
+	DealsSetConsiderOnlineStorageDeals(context.Context, bool) error              //perm:admin
+	DealsConsiderOnlineRetrievalDeals(context.Context) (bool, error)             //perm:admin
+	DealsSetConsiderOnlineRetrievalDeals(context.Context, bool) error            //perm:admin
+	DealsPieceCidBlocklist(context.Context) ([]cid.Cid, error)                   //perm:admin
+	DealsSetPieceCidBlocklist(context.Context, []cid.Cid) error                  //perm:admin
+	DealsConsiderOfflineStorageDeals(context.Context) (bool, error)              //perm:admin
+	DealsSetConsiderOfflineStorageDeals(context.Context, bool) error             //perm:admin
+	DealsConsiderOfflineRetrievalDeals(context.Context) (bool, error)            //perm:admin
+	DealsSetConsiderOfflineRetrievalDeals(context.Context, bool) error           //perm:admin
+	DealsConsiderVerifiedStorageDeals(context.Context) (bool, error)             //perm:admin
+	DealsSetConsiderVerifiedStorageDeals(context.Context, bool) error            //perm:admin
+	DealsConsiderUnverifiedStorageDeals(context.Context) (bool, error)           //perm:admin
+	DealsSetConsiderUnverifiedStorageDeals(context.Context, bool) error          //perm:admin
+	// SectorGetSealDelay gets the time that a newly-created sector
+	// waits for more deals before it starts sealing
+	SectorGetSealDelay(context.Context) (time.Duration, error) //perm:read
+	// SectorSetExpectedSealDuration sets the expected time for a sector to seal
+	SectorSetExpectedSealDuration(context.Context, time.Duration) error //perm:write
+
+	//messager
+	MessagerWaitMessage(ctx context.Context, mid cid.Cid) (*types.MsgLookup, error)                            //perm:read
+	MessagerPushMessage(ctx context.Context, msg *types.Message, meta *types.MessageSendSpec) (cid.Cid, error) //perm:write
+	MessagerGetMessage(ctx context.Context, mid cid.Cid) (*types.Message, error)                               //perm:read
+
+	MarketAddBalance(ctx context.Context, wallet, addr address.Address, amt types.BigInt) (cid.Cid, error)                   //perm:sign
+	MarketGetReserved(ctx context.Context, addr address.Address) (types.BigInt, error)                                       //perm:sign
+	MarketReserveFunds(ctx context.Context, wallet address.Address, addr address.Address, amt types.BigInt) (cid.Cid, error) //perm:sign
+	MarketReleaseFunds(ctx context.Context, addr address.Address, amt types.BigInt) error                                    //perm:sign
+	MarketWithdraw(ctx context.Context, wallet, addr address.Address, amt types.BigInt) (cid.Cid, error)                     //perm:sign
+
+	NetAddrsListen(context.Context) (peer.AddrInfo, error) //perm:read
+	ID(context.Context) (peer.ID, error)                   //perm:read
+
+	// DagstoreListShards returns information about all shards known to the
+	// DAG store. Only available on nodes running the markets subsystem.
+	DagstoreListShards(ctx context.Context) ([]market.DagstoreShardInfo, error) //perm:read
+
+	// DagstoreInitializeShard initializes an uninitialized shard.
+	//
+	// Initialization consists of fetching the shard's data (deal payload) from
+	// the storage subsystem, generating an index, and persisting the index
+	// to facilitate later retrievals, and/or to publish to external sources.
+	//
+	// This operation is intended to complement the initial migration. The
+	// migration registers a shard for every unique piece CID, with lazy
+	// initialization. Thus, shards are not initialized immediately to avoid
+	// IO activity competing with proving. Instead, shard are initialized
+	// when first accessed. This method forces the initialization of a shard by
+	// accessing it and immediately releasing it. This is useful to warm up the
+	// cache to facilitate subsequent retrievals, and to generate the indexes
+	// to publish them externally.
+	//
+	// This operation fails if the shard is not in ShardStateNew state.
+	// It blocks until initialization finishes.
+	DagstoreInitializeShard(ctx context.Context, key string) error //perm:write
+
+	// DagstoreRecoverShard attempts to recover a failed shard.
+	//
+	// This operation fails if the shard is not in ShardStateErrored state.
+	// It blocks until recovery finishes. If recovery failed, it returns the
+	// error.
+	DagstoreRecoverShard(ctx context.Context, key string) error //perm:write
+
+	// DagstoreInitializeAll initializes all uninitialized shards in bulk,
+	// according to the policy passed in the parameters.
+	//
+	// It is recommended to set a maximum concurrency to avoid extreme
+	// IO pressure if the storage subsystem has a large amount of deals.
+	//
+	// It returns a stream of events to report progress.
+	DagstoreInitializeAll(ctx context.Context, params market.DagstoreInitializeAllParams) (<-chan market.DagstoreInitializeAllEvent, error) //perm:write
+
+	// DagstoreGC runs garbage collection on the DAG store.
+	DagstoreGC(ctx context.Context) ([]market.DagstoreShardResult, error) //perm:admin
+
+	MarkDealsAsPacking(ctx context.Context, miner address.Address, deals []abi.DealID) error                                                               //perm:write
+	UpdateDealOnPacking(ctx context.Context, miner address.Address, dealID abi.DealID, sectorid abi.SectorNumber, offset abi.PaddedPieceSize) error        //perm:write
+	UpdateDealStatus(ctx context.Context, miner address.Address, dealID abi.DealID, pieceStatus string) error                                              //perm:write
+	GetDeals(ctx context.Context, miner address.Address, pageIndex, pageSize int) ([]*market.DealInfo, error)                                              //perm:read
+	AssignUnPackedDeals(ctx context.Context, miner address.Address, ssize abi.SectorSize, spec *market.GetDealSpec) ([]*market.DealInfoIncludePath, error) //perm:write
+	GetUnPackedDeals(ctx context.Context, miner address.Address, spec *market.GetDealSpec) ([]*market.DealInfoIncludePath, error)                          //perm:read
+	UpdateStorageDealStatus(ctx context.Context, dealProposalCid cid.Cid, state storagemarket.StorageDealStatus) error                                     //perm:write
+	//market event
+	ResponseMarketEvent(ctx context.Context, resp *gateway.ResponseEvent) error                                        //perm:read
+	ListenMarketEvent(ctx context.Context, policy *gateway.MarketRegisterPolicy) (<-chan *gateway.RequestEvent, error) //perm:read
+
+	// Paych
+	PaychVoucherList(ctx context.Context, pch address.Address) ([]*paych.SignedVoucher, error) //perm:read
+
+	//piece storage
+	GetReadUrl(context.Context, string) (string, error)               //perm:read
+	GetWriteUrl(ctx context.Context, resource string) (string, error) //perm:read
+
+	ImportV1Data(ctx context.Context, src string) error //perm:write
+}