diff --git a/api/api_storage.go b/api/api_storage.go index a26080617..6ebee9908 100644 --- a/api/api_storage.go +++ b/api/api_storage.go @@ -267,6 +267,11 @@ type SectorLog struct { Message string } +type SectorPiece struct { + Piece abi.PieceInfo + DealInfo *PieceDealInfo // nil for pieces which do not appear in deals (e.g. filler pieces) +} + type SectorInfo struct { SectorID abi.SectorNumber State SectorState @@ -274,6 +279,7 @@ type SectorInfo struct { CommR *cid.Cid Proof []byte Deals []abi.DealID + Pieces []SectorPiece Ticket SealTicket Seed SealSeed PreCommitMsg *cid.Cid diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index ce3a4562f..15dbe3829 100644 Binary files a/build/openrpc/miner.json.gz and b/build/openrpc/miner.json.gz differ diff --git a/cmd/lotus-miner/sectors.go b/cmd/lotus-miner/sectors.go index d09605bd9..9bfc84900 100644 --- a/cmd/lotus-miner/sectors.go +++ b/cmd/lotus-miner/sectors.go @@ -389,112 +389,132 @@ var sectorsListCmd = &cli.Command{ continue } - if showRemoved || st.State != api.SectorState(sealing.Removed) { - _, inSSet := commitedIDs[s] - _, inASet := activeIDs[s] - - dw, vp := .0, .0 - if st.Expiration-st.Activation > 0 { - rdw := big.Add(st.DealWeight, st.VerifiedDealWeight) - dw = float64(big.Div(rdw, big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) - vp = float64(big.Div(big.Mul(st.VerifiedDealWeight, big.NewInt(9)), big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) - } - - var deals int - for _, deal := range st.Deals { - if deal != 0 { - deals++ - } - } - - exp := st.Expiration - if st.OnTime > 0 && st.OnTime < exp { - exp = st.OnTime // Can be different when the sector was CC upgraded - } - - m := map[string]interface{}{ - "ID": s, - "State": color.New(stateOrder[sealing.SectorState(st.State)].col).Sprint(st.State), - "OnChain": yesno(inSSet), - "Active": yesno(inASet), - } - - if deals > 0 { - m["Deals"] = color.GreenString("%d", deals) - } else { - m["Deals"] = color.BlueString("CC") - if st.ToUpgrade { - m["Deals"] = color.CyanString("CC(upgrade)") - } - } - - if !fast { - if !inSSet { - m["Expiration"] = "n/a" - } else { - m["Expiration"] = lcli.EpochTime(head.Height(), exp) - - if !fast && deals > 0 { - m["DealWeight"] = units.BytesSize(dw) - if vp > 0 { - m["VerifiedPower"] = color.GreenString(units.BytesSize(vp)) - } - } - - if st.Early > 0 { - m["RecoveryTimeout"] = color.YellowString(lcli.EpochTime(head.Height(), st.Early)) - } - } - } - - if cctx.Bool("events") { - var events int - for _, sectorLog := range st.Log { - if !strings.HasPrefix(sectorLog.Kind, "event") { - continue - } - if sectorLog.Kind == "event;sealing.SectorRestart" { - continue - } - events++ - } - - pieces := len(st.Deals) - - switch { - case events < 12+pieces: - m["Events"] = color.GreenString("%d", events) - case events < 20+pieces: - m["Events"] = color.YellowString("%d", events) - default: - m["Events"] = color.RedString("%d", events) - } - } - - if cctx.Bool("seal-time") && len(st.Log) > 1 { - start := time.Unix(int64(st.Log[0].Timestamp), 0) - - for _, sectorLog := range st.Log { - if sectorLog.Kind == "event;sealing.SectorProving" { - end := time.Unix(int64(sectorLog.Timestamp), 0) - dur := end.Sub(start) - - switch { - case dur < 12*time.Hour: - m["SealTime"] = color.GreenString("%s", dur) - case dur < 24*time.Hour: - m["SealTime"] = color.YellowString("%s", dur) - default: - m["SealTime"] = color.RedString("%s", dur) - } - - break - } - } - } - - tw.Write(m) + if !showRemoved && st.State == api.SectorState(sealing.Removed) { + continue } + + _, inSSet := commitedIDs[s] + _, inASet := activeIDs[s] + + const verifiedPowerGainMul = 9 + + dw, vp := .0, .0 + estimate := st.Expiration-st.Activation <= 0 + if !estimate { + rdw := big.Add(st.DealWeight, st.VerifiedDealWeight) + dw = float64(big.Div(rdw, big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) + vp = float64(big.Div(big.Mul(st.VerifiedDealWeight, big.NewInt(verifiedPowerGainMul)), big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) + } else { + for _, piece := range st.Pieces { + if piece.DealInfo != nil { + dw += float64(piece.Piece.Size) + if piece.DealInfo.DealProposal != nil && piece.DealInfo.DealProposal.VerifiedDeal { + vp += float64(piece.Piece.Size) * verifiedPowerGainMul + } + } + } + } + + var deals int + for _, deal := range st.Deals { + if deal != 0 { + deals++ + } + } + + exp := st.Expiration + if st.OnTime > 0 && st.OnTime < exp { + exp = st.OnTime // Can be different when the sector was CC upgraded + } + + m := map[string]interface{}{ + "ID": s, + "State": color.New(stateOrder[sealing.SectorState(st.State)].col).Sprint(st.State), + "OnChain": yesno(inSSet), + "Active": yesno(inASet), + } + + if deals > 0 { + m["Deals"] = color.GreenString("%d", deals) + } else { + m["Deals"] = color.BlueString("CC") + if st.ToUpgrade { + m["Deals"] = color.CyanString("CC(upgrade)") + } + } + + if !fast { + if !inSSet { + m["Expiration"] = "n/a" + } else { + m["Expiration"] = lcli.EpochTime(head.Height(), exp) + if st.Early > 0 { + m["RecoveryTimeout"] = color.YellowString(lcli.EpochTime(head.Height(), st.Early)) + } + } + } + + if !fast && deals > 0 { + estWrap := func(s string) string { + if !estimate { + return s + } + return fmt.Sprintf("[%s]", s) + } + + m["DealWeight"] = estWrap(units.BytesSize(dw)) + if vp > 0 { + m["VerifiedPower"] = estWrap(color.GreenString(units.BytesSize(vp))) + } + } + + if cctx.Bool("events") { + var events int + for _, sectorLog := range st.Log { + if !strings.HasPrefix(sectorLog.Kind, "event") { + continue + } + if sectorLog.Kind == "event;sealing.SectorRestart" { + continue + } + events++ + } + + pieces := len(st.Deals) + + switch { + case events < 12+pieces: + m["Events"] = color.GreenString("%d", events) + case events < 20+pieces: + m["Events"] = color.YellowString("%d", events) + default: + m["Events"] = color.RedString("%d", events) + } + } + + if cctx.Bool("seal-time") && len(st.Log) > 1 { + start := time.Unix(int64(st.Log[0].Timestamp), 0) + + for _, sectorLog := range st.Log { + if sectorLog.Kind == "event;sealing.SectorProving" { // todo: figure out a good way to not hardcode + end := time.Unix(int64(sectorLog.Timestamp), 0) + dur := end.Sub(start) + + switch { + case dur < 12*time.Hour: + m["SealTime"] = color.GreenString("%s", dur) + case dur < 24*time.Hour: + m["SealTime"] = color.YellowString("%s", dur) + default: + m["SealTime"] = color.RedString("%s", dur) + } + + break + } + } + } + + tw.Write(m) } return tw.Flush(os.Stdout) diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index 1c6891329..dd7a1f88e 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -2019,6 +2019,7 @@ Response: "CommR": null, "Proof": "Ynl0ZSBhcnJheQ==", "Deals": null, + "Pieces": null, "Ticket": { "Value": null, "Epoch": 10101 diff --git a/storage/miner_sealing.go b/storage/miner_sealing.go index 38b24e8c1..01b9546a6 100644 --- a/storage/miner_sealing.go +++ b/storage/miner_sealing.go @@ -94,10 +94,16 @@ func (m *Miner) SectorsStatus(ctx context.Context, sid abi.SectorNumber, showOnC } deals := make([]abi.DealID, len(info.Pieces)) + pieces := make([]api.SectorPiece, len(info.Pieces)) for i, piece := range info.Pieces { + pieces[i].Piece = piece.Piece if piece.DealInfo == nil { continue } + + pdi := *piece.DealInfo // copy + pieces[i].DealInfo = &pdi + deals[i] = piece.DealInfo.DealID } @@ -118,6 +124,7 @@ func (m *Miner) SectorsStatus(ctx context.Context, sid abi.SectorNumber, showOnC CommR: info.CommR, Proof: info.Proof, Deals: deals, + Pieces: pieces, Ticket: api.SealTicket{ Value: info.TicketValue, Epoch: info.TicketEpoch,