sectors expired: Handle precomitted and unproven sectors correctly

2021-08-31 16:24:29 +02:00
parent b0f57d74e5
commit daaa725e3b
9 changed files with 55 additions and 0 deletions
@@ -1628,12 +1628,31 @@ var sectorsExpiredCmd = &cli.Command{
 				}

 				toCheck, err = bitfield.SubtractBitField(toCheck, live)
+				if err != nil {
+					return err
+				}
+
+				unproven, err := part.UnprovenSectors()
+				if err != nil {
+					return err
+				}
+
+				toCheck, err = bitfield.SubtractBitField(toCheck, unproven)
+
 				return err
 			})
 		}); err != nil {
 			return err
 		}

+		err = mas.ForEachPrecommittedSector(func(pci miner.SectorPreCommitOnChainInfo) error {
+			toCheck.Unset(uint64(pci.Info.SectorNumber))
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+
 		if cctx.Bool("remove-expired") {
 			color.Red("Removing sectors:\n")
 		}