feat(miner): remove batch balancer-related functionality#12919
feat(miner): remove batch balancer-related functionality#12919rvagg merged 1 commit intofilecoin-project:masterfrom
Conversation
|
@tediou5 : no pressure, but is this ready for review? If so, lets move it out of draft to make it clear. Thanks. |
|
@tediou5 : thanks for working on this. We wanted to make sure you saw #12902 (comment) |
@BigLep Got it, let me check the part of aggregation. |
|
@BigLep Yes, I think it's ready for review now. I'd like to get some feedback as well since I'm not very familiar with this part of the code, and I'm a bit worried I might have missed something. |
e01b8bf to
6426700
Compare
|
Please run Also, this appears to now be submitting batches that are too large (See the failing tests):
I think this is the max batch size for precommit? |
fd62830 to
792fc55
Compare
|
Sorry for the delay in bringing up this important point: I think we're going to have to retain all of this functionality but gate it behind a network version check, at least until the feature is live (nv25?), then we can remove it. The problem is that if we roll out a version of lotus-miner with all of this removed, we're either going to throw users to the wolves of not having this functionality in place during a period where there is the batch balancer in operation (nv24), or advise them to upgrade just after the upgrade that activates FIP-0100. So instead, we should:
e.g.
^ we should go through and remove all of these too, in a separate PR |
|
@tediou5 : do you think you'll be able to make the updates so we can get this merged by the end of the week (2025-03-14) so an RC can be cut at the beginning of next week (2025-03-17)? |
792fc55 to
2c3a301
Compare
|
@Stebalien @rvagg @BigLep Restored the previous logic and now execute it conditionally based on the network version. |
2c3a301 to
b0ee00a
Compare
tediou5
left a comment
There was a problem hiding this comment.
Thank you for your review.
|
@tediou5 : I'm trying to follow where this is at. Has all feedback been incorporated except for where you have questions? |
Stebalien
left a comment
There was a problem hiding this comment.
LGTM. We're going to need to do this the right way without hard-coded constants, but this PR has the MVP for the upgrade.
354dfee to
aa9972c
Compare
Yes, I agree. I prefer to estimate gas so that messages are only constrained by MaxBlockGasLimit rather than a fixed constant. But I think I'll submit this in a separate PR. |
Related Issues
close #12902
Proposed Changes
Removed BatchPreCommitAboveBaseFee, AggregateAboveBaseFee, and the related checks.
The MinCommitBatch is actually constrained by the SNARK circuits, so it will remain at 4 without change:
You need 4 or more sectors to ensure that the verification time for aggregated proofs is smaller than for batched proofs.
You need 13 sectors or more to ensure that the aggregated proof size is smaller than the batched proof size.
The MaxCommitBatch limit comes from the original (FIP-0013), and it seems there's not much incentive to modify it, so these two parameters will remain unchanged.
Additional Info
Checklist
Before you mark the PR ready for review, please make sure that: