chore: backport #13189 to the release/v1.33.1 branch #13238
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ettle-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 <orjan.roren@gmail.com> Co-authored-by: qians <qiangezaici@outlook.com>
There was a problem hiding this comment.
Pull Request Overview
This PR backports PR #13189 to the release/v1.33.1 branch, which fixes the batch logic of lotus-miner actor settle-deal command. The key improvement is correctly handling large numbers of deals by implementing proper batching and replacing the data source for deal IDs.
- Updated version from 1.33.1-dev to 1.33.1-rc1 across all components
- Fixed batch logic in settle-deal command by processing sectors individually and batching messages
- Added new command-line options for better control over deal settlement operations
Reviewed Changes
Copilot reviewed 18 out of 19 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| cli/spcli/actor.go | Enhanced settle-deal command with batching logic, new CLI flags, and improved error handling |
| cli/state.go | Made GetMarketDealIDs function public for reuse in settle-deal implementation |
| cli/miner/actor.go | Updated actor getter reference for settle-deal command |
| build/version.go | Updated version strings from 1.33.1-dev to 1.33.1-rc1 |
| go.mod | Updated dependency versions for go-f3, boxo, and other packages |
| documentation/en/cli-*.md | Updated version strings and added new CLI options documentation |
| CHANGELOG.md | Added comprehensive release notes for v1.33.1-rc1 |
| .github/workflows/release.yml | Added curl update step for macOS builds |
|
Resolved the comments from Copilot here, since it is a backport. |
Kubuxu
approved these changes
Jul 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Backport #13189 to the release/v1.33.1 branch, which is a fix to correctly handle the batch logic of
lotus-miner actor settle-dealChecklist
Before you mark the PR ready for review, please make sure that: