Skip to content

Commit d26b07a

Browse files
knstPastaPastaPasta
knst
authored and
PastaPastaPasta
committed
feat: burry DIP0001 deployment to follow-up bitcoin#16060 
1 parent 6ad9bdf commit d26b07a

File tree

5 files changed

+4
-49
lines changed

5 files changed

+4
-49
lines changed

‎src/chainparams.cpp‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class CMainParams : public CChainParams {
157157
consensus.BIP65Height = 619382; // 00000000000076d8fcea02ec0963de4abfd01e771fec0863f960c2c64fe6f357
158158
consensus.BIP66Height = 245817; // 00000000000b1fa2dfa312863570e13fae9ca7b5566cb27e55422620b469aefa
159159
consensus.CSVHeight = 622944; // 00000000000002e3d3a6224cfce80bae367fd3283d1e5a8ba50e5e60b2d2905d
160-
consensus.DIP0001Height = 782208;
160+
consensus.DIP0001Height = 782208; // 000000000000000cbc9cb551e8ee1ac7aa223585cbdfb755d3683bafd93679e4
161161
consensus.DIP0003Height = 1028160;
162162
consensus.DIP0003EnforcementHeight = 1047200;
163163
consensus.DIP0003EnforcementHash = uint256S("000000000000002d1734087b4c5afc3133e4e1c3e1a89218f62bcd9bb3d17f81");
@@ -177,13 +177,6 @@ class CMainParams : public CChainParams {
177177
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
178178
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
179179

180-
// Deployment of DIP0001
181-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
182-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1508025600; // Oct 15th, 2017
183-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 1539561600; // Oct 15th, 2018
184-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 4032;
185-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 3226; // 80% of 4032
186-
187180
// Deployment of BIP147
188181
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
189182
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1524477600; // Apr 23th, 2018
@@ -401,7 +394,7 @@ class CTestNetParams : public CChainParams {
401394
consensus.BIP65Height = 2431; // 0000039cf01242c7f921dcb4806a5994bc003b48c1973ae0c89b67809c2bb2ab
402395
consensus.BIP66Height = 2075; // 0000002acdd29a14583540cb72e1c5cc83783560e38fa7081495d474fe1671f7
403396
consensus.CSVHeight = 8064; // 00000005eb94d027e34649373669191188858a22c70f4a6d29105e559124cec7
404-
consensus.DIP0001Height = 5500;
397+
consensus.DIP0001Height = 5500; // 00000001d60a01d8f1f39011cc6b26e3a1c97a24238cab856c2da71a4dd801a9
405398
consensus.DIP0003Height = 7000;
406399
consensus.DIP0003EnforcementHeight = 7300;
407400
consensus.DIP0003EnforcementHash = uint256S("00000055ebc0e974ba3a3fb785c5ad4365a39637d4df168169ee80d313612f8f");
@@ -421,13 +414,6 @@ class CTestNetParams : public CChainParams {
421414
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
422415
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
423416

424-
// Deployment of DIP0001
425-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
426-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1544655600; // Dec 13th, 2018
427-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
428-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 100;
429-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 50; // 50% of 100
430-
431417
// Deployment of BIP147
432418
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
433419
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1544655600; // Dec 13th, 2018
@@ -638,13 +624,6 @@ class CDevNetParams : public CChainParams {
638624
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
639625
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
640626

641-
// Deployment of DIP0001
642-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
643-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1505692800; // Sep 18th, 2017
644-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
645-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 100;
646-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 50; // 50% of 100
647-
648627
// Deployment of BIP147
649628
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
650629
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1517792400; // Feb 5th, 2018
@@ -925,9 +904,6 @@ class CRegTestParams : public CChainParams {
925904
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
926905
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0;
927906
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 999999999999ULL;
928-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
929-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 0;
930-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
931907
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
932908
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 0;
933909
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nTimeout = 999999999999ULL;

‎src/consensus/params.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace Consensus {
1515

1616
enum DeploymentPos {
1717
DEPLOYMENT_TESTDUMMY,
18-
DEPLOYMENT_DIP0001, // Deployment of DIP0001 and lower transaction fees.
1918
DEPLOYMENT_BIP147, // Deployment of BIP147 (NULLDUMMY)
2019
DEPLOYMENT_DIP0003, // Deployment of DIP0002 and DIP0003 (txv3 and deterministic MN lists)
2120
DEPLOYMENT_DIP0008, // Deployment of ChainLock enforcement

‎src/rpc/blockchain.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,6 +1578,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
15781578
BuriedForkDescPushBack(softforks,"bip66", consensusParams.BIP66Height);
15791579
BuriedForkDescPushBack(softforks,"bip65", consensusParams.BIP65Height);
15801580
BuriedForkDescPushBack(softforks, "csv", consensusParams.CSVHeight);
1581+
BuriedForkDescPushBack(softforks, "dip0001", consensusParams.DIP0001Height);
15811582
for (int pos = Consensus::DEPLOYMENT_TESTDUMMY + 1; pos != Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++pos) {
15821583
BIP9SoftForkDescPushBack(softforks, VersionBitsDeploymentInfo[pos].name, consensusParams, static_cast<Consensus::DeploymentPos>(pos));
15831584
}

‎src/versionbitsinfo.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_B
1212
/*.gbt_force =*/ true,
1313
/*.check_mn_protocol =*/ false,
1414
},
15-
{
16-
/*.name =*/ "dip0001",
17-
/*.gbt_force =*/ true,
18-
/*.check_mn_protocol =*/ true,
19-
},
2015
{
2116
/*.name =*/ "bip147",
2217
/*.gbt_force =*/ true,

‎test/functional/rpc_blockchain.py‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,7 @@ def _test_getblockchaininfo(self):
151151
'bip66': {'type': 'buried', 'active': False, 'height': 1251},
152152
'bip65': {'type': 'buried', 'active': False, 'height': 1351},
153153
'csv': {'type': 'buried', 'active': False, 'height': 432},
154-
'dip0001': {
155-
'type': 'bip9',
156-
'bip9': {
157-
'status': 'started',
158-
'bit': 1,
159-
'start_time': 0,
160-
'timeout': 999999999999,
161-
'since': 144,
162-
'statistics': {
163-
'period': 144,
164-
'threshold': 108,
165-
'elapsed': 57,
166-
'count': 57,
167-
'possible': True
168-
},
169-
},
170-
'active': False},
154+
'dip0001': { 'type': 'buried', 'active': False, 'height': 2000},
171155
'bip147': {
172156
'type': 'bip9',
173157
'bip9': {

0 commit comments

Comments
 (0)