filecoin-project · tediou5 · Aug 5, 2025 · Aug 4, 2025 · Aug 4, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - fix(cli): correctly construct the TerminateSectors params ([filecoin-project/lotus#13207](https://github.com/filecoin-project/lotus/pull/13207))
 - feat(net): add LOTUS_ENABLE_MESSAGE_FETCH_INSTRUMENTATION=1 to turn on metrics and debugging for local vs bitswap message fetching during block validation ([filecoin-project/lotus#13221](https://github.com/filecoin-project/lotus/pull/13221))
 - feat(spcli): correctly handle the batch logic of `lotus-miner actor settle-deal`; replace the dealid data source ([filecoin-project/lotus#13189](https://github.com/filecoin-project/lotus/pull/13189))
+- feat(spcli): add `--all-deals` to `lotus-miner actor settle-deal`. By default, only expired deals are processed ([filecoin-project/lotus#13243](https://github.com/filecoin-project/lotus/pull/13243))
 
 # Node v1.33.0 / 2025-05-08
 The Lotus v1.33.0 release introduces experimental v2 APIs with F3 awareness, featuring a new TipSet selection mechanism that significantly enhances how applications interact with the Filecoin blockchain. This release candidate also adds F3-aware Ethereum APIs via the /v2 endpoint.  All of the /v2 APIs implement intelligent fallback mechanisms between F3 and Expected Consensus and are exposed through the Lotus Gateway.

diff --git a/cli/spcli/actor.go b/cli/spcli/actor.go
@@ -65,6 +65,10 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 				Name:  "skip-wait-msg",
 				Usage: "skip to check the message status",
 			},
+			&cli.BoolFlag{
+				Name:  "all-deals",
+				Usage: "settle all deals. only expired deals are calculated by default",
+			},
 			&cli.BoolFlag{
 				Name:  "really-do-it",
 				Usage: "Actually send transaction performing the action",
@@ -97,6 +101,12 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 				}
 			}
 
+			head, err := api.ChainHead(ctx)
+			if err != nil {
+				return err
+			}
+			alldeals := cctx.Bool("all-deals")
+
 			var (
 				dealIDs []uint64
 				dealId  uint64
@@ -152,7 +162,13 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 						return xerrors.Errorf("Error getting all deals for miner: %w", err)
 					}
 					for _, deal := range data {
-						dealIDs = append(dealIDs, uint64(deal))
+						marketDeal, err := api.StateMarketStorageDeal(ctx, deal, types.EmptyTSK)
+						if err != nil {
+							continue
+						}
+						if marketDeal.Proposal.EndEpoch < head.Height() || alldeals {
+							dealIDs = append(dealIDs, uint64(deal))
+						}
 					}
 				}
 			}

diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md