Skip to content

Commit

Permalink
Commit forked testnet, CSV + SegWit Active
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahmedbodi
ahmedbodi committed Feb 1, 2017
1 parent a1512ff commit ac0fcc5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 23 deletions.
40 changes: 20 additions & 20 deletions src/chainparams.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ class CMainParams : public CChainParams {
consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 9999999999; //1199145601; // January 1, 2008
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 9999999999; //1230767999; // December 31, 2008

// Deployment of BIP68, BIP112, and BIP113.
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 9999999999; //1462060800; // May 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 9999999999; //1493596800; // May 1st, 2017

// Deployment of SegWit (BIP141, BIP143, and BIP147)
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1479168000; // November 15th, 2016.
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 9999999999; //1479168000; // November 15th, 2016.
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 9999999999; //1510704000; // November 15th, 2017.

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90");
Expand Down Expand Up @@ -173,10 +173,10 @@ class CTestNetParams : public CChainParams {
CTestNetParams() {
strNetworkID = "test";
consensus.nSubsidyHalvingInterval = 840000;
consensus.BIP34Height = 690000;
consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8");
consensus.BIP65Height = 690000; // 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
consensus.BIP66Height = 690000; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
consensus.BIP34Height = 3010;
consensus.BIP34Hash = uint256S("0xd7f645a13a7b4ba9bb1c9578e0e3fdf6b2f8556e10344aeb3793db3464ced146");
consensus.BIP65Height = 3050; // 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
consensus.BIP66Height = 3015; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
consensus.powLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.nPowTargetTimespan = 3.5 * 24 * 60 * 60; // two weeks
consensus.nPowTargetSpacing = 2.5 * 60;
Expand All @@ -187,22 +187,22 @@ class CTestNetParams : public CChainParams {
consensus.nKGWInterval = 12;
consensus.fRbfEnabled = false;
consensus.fPowNoRetargeting = false;
consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
consensus.nRuleChangeActivationThreshold = 95; // 95% of 2016
consensus.nMinerConfirmationWindow = 100; // nPowTargetTimespan / nPowTargetSpacing

consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
//consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
//consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1485477408; //1199145601; // January 1, 2008
//consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 150000000; //1230767999; // December 31, 2008

// Deployment of BIP68, BIP112, and BIP113.
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1485477408; //1462060800; // May 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1485806295; //1493596800; // May 1st, 2017

// Deployment of SegWit (BIP141, BIP143, and BIP147)
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1485806296; //1479168000; // November 15th, 2016.
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1500000000; //1510704000; // November 15th, 2017.

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6");
Expand All @@ -225,7 +225,7 @@ class CTestNetParams : public CChainParams {
vSeeds.push_back(CDNSSeedData("fr1.vtconline.org", "fr1.vtconline.org", false));


base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,73);
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,74);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);
base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
Expand Down
3 changes: 2 additions & 1 deletion src/pow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
int nHeight = pindexLast->nHeight + 1;
if (Params().NetworkIDString() == CBaseChainParams::TESTNET)
{
LogPrintf("Running On Testnet \n");
if (nHeight < 2116) {
return GetNextWorkRequired_Bitcoin(pindexLast, pblock, params);
}
Expand All @@ -40,12 +39,14 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
LogPrintf("Getting diff at %i. Diff = 0\n", pindexLast->nHeight+1);
return 0x1e0ffff0;
}

// testnet to 12 block difficulty adjustment interval
if ((pindexLast->nHeight+1) % params.nKGWInterval != 0)
{
CBigNum bnNew;
bnNew.SetCompact(pindexLast->nBits);
if (bnNew > bnProofOfWorkLimit) { bnNew = bnProofOfWorkLimit; }
LogPrintf("Testnet Difficulty Retarget - Kimoto Gravity Well\n");
return bnNew.GetCompact();
}
//return KimotoGravityWell(pindexLast, pblock, BlocksTargetSpacing, PastBlocksMin, PastBlocksMax);
Expand Down
6 changes: 4 additions & 2 deletions src/versionbits.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "versionbits.h"

#include "consensus/params.h"
#include <iostream>

const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_BITS_DEPLOYMENTS] = {
{
Expand All @@ -17,7 +17,7 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION
},
{
/*.name =*/ "segwit",
/*.gbt_force =*/ false,
/*.gbt_force =*/ true,
}
};

Expand All @@ -32,6 +32,8 @@ ThresholdState AbstractThresholdConditionChecker::GetStateFor(const CBlockIndex*
if (pindexPrev != NULL) {
pindexPrev = pindexPrev->GetAncestor(pindexPrev->nHeight - ((pindexPrev->nHeight + 1) % nPeriod));
}
//printf("Using Block Height %d For VersionBits Check \n", pindexPrev->nHeight);
//printf("Last block was at %u \n", pindexPrev->GetMedianTimePast());

// Walk backwards in steps of nPeriod to find a pindexPrev whose information is known
std::vector<const CBlockIndex*> vToCompute;
Expand Down

0 comments on commit ac0fcc5

Please sign in to comment.