Skip to content

Commit 3cd94ef

Browse files
knstknst
committed
Revert "brr (block reward reallocation) bury"
This reverts commit 8bab974.
1 parent 8bab974 commit 3cd94ef

File tree

5 files changed

+41
-3
lines changed

5 files changed

+41
-3
lines changed

‎src/chainparams.cpp‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,15 @@ class CMainParams : public CChainParams {
191191
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 4032;
192192
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 3226; // 80% of 4032
193193

194+
// Deployment of Block Reward Reallocation
195+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
196+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1601510400; // Oct 1st, 2020
197+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 1633046400; // Oct 1st, 2021
198+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nWindowSize = 4032;
199+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdStart = 3226; // 80% of 4032
200+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdMin = 2420; // 60% of 4032
201+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5; // this corresponds to 10 periods
202+
194203
// Deployment of DIP0020, DIP0021 and LLMQ_100_67 quorums
195204
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].bit = 6;
196205
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].nStartTime = 1625097600; // July 1st, 2021
@@ -402,6 +411,15 @@ class CTestNetParams : public CChainParams {
402411
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
403412
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 50; // 50% of 100
404413

414+
// Deployment of Block Reward Reallocation
415+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
416+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1598918400; // Sep 1st, 2020
417+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 999999999999ULL;
418+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nWindowSize = 100;
419+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdStart = 80; // 80% of 100
420+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdMin = 60; // 60% of 100
421+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5; // this corresponds to 10 periods
422+
405423
// Deployment of DIP0020, DIP0021 and LLMQ_100_67 quorums
406424
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].bit = 6;
407425
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].nStartTime = 1606780800; // December 1st, 2020
@@ -558,7 +576,7 @@ class CDevNetParams : public CChainParams {
558576
consensus.DIP0003EnforcementHeight = 2; // DIP0003 activated immediately on devnet
559577
consensus.DIP0003EnforcementHash = uint256();
560578
consensus.DIP0008Height = 2; // DIP0008 activated immediately on devnet
561-
consensus.BRRHeight = 300; // Block Reward Reallocation
579+
consensus.BRRHeight = 300;
562580
consensus.MinBIP9WarningHeight = 2018; // dip8 activation height + miner confirmation window
563581
consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1
564582
consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day
@@ -587,6 +605,15 @@ class CDevNetParams : public CChainParams {
587605
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
588606
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 50; // 50% of 100
589607

608+
// Deployment of Block Reward Reallocation
609+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
610+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1598918400; // Sep 1st, 2020
611+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 999999999999ULL;
612+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nWindowSize = 100;
613+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdStart = 80; // 80% of 100
614+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdMin = 60; // 60% of 100
615+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5; // this corresponds to 10 periods
616+
590617
// Deployment of DIP0020, DIP0021 and LLMQ_100_67 quorums
591618
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].bit = 6;
592619
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].nStartTime = 1604188800; // November 1st, 2020
@@ -835,6 +862,13 @@ class CRegTestParams : public CChainParams {
835862
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
836863
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 0;
837864
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 999999999999ULL;
865+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
866+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 0;
867+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 999999999999ULL;
868+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nWindowSize = 500;
869+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdStart = 400; // 80%
870+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nThresholdMin = 300; // 60%
871+
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5;
838872
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].bit = 6;
839873
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].nStartTime = 0;
840874
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0020].nTimeout = 999999999999ULL;

‎src/consensus/params.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ enum DeploymentPos {
1717
DEPLOYMENT_TESTDUMMY,
1818
DEPLOYMENT_BIP147, // Deployment of BIP147 (NULLDUMMY)
1919
DEPLOYMENT_DIP0003, // Deployment of DIP0002 and DIP0003 (txv3 and deterministic MN lists)
20+
DEPLOYMENT_REALLOC, // Deployment of Block Reward Reallocation
2021
DEPLOYMENT_DIP0020, // Deployment of DIP0020, DIP0021 and LMQ_100_67 quorums
2122
DEPLOYMENT_DIP0024, // Deployment of DIP0024 (Quorum Rotation) and decreased governance proposal fee
2223
DEPLOYMENT_V19, // Deployment of Basic BLS, AssetLocks, EHF

‎src/rpc/blockchain.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,6 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
15851585
BuriedForkDescPushBack(softforks, "csv", consensusParams.CSVHeight);
15861586
BuriedForkDescPushBack(softforks, "dip0001", consensusParams.DIP0001Height);
15871587
BuriedForkDescPushBack(softforks, "dip0008", consensusParams.DIP0008Height);
1588-
BuriedForkDescPushBack(softforks, "realloc", consensusParams.BRRHeight);
15891588
for (int pos = Consensus::DEPLOYMENT_TESTDUMMY + 1; pos != Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++pos) {
15901589
BIP9SoftForkDescPushBack(softforks, VersionBitsDeploymentInfo[pos].name, consensusParams, static_cast<Consensus::DeploymentPos>(pos));
15911590
}

‎src/versionbitsinfo.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_B
2222
/*.gbt_force =*/ true,
2323
/*.check_mn_protocol =*/ false,
2424
},
25+
{
26+
/*.name =*/ "realloc",
27+
/*.gbt_force =*/ true,
28+
/*.check_mn_protocol =*/ false,
29+
},
2530
{
2631
/*.name =*/ "dip0020",
2732
/*.gbt_force =*/ true,

‎test/functional/rpc_blockchain.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ def _test_getblockchaininfo(self):
153153
'csv': {'type': 'buried', 'active': False, 'height': 432},
154154
'dip0001': { 'type': 'buried', 'active': False, 'height': 2000},
155155
'dip0008': { 'type': 'buried', 'active': False, 'height': 432},
156-
'realloc': { 'type': 'buried', 'active': False, 'height': 2500},
157156
'bip147': {
158157
'type': 'bip9',
159158
'bip9': {

0 commit comments

Comments
 (0)