feat(spcli): correctly handle the batch logic of lotus-miner actor settle-deal (#13189)

* feat(spcli): correctly handle the batch logic of `lotus-miner actor settle-deal`

* retain StateWaitMsg logic

* use v0api.WrapperV1Full

* opt(spcli): push settle-deals Chucks with MpoolBatchPushMessage

* chore(spcli): combine logs to prevent interleaving caused by concurrency

* fix typo

* chore: remove unnecessary var

---------

Co-authored-by: Phi-rjan <[email protected]>
Co-authored-by: qians <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -39,6 +39,7 @@
 - fix(cli): use F3GetPowerTableByInstance to resolve F3 power tables by default, `--by-tipset` flag can be used to restore old behavior ([filecoin-project/lotus#13201](https://github.com/filecoin-project/lotus/pull/13201))
 - 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))
 
 # 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.
@@ -660,4 +661,4 @@ For the set of changes since the last stable release:
 | DemoYeti | 1 | +2/-1 | 1 |
 | qwdsds | 1 | +1/-1 | 1 |
 | Samuel Arogbonlo | 1 | +2/-0 | 2 |
-| Elias Rad | 1 | +1/-1 | 1 |
+| Elias Rad | 1 | +1/-1 | 1 |

cli/miner/actor.go

@@ -23,7 +23,7 @@ var actorCmd = &cli.Command{
 	Usage: "manipulate the miner actor",
 	Subcommands: []*cli.Command{
 		spcli.ActorSetAddrsCmd(LMActorGetter),
-		spcli.ActorDealSettlementCmd(LMActorGetter),
+		spcli.ActorDealSettlementCmd(LMActorOrEnvGetter),
 		spcli.ActorWithdrawCmd(LMActorGetter),
 		spcli.ActorRepayDebtCmd(LMActorGetter),
 		spcli.ActorSetPeeridCmd(LMActorGetter),

cli/spcli/actor.go

@@ -3,14 +3,17 @@ package spcli
 import (
 	"bytes"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 
 	"github.com/docker/go-units"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
+	"github.com/samber/lo"
 	"github.com/urfave/cli/v2"
+	"golang.org/x/sync/errgroup"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
@@ -24,6 +27,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 
 	lapi "github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build/buildconstants"
 	"github.com/filecoin-project/lotus/chain/actors"
@@ -48,6 +52,23 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 				Usage: "number of block confirmations to wait for",
 				Value: int(buildconstants.MessageConfidence),
 			},
+			&cli.StringFlag{
+				Name:  "from",
+				Usage: "specify where to send the message from (any address)",
+			},
+			&cli.IntFlag{
+				Name:  "max-deals",
+				Usage: "the maximum number of deals contained in each message",
+				Value: 50,
+			},
+			&cli.BoolFlag{
+				Name:  "skip-wait-msg",
+				Usage: "skip to check the message status",
+			},
+			&cli.BoolFlag{
+				Name:  "really-do-it",
+				Usage: "Actually send transaction performing the action",
+			},
 		},
 
 		Action: func(cctx *cli.Context) error {
@@ -63,6 +84,19 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 				return err
 			}
 
+			mi, err := api.StateMinerInfo(ctx, maddr, types.EmptyTSK)
+			if err != nil {
+				return xerrors.Errorf("Error getting miner info: %w", err)
+			}
+
+			fromAddr := mi.Worker
+			if addr := cctx.String("from"); addr != "" {
+				fromAddr, err = address.NewFromString(addr)
+				if err != nil {
+					return err
+				}
+			}
+
 			var (
 				dealIDs []uint64
 				dealId  uint64
@@ -107,69 +141,101 @@ func ActorDealSettlementCmd(getActor ActorAddressGetter) *cli.Command {
 					}
 				}
 			} else {
-				if dealIDs, err = GetMinerAllDeals(ctx, api, maddr, types.EmptyTSK); err != nil {
-					return xerrors.Errorf("Error getting all deals for miner: %w", err)
+				sectors, err := api.StateMinerSectors(ctx, maddr, nil, types.EmptyTSK)
+				if err != nil {
+					return xerrors.Errorf("Error getting StateMinerSectors for miner: %w", err)
+				}
+				wapi := &v0api.WrapperV1Full{FullNode: api}
+				for _, sector := range sectors {
+					data, err := lcli.GetMarketDealIDs(ctx, wapi, maddr, sector.SectorNumber, types.EmptyTSK)
+					if err != nil {
+						return xerrors.Errorf("Error getting all deals for miner: %w", err)
+					}
+					for _, deal := range data {
+						dealIDs = append(dealIDs, uint64(deal))
+					}
 				}
 			}
 
-			mi, err := api.StateMinerInfo(ctx, maddr, types.EmptyTSK)
-			if err != nil {
-				return xerrors.Errorf("Error getting miner info: %w", err)
+			fmt.Printf("There are a total of %v deals, and about %v messages will be sent out.\n", len(dealIDs), len(dealIDs)/cctx.Int("max-deals"))
+
+			if !cctx.Bool("really-do-it") {
+				return fmt.Errorf("pass --really-do-it to confirm this action")
 			}
 
-			dealParams := bitfield.NewFromSet(dealIDs)
-			params, err := actors.SerializeParams(&dealParams)
-			if err != nil {
-				return err
+			sort.Slice(dealIDs, func(i, j int) bool {
+				return dealIDs[i] < dealIDs[j]
+			})
+			dealChucks := lo.Chunk(dealIDs, cctx.Int("max-deals"))
+
+			var msgs []*types.Message
+			for _, deals := range dealChucks {
+				dealParams := bitfield.NewFromSet(deals)
+				params, err := actors.SerializeParams(&dealParams)
+				if err != nil {
+					return err
+				}
+				msg := &types.Message{
+					To:     marketactor.Address,
+					From:   fromAddr,
+					Value:  types.NewInt(0),
+					Method: marketactor.Methods.SettleDealPaymentsExported,
+					Params: params,
+				}
+				msgs = append(msgs, msg)
 			}
 
-			smsg, err := api.MpoolPushMessage(ctx, &types.Message{
-				To:     marketactor.Address,
-				From:   mi.Owner,
-				Value:  types.NewInt(0),
-				Method: marketactor.Methods.SettleDealPaymentsExported,
-				Params: params,
-			}, nil)
-			if err != nil {
+			// MpoolBatchPushMessage method will take care of gas estimation and funds check
+			smsgs, err := api.MpoolBatchPushMessage(ctx, msgs, nil)
+			if smsgs == nil && err != nil {
 				return err
 			}
 
-			res := smsg.Cid()
-
-			fmt.Printf("Requested deal settlement in message %s\nwaiting for it to be included in a block..\n", res)
-
-			// wait for it to get mined into a block
-			wait, err := api.StateWaitMsg(ctx, res, uint64(cctx.Int("confidence")), lapi.LookbackNoLimit, true)
-			if err != nil {
-				return xerrors.Errorf("Timeout waiting for deal settlement message %s", res)
+			if cctx.Bool("skip-wait-msg") {
+				fmt.Printf("skip the check status, please pay attention to the message status on the chain by yourself.\n")
+				return nil
 			}
 
-			if wait.Receipt.ExitCode.IsError() {
-				return xerrors.Errorf("Failed to execute withdrawal message %s: %w", wait.Message, wait.Receipt.ExitCode.Error())
-			}
+			// wait for msgs to get mined into a block
+			eg := errgroup.Group{}
+			eg.SetLimit(10)
+			for _, smsg := range smsgs {
+				res := smsg.Cid()
+				fmt.Printf("Requested deal settlement in message: %s\nwaiting for it to be included in a block..\n", res)
+				eg.Go(func() error {
+					// wait for it to get mined into a block
+					wait, err := api.StateWaitMsg(ctx, res, uint64(cctx.Int("confidence")), lapi.LookbackNoLimit, true)
+					if err != nil {
+						return xerrors.Errorf("Timeout waiting for deal settlement message %s", res)
+					}
 
-			var settlementReturn markettypes14.SettleDealPaymentsReturn
-			if err = settlementReturn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil {
-				return err
-			}
+					if wait.Receipt.ExitCode.IsError() {
+						return xerrors.Errorf("Failed to execute withdrawal message %s: %w", wait.Message, wait.Receipt.ExitCode.Error())
+					}
 
-			fmt.Printf("Settled %d out of %d deals\n", settlementReturn.Results.SuccessCount, len(dealIDs))
+					var settlementReturn markettypes14.SettleDealPaymentsReturn
+					if err = settlementReturn.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return)); err != nil {
+						return err
+					}
 
-			var (
-				totalPayment        = big.Zero()
-				totalCompletedDeals = 0
-			)
+					var (
+						totalPayment        = big.Zero()
+						totalCompletedDeals = 0
+					)
 
-			for _, s := range settlementReturn.Settlements {
-				totalPayment = big.Add(totalPayment, s.Payment)
-				if s.Completed {
-					totalCompletedDeals++
-				}
-			}
+					for _, s := range settlementReturn.Settlements {
+						totalPayment = big.Add(totalPayment, s.Payment)
+						if s.Completed {
+							totalCompletedDeals++
+						}
+					}
 
-			fmt.Printf("Total payment: %s\n", types.FIL(totalPayment))
-			fmt.Printf("Total number of deals finished their lifetime: %d\n", totalCompletedDeals)
-			return nil
+					fmt.Printf("Message CID: %s\nSettled %d out of %d deals\nTotal payment: %s\nTotal number of deals finished their lifetime: %d\n",
+						res, settlementReturn.Results.SuccessCount, len(dealIDs), types.FIL(totalPayment), totalCompletedDeals)
+					return nil
+				})
+			}
+			return eg.Wait()
 		},
 	}
 }

cli/state.go

@@ -1556,7 +1556,7 @@ var StateSectorCmd = &cli.Command{
 
 		// Deals were moved into market actor's ProviderSectors in NV22 / Actors v13
 		if nv >= network.Version22 {
-			marketDealIDs, err := getMarketDealIDs(ctx, api, maddr, abi.SectorNumber(sid), ts.Key())
+			marketDealIDs, err := GetMarketDealIDs(ctx, api, maddr, abi.SectorNumber(sid), ts.Key())
 			if err != nil {
 				fmt.Printf("DealIDs (market): error retrieving from market actor: %v\n", err)
 			} else if len(marketDealIDs) > 0 {
@@ -1769,8 +1769,8 @@ var StateSysActorCIDsCmd = &cli.Command{
 	},
 }
 
-// getMarketDealIDs retrieves deal IDs for a sector from the market actor's ProviderSectors HAMT
-func getMarketDealIDs(ctx context.Context, api v0api.FullNode, maddr address.Address, sid abi.SectorNumber, tsKey types.TipSetKey) ([]abi.DealID, error) {
+// GetMarketDealIDs retrieves deal IDs for a sector from the market actor's ProviderSectors HAMT
+func GetMarketDealIDs(ctx context.Context, api v0api.FullNode, maddr address.Address, sid abi.SectorNumber, tsKey types.TipSetKey) ([]abi.DealID, error) {
 	// Convert miner address to actor ID
 	actorID, err := getMinerActorID(ctx, api, maddr, tsKey)
 	if err != nil {