Show deal sizes is sealing sectors
This commit is contained in:
parent
b089cc4fc3
commit
e4044151f0
@ -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
|
||||
|
@ -394,10 +394,20 @@ var sectorsListCmd = &cli.Command{
|
||||
_, inASet := activeIDs[s]
|
||||
|
||||
dw, vp := .0, .0
|
||||
if st.Expiration-st.Activation > 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(9)), 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) * 9
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var deals int
|
||||
@ -433,20 +443,26 @@ var sectorsListCmd = &cli.Command{
|
||||
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 !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 {
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user