disable fCoinbaseMustBeProtected for temp testnet

disable fCoinbaseMustBeProtected for temp testnet and change peermagic
This commit is contained in:
J62 2018-10-15 17:10:51 -07:00 committed by GitHub
parent 0cef2bfe6a
commit 5b682bf399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

View File

@ -209,7 +209,7 @@ public:
CTestNetParams() { CTestNetParams() {
strNetworkID = "test"; strNetworkID = "test";
consensus.fCoinbaseMustBeProtected = true; consensus.fCoinbaseMustBeProtected = false;
consensus.nSubsidyHalvingInterval = 840000; consensus.nSubsidyHalvingInterval = 840000;
// P2SH, height in coinbase, CLTV and DERSIG all enforced from genesis // P2SH, height in coinbase, CLTV and DERSIG all enforced from genesis
@ -242,10 +242,10 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1535587200; // 2018-08-30 consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1535587200; // 2018-08-30
static_assert(Consensus::DEPLOYMENT_SEGWIT == Consensus::DEPLOYMENT_CSV, "segwit and csv deployed together"); static_assert(Consensus::DEPLOYMENT_SEGWIT == Consensus::DEPLOYMENT_CSV, "segwit and csv deployed together");
pchMessageStart[0] = 0xf4; pchMessageStart[0] = 0xf3;
pchMessageStart[1] = 0x1c; pchMessageStart[1] = 0x1e;
pchMessageStart[2] = 0xf5; pchMessageStart[2] = 0xf6;
pchMessageStart[3] = 0xd4; pchMessageStart[3] = 0xd3;
nDefaultPort = 17933; nDefaultPort = 17933;