Skip to content

test: reduce BRRHeight in regtest#6176

Merged
PastaPastaPasta merged 1 commit into
dashpay:developfrom
ogabrielides:enforce_v20_block_reward_rules
Aug 7, 2024
Merged

test: reduce BRRHeight in regtest#6176
PastaPastaPasta merged 1 commit into
dashpay:developfrom
ogabrielides:enforce_v20_block_reward_rules

Conversation

@ogabrielides
Copy link
Copy Markdown

@ogabrielides ogabrielides commented Aug 5, 2024

Issue being fixed or feature implemented

In regtest, Block Reward Reallocation is buried at height 2500, which happens after v20 activation.

What was done?

Reduced BRRHeight in regtest from 2500 to 1000.
The purpose of this change is to simplify regtests of Platform as well.
Note: This change affects only regtest.

How Has This Been Tested?

tests

Breaking Changes

no, this only affects Regtest (where we make no guarantees about breaking stuff)

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)

knst
knst previously approved these changes Aug 5, 2024
Copy link
Copy Markdown
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

LGTM b872842

@PastaPastaPasta
Copy link
Copy Markdown
Member

doing:

./src/qt/dash-qt --testnet --reindex --assumevalid=0

UdjinM6
UdjinM6 previously requested changes Aug 6, 2024
Comment thread src/test/block_reward_reallocation_tests.cpp Outdated
Comment thread src/chainparams.cpp Outdated
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Suggested change
consensus.BRRHeight = 1000; // see block_reward_reallocation_tests
consensus.BRRHeight = 900; // see block_reward_reallocation_tests

Values lower than 900 I would not set because it would be less than DIP0024 and V19. But I see no issues with (not tested by me)

@ogabrielides ogabrielides changed the title test: enforce v20 block reward allocation test: reduce BRRHeight in regtest Aug 7, 2024
Copy link
Copy Markdown
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

utACK dd64749167c7524ac13493bab46a58281e7bd9b7

Copy link
Copy Markdown
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 38ecd6f

@PastaPastaPasta PastaPastaPasta merged commit 5c3f104 into dashpay:develop Aug 7, 2024
@ogabrielides ogabrielides deleted the enforce_v20_block_reward_rules branch August 7, 2024 04:31
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Aug 7, 2024
38ecd6f test: reduce BRRHeight on regtest (Odysseas Gabrielides)

Pull request description:

  ## Issue being fixed or feature implemented
  In regtest, Block Reward Reallocation is buried at height 2500, which happens after v20 activation.

  ## What was done?
  Reduced BRRHeight in regtest from 2500 to 1000.
  The purpose of this change is to simplify regtests of Platform as well.
  Note: This change affects only regtest.

  ## How Has This Been Tested?
  tests

  ## Breaking Changes
  no, this only affects Regtest (where we make no guarantees about breaking stuff)

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [x] 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)_

Top commit has no ACKs.

Tree-SHA512: b5a1c2b2c2b70682f266d9d0af9e048a03417c0cb2480eb5ab5838965342b6465acd10d8dac5a0d3c5c5f59f4e36ac5b909a838bc3805c2265a83776e92b4827
PastaPastaPasta added a commit that referenced this pull request Aug 7, 2024
8e9dd12 chore: bump version in configure.ac (pasta)
afb8dc0 docs: add v21.1.0 release notes and archive v21.0.2 (pasta)
269dd02 Merge #6179: chore: update manpages v21.1 (pasta)
a8cb643 Merge #6175: feat: allow resigning for EHF (pasta)
de5cc22 Merge #6178: chore: bump protocol version to 70233 (pasta)
2de4ce5 Merge #6176: test: reduce BRRHeight in regtest (pasta)
840175e Merge #6174: fix: stop trying to sign pending txes when they are no longer non-locked (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  Backports for v21.1.0, add release notes and

  ## What was done?
  See commits

  ## How Has This Been Tested?
  Been on devnet

  ## Breaking Changes
  None

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [x] 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
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK  8e9dd12

Tree-SHA512: 3c968c4f0e06bc88f63bf10f742d39595c45c7fcd4aef1891d2e76d9f443cae1ddd3cb84c787faa189ef3a189a9dd63a7f75e69f5787a47d1281d5b6a445a2a6
PastaPastaPasta added a commit that referenced this pull request Aug 9, 2024
8e9dd12 chore: bump version in configure.ac (pasta)
afb8dc0 docs: add v21.1.0 release notes and archive v21.0.2 (pasta)
269dd02 Merge #6179: chore: update manpages v21.1 (pasta)
a8cb643 Merge #6175: feat: allow resigning for EHF (pasta)
de5cc22 Merge #6178: chore: bump protocol version to 70233 (pasta)
2de4ce5 Merge #6176: test: reduce BRRHeight in regtest (pasta)
840175e Merge #6174: fix: stop trying to sign pending txes when they are no longer non-locked (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## 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)_

ACKs for top commit:
  PastaPastaPasta:
    utACK 058ff45
  kwvg:
    utACK 058ff45

Tree-SHA512: b619f9754258cece012f817a523f5849128e044ffbe17a28e12f1e8424d11f6a4c8d011a554fce0b106e1d6efee2aa306befdc034b8e47be077ad28c7f39c975
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.

4 participants