account for cc sectors

filecoin-project · Apr 15, 2024 · ae04d8a · ae04d8a
1 parent a753705
commit ae04d8a
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/storage/pipeline/commit_batch.go b/storage/pipeline/commit_batch.go
@@ -371,17 +371,19 @@ func (b *CommitBatcher) processBatchV2(cfg sealiface.Config, sectors []abi.Secto
 
 		collateral = big.Add(collateral, sc)
 
-		pieces := b.todo[sector].ActivationManifest.Pieces
+		manifest := b.todo[sector].ActivationManifest
 		precomitInfo, err := b.api.StateSectorPreCommitInfo(b.mctx, b.maddr, sector, ts.Key())
 		if err != nil {
 			res.FailedSectors[sector] = err.Error()
 			continue
 		}
 
-		err = b.allocationCheck(pieces, precomitInfo, abi.ActorID(mid), ts)
-		if err != nil {
-			res.FailedSectors[sector] = err.Error()
-			continue
+		if len(manifest.Pieces) > 0 {
+			err = b.allocationCheck(manifest.Pieces, precomitInfo, abi.ActorID(mid), ts)
+			if err != nil {
+				res.FailedSectors[sector] = err.Error()
+				continue
+			}
 		}
 
 		params.SectorActivations = append(params.SectorActivations, b.todo[sector].ActivationManifest)
@@ -925,6 +927,10 @@ func (b *CommitBatcher) aggregateProofType(nv network.Version) (abi.RegisteredAg
 func (b *CommitBatcher) allocationCheck(Pieces []miner.PieceActivationManifest, precomitInfo *miner.SectorPreCommitOnChainInfo, miner abi.ActorID, ts *types.TipSet) error {
 	for _, p := range Pieces {
 		p := p
+		// skip filler pieces
+		if p.VerifiedAllocationKey == nil {
+			continue
+		}
 		addr, err := address.NewIDAddress(uint64(p.VerifiedAllocationKey.Client))
 		if err != nil {
 			return err