diff --git a/cmd/lotus-shed/sr2-dealstats-rollup.go b/cmd/lotus-shed/sr2-dealstats-rollup.go index 9959fb1e0..a2c6d03d9 100644 --- a/cmd/lotus-shed/sr2-dealstats-rollup.go +++ b/cmd/lotus-shed/sr2-dealstats-rollup.go @@ -34,12 +34,14 @@ type competitionTotalOutput struct { Payload competitionTotal `json:"payload"` } type competitionTotal struct { - UniqueCids int `json:"total_unique_cids"` - UniqueProviders int `json:"total_unique_providers"` - UniqueProjects int `json:"total_unique_projects"` - UniqueClients int `json:"total_unique_clients"` - TotalDeals int `json:"total_num_deals"` - TotalBytes int64 `json:"total_stored_data_size"` + UniqueCids int `json:"total_unique_cids"` + UniqueProviders int `json:"total_unique_providers"` + UniqueProjects int `json:"total_unique_projects"` + UniqueClients int `json:"total_unique_clients"` + TotalDeals int `json:"total_num_deals"` + TotalBytes int64 `json:"total_stored_data_size"` + FilplusTotalDeals int `json:"filplus_total_num_deals"` + FilplusTotalBytes int64 `json:"filplus_total_stored_data_size"` seenProject map[string]bool seenClient map[address.Address]bool @@ -271,6 +273,11 @@ var rollupDealStatsCmd = &cli.Command{ unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true unfilteredGrandTotals.TotalDeals++ + if dealInfo.Proposal.VerifiedDeal { + unfilteredGrandTotals.FilplusTotalDeals++ + unfilteredGrandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize) + } + // perl -E 'say scalar gmtime ( 166560 * 30 + 1598306400 )' // Wed Oct 21 18:00:00 2020 if dealInfo.Proposal.StartEpoch <= 166560 { @@ -325,6 +332,11 @@ var rollupDealStatsCmd = &cli.Command{ projStatEntry.NumDeals++ clientStatEntry.NumDeals++ + if dealInfo.Proposal.VerifiedDeal { + grandTotals.FilplusTotalDeals++ + grandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize) + } + payloadCid := "unknown" if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil { payloadCid = c.String()