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

Add MineBlocksOnDemand chain parameter

Browse Source
This commit is contained in:
jtimon 2014-03-09 13:36:55 -07:00
parent 1712adbe0b
commit bfa9a1a638
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/chainparams.cpp
View File

@ -247,6 +247,7 @@ public:
virtual bool RequireRPCPassword() const { return false; } virtual bool RequireRPCPassword() const { return false; }
virtual bool MiningRequiresPeers() const { return false; } virtual bool MiningRequiresPeers() const { return false; }
virtual bool MineBlocksOnDemand() const { return true; }
virtual Network NetworkID() const { return CChainParams::REGTEST; } virtual Network NetworkID() const { return CChainParams::REGTEST; }
}; };
static CRegTestParams regTestParams; static CRegTestParams regTestParams;

3
src/chainparams.h
View File

@ -62,6 +62,9 @@ public:
/* Make miner wait to have peers to avoid wasting work */ /* Make miner wait to have peers to avoid wasting work */
virtual bool MiningRequiresPeers() const { return true; } virtual bool MiningRequiresPeers() const { return true; }
const string& DataDir() const { return strDataDir; } const string& DataDir() const { return strDataDir; }
/* Make miner stop after a block is found. In RPC, don't return
* until nGenProcLimit blocks are generated */
virtual bool MineBlocksOnDemand() const { return false; }
virtual Network NetworkID() const = 0; virtual Network NetworkID() const = 0;
const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; } const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
const std::vector<unsigned char> &Base58Prefix(Base58Type type) const { return base58Prefixes[type]; } const std::vector<unsigned char> &Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }

5
src/miner.cpp
View File

@ -580,9 +580,8 @@ void static BitcoinMiner(CWallet *pwallet)
CheckWork(pblock, *pwallet, reservekey); CheckWork(pblock, *pwallet, reservekey);
SetThreadPriority(THREAD_PRIORITY_LOWEST); SetThreadPriority(THREAD_PRIORITY_LOWEST);
// In regression test mode, stop mining after a block is found. This // In regression test mode, stop mining after a block is found.
// allows developers to controllably generate a block on demand. if (Params().MineBlocksOnDemand())
if (Params().NetworkID() == CChainParams::REGTEST)
throw boost::thread_interrupted(); throw boost::thread_interrupted();
break; break;

2
src/rpcmining.cpp
View File

@ -174,7 +174,7 @@ Value setgenerate(const Array& params, bool fHelp)
} }
// -regtest mode: don't return until nGenProcLimit blocks are generated // -regtest mode: don't return until nGenProcLimit blocks are generated
if (fGenerate && Params().NetworkID() == CChainParams::REGTEST) if (fGenerate && Params().MineBlocksOnDemand())
{ {
int nHeightStart = 0; int nHeightStart = 0;
int nHeightEnd = 0; int nHeightEnd = 0;