Skip to content

Implement Block Reward Reallocation#3691

Merged
UdjinM6 merged 11 commits into
dashpay:developfrom
UdjinM6:realloc
Sep 10, 2020
Merged

Implement Block Reward Reallocation#3691
UdjinM6 merged 11 commits into
dashpay:developfrom
UdjinM6:realloc

Conversation

@UdjinM6

@UdjinM6 UdjinM6 commented Sep 8, 2020

Copy link
Copy Markdown

No description provided.

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

couple of changes

Comment thread src/chainparams.cpp Outdated
Comment on lines +347 to +348
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1598918400; // Sep 1st, 2020
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 1630454400; // Sep 1st, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Change this to October 1st?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

This date doesn't have to be in the future really, just smth close to the release, but ok.

Comment thread src/masternode/masternode-payments.cpp Outdated

CAmount masternodeReward = GetMasternodePayment(nBlockHeight, blockReward, nReallocActivationHeight);

uint256 proTxHash;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What's the point of this?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

🙈

Comment thread test/functional/feature_block_reward_reallocation.py
@xdustinface

Copy link
Copy Markdown

Can we add af80d75 + cb0c76f to refactor the calculations.

And the new test file isn't executable 9e73970

@xdustinface xdustinface left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Looks good, nice tests, they seem to test what they should and they pass, (ut)ACK

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK, seems to work as expected. Mainnet syncs

@UdjinM6
UdjinM6 merged commit d838ec0 into dashpay:develop Sep 10, 2020
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Sep 12, 2020
* Implement Block Reward Reallocation

* Add integr. test

* drop unused variable

* Sep -> Oct

* Update test/functional/feature_block_reward_reallocation.py

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

* Revert to Sep for testnet and devnet

* validation: Refactor reallocation calculations

Makes it much more readable imo and avoids calculating the percentage
each time.

* test: Align reallocation calculation with c++ (GetMasternodePayment)

* test: Make feature_block_reward_allocation.py executable

* Make linter happy

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Co-authored-by: xdustinface <xdustinfacex@gmail.com>
@UdjinM6
UdjinM6 deleted the realloc branch November 26, 2020 13:28
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Mar 11, 2022
* Implement Block Reward Reallocation

* Add integr. test

* drop unused variable

* Sep -> Oct

* Update test/functional/feature_block_reward_reallocation.py

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

* Revert to Sep for testnet and devnet

* validation: Refactor reallocation calculations

Makes it much more readable imo and avoids calculating the percentage
each time.

* test: Align reallocation calculation with c++ (GetMasternodePayment)

* test: Make feature_block_reward_allocation.py executable

* Make linter happy

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Co-authored-by: xdustinface <xdustinfacex@gmail.com>
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