Skip to content

Commit bf84e37

Browse files
authored
fix: Testnet syncing mn_rr (#5608)
## Issue being fixed or feature implemented Since `mn_rr` is already active on Testnet, because of #5588, syncing from develop is broken. ## What was done? Temporary disabled changes of #5588 for Testnet. This should be dropped when Testnet will be re-organised for Platform. ## How Has This Been Tested? Syncing Testnet ## Breaking Changes ## Checklist: - [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)_
1 parent 30f3f50 commit bf84e37

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/validation.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1167,6 +1167,8 @@ CAmount GetBlockSubsidyInner(int nPrevBits, int nPrevHeight, const Consensus::Pa
11671167
// Hard fork to reduce the block reward by 10 extra percent (allowing budget/superblocks)
11681168
if (nPrevHeight > consensusParams.nBudgetPaymentsStartBlock) {
11691169
// Once MNRewardReallocated is active, the treasury is 20% instead of 10%
1170+
// TODO remove this when we re-organize testnet
1171+
if (Params().NetworkIDString() == CBaseChainParams::TESTNET) fMNRewardReallocated = false;
11701172
nSuperblockPart = nSubsidy / (fMNRewardReallocated ? 5 : 10);
11711173
}
11721174
return fSuperblockPartOnly ? nSuperblockPart : nSubsidy - nSuperblockPart;
@@ -1210,6 +1212,8 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue, int nReallocActiva
12101212
return ret;
12111213
}
12121214

1215+
// TODO remove this when we re-organize testnet
1216+
if (Params().NetworkIDString() == CBaseChainParams::TESTNET) fMNRewardReallocated = false;
12131217
if (fMNRewardReallocated) {
12141218
// Once MNRewardReallocated activates, block reward is 80% of block subsidy (+ tx fees) since treasury is 20%
12151219
// Since the MN reward needs to be equal to 60% of the block subsidy (according to the proposal), MN reward is set to 75% of the block reward.

0 commit comments

Comments
 (0)