neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #771 from dashpay/schinzelh-patch-1

Browse Source 
Some houskeeping
This commit is contained in:
Holger Schinzel 2016-05-10 10:01:25 +02:00
commit 641f464d44
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/chainparams.cpp
View File

@ -90,7 +90,7 @@ public:
consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes
consensus.fPowAllowMinDifficultyBlocks = false; consensus.fPowAllowMinDifficultyBlocks = false;
consensus.fPowNoRetargeting = false; consensus.fPowNoRetargeting = false;
/** /**
* The message start string is designed to be unlikely to occur in normal data. * The message start string is designed to be unlikely to occur in normal data.
* The characters are rarely used upper ASCII, not valid as UTF-8, and produce * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
* a large 32-bit integer with any alignment. * a large 32-bit integer with any alignment.
@ -244,12 +244,11 @@ public:
strDarksendPoolDummyAddress = "y1EZuxhhNMAUofTBEeLqGE1bJrpC2TWRNp"; strDarksendPoolDummyAddress = "y1EZuxhhNMAUofTBEeLqGE1bJrpC2TWRNp";
checkpointData = (CCheckpointData) { checkpointData = (CCheckpointData) {
boost::assign::map_list_of boost::assign::map_list_of
( 261, uint256S("00000c26026d0815a7e2ce4fa270775f61403c040647ff2c3091f99e894a4618")) ( 261, uint256S("00000c26026d0815a7e2ce4fa270775f61403c040647ff2c3091f99e894a4618")),
( 77900, uint256S("00000007e5ec67e2a626c07b7d66673c3dd8df0aed5018ca984b99fba2b71024")) 1423410572, // * UNIX timestamp of last checkpoint block
( 82313, uint256S("000000156a313af1d69fe855609175b276996235e8f4f7da41b10e4a7a750a19")), 264, // * total number of transactions between genesis and last checkpoint
1405699509, // (the tx=... number in the SetBestChain debug.log lines)
201, 500 // * estimated number of transactions per day after checkpoint
500
}; };
} }

29
src/miner.cpp
View File

@ -408,21 +408,20 @@ void static BitcoinMiner(const CChainParams& chainparams)
throw std::runtime_error("No coinbase script available (mining requires a wallet)"); throw std::runtime_error("No coinbase script available (mining requires a wallet)");
while (true) { while (true) {
// 12.1: testing note -- disabled for now if (chainparams.MiningRequiresPeers()) {
// if (chainparams.MiningRequiresPeers()) { // Busy-wait for the network to come online so we don't waste time mining
// // Busy-wait for the network to come online so we don't waste time mining // on an obsolete chain. In regtest mode we expect to fly solo.
// // on an obsolete chain. In regtest mode we expect to fly solo. do {
// do { bool fvNodesEmpty;
// bool fvNodesEmpty; {
// { LOCK(cs_vNodes);
// LOCK(cs_vNodes); fvNodesEmpty = vNodes.empty();
// fvNodesEmpty = vNodes.empty(); }
// } if (!fvNodesEmpty && !IsInitialBlockDownload())
// if (!fvNodesEmpty && !IsInitialBlockDownload()) break;
// break; MilliSleep(1000);
// MilliSleep(1000); } while (true);
// } while (true); }
// }
// //