Support early sector finalization

main.go

@@ -166,6 +166,11 @@ Use with caution since might not be compatible in all filesystems.`,
 			Description: `If bigger than zero, stop bidding if the number of Lotus sealing sectors exceeds this limit.
 Zero means no limits`,
 		},
+		{
+			Name:        "finalize-early",
+			DefValue:    false,
+			Description: "Match lotus FinalizeEarly sector state accounting",
+		},
 		{
 			Name:        "deal-data-fetch-attempts",
 			DefValue:    3,
@@ -364,6 +369,7 @@ var daemonCmd = &cobra.Command{
 			v.GetString("lotus-market-api-token"),
 			v.GetInt("lotus-api-conn-retries"),
 			v.GetBool("fake-mode"),
+			v.GetBool("finalize-early"),
 		)
 		cli.CheckErrf("creating lotus client: %v", err)
 		fin.Add(lc)

service/lotusclient/lotusclient.go

@@ -32,25 +32,27 @@ type LotusClient interface {
 
 // Client provides access to Lotus for importing deal data.
 type Client struct {
-	cmin     api.StorageMiner
-	cmkt     api.StorageMiner
-	fakeMode bool
+	cmin          api.StorageMiner
+	cmkt          api.StorageMiner
+	fakeMode      bool
+	finalizeEarly bool
 
 	ctx       context.Context
 	finalizer *finalizer.Finalizer
 }
 
 // New returns a new *LotusClient.
 func New(maddr string, authToken string, marketMaddr string, marketAuthToken string,
-	connRetries int, fakeMode bool) (*Client, error) {
+	connRetries int, fakeMode bool, finalizeEarly bool) (*Client, error) {
 	fin := finalizer.NewFinalizer()
 	ctx, cancel := context.WithCancel(context.Background())
 	fin.Add(finalizer.NewContextCloser(cancel))
 
 	lc := &Client{
-		fakeMode:  fakeMode,
-		ctx:       ctx,
-		finalizer: fin,
+		fakeMode:      fakeMode,
+		finalizeEarly: finalizeEarly,
+		ctx:           ctx,
+		finalizer:     fin,
 	}
 	if lc.fakeMode {
 		return lc, nil
@@ -123,6 +125,12 @@ func (c *Client) CurrentSealingSectors() (int, error) {
 	notSealingStates := []string{"Proving", "Removed", "Removing",
 		"Terminating", "TerminateWait", "TerminateFinality", "TerminateFailed"}
 
+	if c.finalizeEarly {
+		// some additional states can be mapped to sstProving with the FinalizeEarly option
+		// https://github.com/filecoin-project/lotus/blob/v1.13.0/extern/storage-sealing/sector_state.go#L115
+		notSealingStates = append(notSealingStates, "SubmitCommit", "CommitWait", "SubmitCommitAggregate", "CommitAggregateWait", "SubmitReplicaUpdate", "ReplicaUpdateWait")
+	}
+
 	ctx, cancel := context.WithTimeout(c.ctx, requestTimeout)
 	defer cancel()
 	start := time.Now()