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

As per Why&Aayush: slashing deals is not really a thing

Browse Source
This commit is contained in:
Peter Rabbitson 2022-01-13 20:03:33 +01:00
parent 9a5b13b7c8
commit d568d6fabc
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/lotus-shed/storage-stats.go
View File

@ -30,8 +30,6 @@ type providerMeta struct {
type Totals struct { type Totals struct {
TotalDeals int `json:"total_num_deals"` TotalDeals int `json:"total_num_deals"`
TotalBytes int64 `json:"total_stored_data_size"` TotalBytes int64 `json:"total_stored_data_size"`
SlashedTotalDeals int `json:"slashed_total_num_deals"`
SlashedTotalBytes int64 `json:"slashed_total_stored_data_size"`
PrivateTotalDeals int `json:"private_total_num_deals"` PrivateTotalDeals int `json:"private_total_num_deals"`
PrivateTotalBytes int64 `json:"private_total_stored_data_size"` PrivateTotalBytes int64 `json:"private_total_stored_data_size"`
CapacityCarryingData float64 `json:"capacity_fraction_carrying_data"` CapacityCarryingData float64 `json:"capacity_fraction_carrying_data"`
@ -111,8 +109,13 @@ var storageStatsCmd = &cli.Command{
// Only count deals that have properly started, not past/future ones // Only count deals that have properly started, not past/future ones
// https://github.com/filecoin-project/specs-actors/blob/v0.9.9/actors/builtin/market/deal.go#L81-L85 // https://github.com/filecoin-project/specs-actors/blob/v0.9.9/actors/builtin/market/deal.go#L81-L85
// Bail on 0 as well in case SectorStartEpoch is uninitialized due to some bug // Bail on 0 as well in case SectorStartEpoch is uninitialized due to some bug
//
// Additionally if the SlashEpoch is set this means the underlying sector is
// terminated for whatever reason ( not just slashed ), and the deal record
// will soon be removed from the state entirely
if dealInfo.State.SectorStartEpoch <= 0 || if dealInfo.State.SectorStartEpoch <= 0 ||
dealInfo.State.SectorStartEpoch > ts.Height() { dealInfo.State.SectorStartEpoch > ts.Height() ||
dealInfo.State.SlashEpoch > -1 {
continue continue
} }
@ -144,10 +147,6 @@ var storageStatsCmd = &cli.Command{
netTotals.TotalBytes += int64(dealInfo.Proposal.PieceSize) netTotals.TotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.TotalDeals++ netTotals.TotalDeals++
if dealInfo.State.SlashEpoch > -1 && dealInfo.State.LastUpdatedEpoch < dealInfo.State.SlashEpoch {
netTotals.SlashedTotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.SlashedTotalDeals++
}
if netTotals.providers[dealInfo.Proposal.Provider].nonidentifiable { if netTotals.providers[dealInfo.Proposal.Provider].nonidentifiable {
netTotals.PrivateTotalBytes += int64(dealInfo.Proposal.PieceSize) netTotals.PrivateTotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.PrivateTotalDeals++ netTotals.PrivateTotalDeals++
@ -156,10 +155,6 @@ var storageStatsCmd = &cli.Command{
if dealInfo.Proposal.VerifiedDeal { if dealInfo.Proposal.VerifiedDeal {
netTotals.FilPlus.TotalBytes += int64(dealInfo.Proposal.PieceSize) netTotals.FilPlus.TotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.FilPlus.TotalDeals++ netTotals.FilPlus.TotalDeals++
if dealInfo.State.SlashEpoch > -1 && dealInfo.State.LastUpdatedEpoch < dealInfo.State.SlashEpoch {
netTotals.FilPlus.SlashedTotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.FilPlus.SlashedTotalDeals++
}
if netTotals.providers[dealInfo.Proposal.Provider].nonidentifiable { if netTotals.providers[dealInfo.Proposal.Provider].nonidentifiable {
netTotals.FilPlus.PrivateTotalBytes += int64(dealInfo.Proposal.PieceSize) netTotals.FilPlus.PrivateTotalBytes += int64(dealInfo.Proposal.PieceSize)
netTotals.FilPlus.PrivateTotalDeals++ netTotals.FilPlus.PrivateTotalDeals++