diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 42b4eac99a..a7f40e3fe3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -64,6 +64,7 @@ public: vSeeds.push_back(CDNSSeedData("darkcoin.io", "dnsseed.darkcoin.io")); vSeeds.push_back(CDNSSeedData("darkcoin.qa", "dnsseed.darkcoin.qa")); + vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io")); base58Prefixes[PUBKEY_ADDRESS] = list_of(76); // Darkcoin addresses start with X base58Prefixes[SCRIPT_ADDRESS] = list_of(5); @@ -101,7 +102,7 @@ static CMainParams mainParams; // -// Testnet (v4) +// Testnet (v3) // class CTestNetParams : public CMainParams { public: @@ -130,8 +131,9 @@ public: vSeeds.clear(); vSeeds.push_back(CDNSSeedData("darkcoin.io", "testnet-seed.darkcoin.io")); vSeeds.push_back(CDNSSeedData("darkcoin.qa", "testnet-seed.darkcoin.qa")); + vSeeds.push_back(CDNSSeedData("masternode.io", "test.dnsseed.masternode.io")); - base58Prefixes[PUBKEY_ADDRESS] = list_of(111); // Testnet v4 addresses + base58Prefixes[PUBKEY_ADDRESS] = list_of(111); // Testnet v3 addresses base58Prefixes[SCRIPT_ADDRESS] = list_of(196); base58Prefixes[SECRET_KEY] = list_of(239); base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 735dbdf77b..923365df31 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -68,8 +68,8 @@ namespace Checkpoints static const CCheckpointData dataTestnet = { &mapCheckpointsTestnet, 1405699509, - 20, - 300 + 201, + 500 }; static MapCheckpoints mapCheckpointsRegtest = diff --git a/src/main.cpp b/src/main.cpp index 7f668f4a09..df866698f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2297,7 +2297,6 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C view.SetBestBlock(pindex->GetBlockHash()); return true; } - bool fScriptChecks = pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(); // Do not allow blocks that contain transactions which 'overwrite' older transactions, @@ -2874,7 +2873,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo bool MasternodePayments = false; - if(Params().NetworkID() == CChainParams::TESTNET){ + if(TestNet()){ if(block.nTime > START_MASTERNODE_PAYMENTS_TESTNET) MasternodePayments = true; } else { if(block.nTime > START_MASTERNODE_PAYMENTS) MasternodePayments = true; @@ -2919,7 +2918,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo CBitcoinAddress address2(address1); LogPrintf("CheckBlock() : Couldn't find masternode payment(%d|%d) or payee(%d|%s) nHeight %d. \n", foundPaymentAmount, masternodePaymentAmount, foundPayee, address2.ToString().c_str(), chainActive.Tip()->nHeight+1); - if(!TestNet()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); + if(!TestNet() && !RegTest()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee")); } } } else { diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 0fd35fa2aa..dd077d9be2 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -55,7 +55,7 @@ public: double getVerificationProgress() const; QDateTime getLastBlockDate() const; - //! Return network (main, testnet4, regtest) + //! Return network (main, testnet3, regtest) QString getNetworkName() const; //! Return true if core is doing initial block download bool inInitialBlockDownload() const; diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index c4e2b218b5..0038da6ad6 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -441,7 +441,7 @@ Value getblockchaininfo(const Array& params, bool fHelp) "Returns an object containing various state info regarding block chain processing.\n" "\nResult:\n" "{\n" - " \"chain\": \"xxxx\", (string) current chain (main, testnet4, regtest)\n" + " \"chain\": \"xxxx\", (string) current chain (main, testnet3, regtest)\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"bestblockhash\": \"...\", (string) the hash of the currently best block\n" " \"difficulty\": xxxxxx, (numeric) the current difficulty\n"