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

Merge pull request #2647 from filecoin-project/feat/better-seal-duration-ui

Browse Source 
Feat/better seal duration ui
This commit is contained in:
Aayush Rajasekaran 2020-07-28 21:32:54 -04:00 committed by GitHub
commit 5df0ee7935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/lotus-storage-miner/info.go
View File

@ -154,6 +154,13 @@ var infoCmd = &cli.Command{
fmt.Println() fmt.Println()
sealdur, err := nodeApi.SectorGetExpectedSealDuration(ctx)
if err != nil {
return err
}
fmt.Printf("Expected Seal Duration: %s\n\n", sealdur)
fmt.Println("Sectors:") fmt.Println("Sectors:")
err = sectorsInfo(ctx, nodeApi) err = sectorsInfo(ctx, nodeApi)
if err != nil { if err != nil {

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

@ -52,7 +52,7 @@ import (
var DefaultHashFunction = uint64(mh.BLAKE2B_MIN + 31) var DefaultHashFunction = uint64(mh.BLAKE2B_MIN + 31)
const dealStartBuffer abi.ChainEpoch = 10000 // TODO: allow setting const dealStartBufferHours uint64 = 24
type API struct { type API struct {
fx.In fx.In
@ -151,7 +151,8 @@ func (a *API) ClientStartDeal(ctx context.Context, params *api.StartDealParams)
return nil, xerrors.Errorf("failed getting chain height: %w", err) return nil, xerrors.Errorf("failed getting chain height: %w", err)
} }
dealStart = ts.Height() + dealStartBuffer blocksPerHour := 60 * 60 / build.BlockDelaySecs
dealStart = ts.Height() + abi.ChainEpoch(dealStartBufferHours*blocksPerHour)
} }
result, err := a.SMDealClient.ProposeStorageDeal(ctx, storagemarket.ProposeStorageDealParams{ result, err := a.SMDealClient.ProposeStorageDeal(ctx, storagemarket.ProposeStorageDealParams{

2
node/modules/storageminer.go
View File

@ -418,7 +418,7 @@ func StorageProvider(minerAddress dtypes.MinerAddress,
} }
earliest := abi.ChainEpoch(sealEpochs) + ht earliest := abi.ChainEpoch(sealEpochs) + ht
if deal.Proposal.StartEpoch < earliest { if deal.Proposal.StartEpoch < earliest {
log.Warnf("proposed deal would start before sealing can be completed; rejecting storage deal proposal from client: %s", deal.Proposal.PieceCID, deal.Client.String()) log.Warnw("proposed deal would start before sealing can be completed; rejecting storage deal proposal from client", "piece_cid", deal.Proposal.PieceCID, "client", deal.Client.String(), "seal_duration", sealDuration, "earliest", earliest, "curepoch", ht)
return false, fmt.Sprintf("cannot seal a sector before %s", deal.Proposal.StartEpoch), nil return false, fmt.Sprintf("cannot seal a sector before %s", deal.Proposal.StartEpoch), nil
} }