Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Block reward reallocation activation at v20 #5639

Merged

Conversation

ogabrielides
Copy link
Collaborator

@ogabrielides ogabrielides commented Oct 23, 2023

Issue being fixed or feature implemented

Implementation of accepted proposal: https://www.dashcentral.org/p/expedite-60-20-20-reallocation

What was done?

Activates changers brought in #5588 on v20 hard fork instead of mn_rr.

How Has This Been Tested?

run tests

Breaking Changes

Again, Testnet sync is broken

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@ogabrielides ogabrielides marked this pull request as draft October 23, 2023 10:13
@ogabrielides ogabrielides added this to the 20 milestone Oct 23, 2023
src/validation.cpp Outdated Show resolved Hide resolved
src/validation.cpp Outdated Show resolved Hide resolved
@ogabrielides ogabrielides marked this pull request as ready for review October 23, 2023 13:43
@UdjinM6
Copy link

UdjinM6 commented Oct 23, 2023

pls see 5231097

@ogabrielides ogabrielides force-pushed the expedite_60_20_20_reallocation branch from a46cc8d to 5383e97 Compare October 23, 2023 15:57
@ogabrielides
Copy link
Collaborator Author

@UdjinM6 @PastaPastaPasta Done. Please review again

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for squash merge

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

light ACK, syncs on testnet

@PastaPastaPasta
Copy link
Member

syncs for me; CI looks pretty happy

@PastaPastaPasta PastaPastaPasta merged commit f2cfb88 into dashpay:develop Oct 23, 2023
4 of 7 checks passed
@ogabrielides ogabrielides deleted the expedite_60_20_20_reallocation branch October 24, 2023 08:16
UdjinM6 added a commit that referenced this pull request Oct 30, 2023
…, adjust sb params on regtest, tweak tests (#5641)

## Issue being fixed or feature implemented
Noticed a couple of things while I was trying to figure out if an
[issue](#5627 (comment))
@knst mentioned in #5627 could actually exist:
1. `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.
2. superblock params on regtest are too small to test them properly
3. because of (2) and a huge v20 activation window (comparing to sb
params) `feature_governance.py` doesn't test v20 switching states.
There's also no "sb on v20 activation block" test.

~NOTE: based on #5639 atm~

## What was done?
fix it, pls see individual commits

## How Has This Been Tested?
run tests

## Breaking Changes
n/a

## Checklist:
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants