cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix(markets): update version, pass payment interval params

Browse Source
This commit is contained in:
hannahhoward 2020-01-24 16:32:17 -08:00
parent be26c56362
commit 433f9ff211
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
api/api_full.go
View File

@ -234,20 +234,22 @@ type QueryOffer struct {
Root cid.Cid Root cid.Cid
Size uint64 Size uint64
MinPrice types.BigInt MinPrice types.BigInt
PaymentInterval uint64
Miner address.Address PaymentIntervalIncrease uint64
MinerPeerID peer.ID Miner address.Address
MinerPeerID peer.ID
} }
func (o *QueryOffer) Order(client address.Address) RetrievalOrder { func (o *QueryOffer) Order(client address.Address) RetrievalOrder {
return RetrievalOrder{ return RetrievalOrder{
Root: o.Root, Root: o.Root,
Size: o.Size, Size: o.Size,
Total: o.MinPrice, Total: o.MinPrice,
PaymentInterval: o.PaymentInterval,
Client: client, PaymentIntervalIncrease: o.PaymentIntervalIncrease,
Client: client,
Miner: o.Miner, Miner: o.Miner,
MinerPeerID: o.MinerPeerID, MinerPeerID: o.MinerPeerID,
@ -259,11 +261,12 @@ type RetrievalOrder struct {
Root cid.Cid Root cid.Cid
Size uint64 Size uint64
// TODO: support offset // TODO: support offset
Total types.BigInt Total types.BigInt
PaymentInterval uint64
Client address.Address PaymentIntervalIncrease uint64
Miner address.Address Client address.Address
MinerPeerID peer.ID Miner address.Address
MinerPeerID peer.ID
} }
type ReplayResults struct { type ReplayResults struct {

2
go.mod
View File

@ -18,7 +18,7 @@ require (
github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2 github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2
github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03 github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03
github.com/filecoin-project/go-data-transfer v0.0.0-20191219005021-4accf56bd2ce github.com/filecoin-project/go-data-transfer v0.0.0-20191219005021-4accf56bd2ce
github.com/filecoin-project/go-fil-markets v0.0.0-20200124221818-7b74974aab0d github.com/filecoin-project/go-fil-markets v0.0.0-20200124235616-d94a1cf0beaa
github.com/filecoin-project/go-paramfetch v0.0.1 github.com/filecoin-project/go-paramfetch v0.0.1
github.com/filecoin-project/go-sectorbuilder v0.0.2-0.20200123143044-d9cc96c53c55 github.com/filecoin-project/go-sectorbuilder v0.0.2-0.20200123143044-d9cc96c53c55
github.com/filecoin-project/go-statestore v0.1.0 github.com/filecoin-project/go-statestore v0.1.0

2
go.sum
View File

@ -115,6 +115,8 @@ github.com/filecoin-project/go-fil-markets v0.0.0-20200124174839-9211de075b61 h1
github.com/filecoin-project/go-fil-markets v0.0.0-20200124174839-9211de075b61/go.mod h1:hbYlEmbOg9QwhZ71B724oAgXQ0wnoWHj8S+33q9lrm8= github.com/filecoin-project/go-fil-markets v0.0.0-20200124174839-9211de075b61/go.mod h1:hbYlEmbOg9QwhZ71B724oAgXQ0wnoWHj8S+33q9lrm8=
github.com/filecoin-project/go-fil-markets v0.0.0-20200124221818-7b74974aab0d h1:HiIbFwf7z2dCfBOkZiQ9/2ltKmREs3hXqT/8PD83nzk= github.com/filecoin-project/go-fil-markets v0.0.0-20200124221818-7b74974aab0d h1:HiIbFwf7z2dCfBOkZiQ9/2ltKmREs3hXqT/8PD83nzk=
github.com/filecoin-project/go-fil-markets v0.0.0-20200124221818-7b74974aab0d/go.mod h1:hbYlEmbOg9QwhZ71B724oAgXQ0wnoWHj8S+33q9lrm8= github.com/filecoin-project/go-fil-markets v0.0.0-20200124221818-7b74974aab0d/go.mod h1:hbYlEmbOg9QwhZ71B724oAgXQ0wnoWHj8S+33q9lrm8=
github.com/filecoin-project/go-fil-markets v0.0.0-20200124235616-d94a1cf0beaa h1:45LCzmHF2NZuYYFOmJ/MQ5SRDXw4QApQvT4BJzVysV8=
github.com/filecoin-project/go-fil-markets v0.0.0-20200124235616-d94a1cf0beaa/go.mod h1:hbYlEmbOg9QwhZ71B724oAgXQ0wnoWHj8S+33q9lrm8=
github.com/filecoin-project/go-paramfetch v0.0.0-20200102181131-b20d579f2878/go.mod h1:40kI2Gv16mwcRsHptI3OAV4nlOEU7wVDc4RgMylNFjU= github.com/filecoin-project/go-paramfetch v0.0.0-20200102181131-b20d579f2878/go.mod h1:40kI2Gv16mwcRsHptI3OAV4nlOEU7wVDc4RgMylNFjU=
github.com/filecoin-project/go-paramfetch v0.0.1 h1:gV7bs5YaqlgpGFMiLxInGK2L1FyCXUE0rimz4L7ghoE= github.com/filecoin-project/go-paramfetch v0.0.1 h1:gV7bs5YaqlgpGFMiLxInGK2L1FyCXUE0rimz4L7ghoE=
github.com/filecoin-project/go-paramfetch v0.0.1/go.mod h1:fZzmf4tftbwf9S37XRifoJlz7nCjRdIrMGLR07dKLCc= github.com/filecoin-project/go-paramfetch v0.0.1/go.mod h1:fZzmf4tftbwf9S37XRifoJlz7nCjRdIrMGLR07dKLCc=

14
node/impl/client/client.go
View File

@ -159,11 +159,13 @@ func (a *API) ClientFindData(ctx context.Context, root cid.Cid) ([]api.QueryOffe
out[k] = api.QueryOffer{Err: err.Error(), Miner: p.Address, MinerPeerID: p.ID} out[k] = api.QueryOffer{Err: err.Error(), Miner: p.Address, MinerPeerID: p.ID}
} else { } else {
out[k] = api.QueryOffer{ out[k] = api.QueryOffer{
Root: root, Root: root,
Size: queryResponse.Size, Size: queryResponse.Size,
MinPrice: utils.FromSharedTokenAmount(queryResponse.PieceRetrievalPrice()), MinPrice: utils.FromSharedTokenAmount(queryResponse.PieceRetrievalPrice()),
Miner: p.Address, // TODO: check PaymentInterval: queryResponse.MaxPaymentInterval,
MinerPeerID: p.ID, PaymentIntervalIncrease: queryResponse.MaxPaymentIntervalIncrease,
Miner: p.Address, // TODO: check
MinerPeerID: p.ID,
} }
} }
} }
@ -291,7 +293,7 @@ func (a *API) ClientRetrieve(ctx context.Context, order api.RetrievalOrder, path
a.Retrieval.Retrieve( a.Retrieval.Retrieve(
ctx, ctx,
order.Root, order.Root,
retrievalmarket.NewParamsV0(types.BigDiv(order.Total, types.NewInt(order.Size)).Int, 0, 0), retrievalmarket.NewParamsV0(types.BigDiv(order.Total, types.NewInt(order.Size)).Int, order.PaymentInterval, order.PaymentIntervalIncrease),
utils.ToSharedTokenAmount(order.Total), utils.ToSharedTokenAmount(order.Total),
order.MinerPeerID, order.MinerPeerID,
order.Client, order.Client,