fix: adjust GetPaymentsLimit to work correctly with historical blocks, adjust sb params on regtest, tweak tests #5641
Conversation
This file contains 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
UdjinM6
force-pushed
the
fix_v20_GetPaymentsLimit_past
branch
from
6fb102b to
ae33635
Compare
UdjinM6
force-pushed
the
fix_v20_GetPaymentsLimit_past
branch
from
ae33635 to
efce411
Compare
|
rebased on develop and added efce411 |
PastaPastaPasta
approved these changes
Oct 30, 2023
| @@ -494,14 +494,16 @@ CAmount CSuperblock::GetPaymentsLimit(int nBlockHeight) | |||
| return 0; | |||
| } | |||
|
|
|||
| const CBlockIndex* tipIndex = ::ChainActive().Tip(); | |||
| const auto v20_state = llmq::utils::GetV20State(tipIndex); | |||
| const CBlockIndex* pindex = ::ChainActive().Tip(); | |||
There was a problem hiding this comment.
nit: could make this gsl::not_null
Comment on lines
+145
to
+147
| self.p0_hash = self.nodes[0].gobject("submit", "0", 1, proposal_time, p0_collateral_prepare["hex"], p0_collateral_prepare["collateralHash"]) | ||
| self.p1_hash = self.nodes[0].gobject("submit", "0", 1, proposal_time, p1_collateral_prepare["hex"], p1_collateral_prepare["collateralHash"]) | ||
| self.p2_hash = self.nodes[0].gobject("submit", "0", 1, proposal_time, p2_collateral_prepare["hex"], p2_collateral_prepare["collateralHash"]) |
There was a problem hiding this comment.
nit: would have been nice if these "self." only changes were in their own commit for easier review
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.
Issue being fixed or feature implemented
Noticed a couple of things while I was trying to figure out if an issue @knst mentioned in #5627 could actually exist:
GetPaymentsLimit()won't work correctly with historical blocks rn. We don't use it that way internally but it could be done via rpc and it should provide correct results.feature_governance.pydoesn't test v20 switching states. There's also no "sb on v20 activation block" test.NOTE: based on #5639 atmWhat was done?
fix it, pls see individual commits
How Has This Been Tested?
run tests
Breaking Changes
n/a
Checklist: