DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix

Browse Source
This commit is contained in:
blackjok3r
2018-12-06 14:44:34 +08:00
parent a78c87124a
commit 128a02eb9b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/miner.cpp
View File

@@ -769,7 +769,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, int32_t nHeight,
scriptPubKey = CScript() << ParseHex(NOTARY_PUBKEY) << OP_CHECKSIG; scriptPubKey = CScript() << ParseHex(NOTARY_PUBKEY) << OP_CHECKSIG;
} else } else
{ {
if (!isStake && ASSETCHAINS_STAKED != 0) if (!isStake || ASSETCHAINS_STAKED != 0)
{ {
if (!reservekey.GetReservedKey(pubkey)) if (!reservekey.GetReservedKey(pubkey))
{ {

7
src/rpc/mining.cpp
View File

@@ -344,7 +344,10 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
{ {
VERUS_MINTBLOCKS = 1; VERUS_MINTBLOCKS = 1;
fGenerate = GetBoolArg("-gen", false); fGenerate = GetBoolArg("-gen", false);
nGenProcLimit = KOMODO_MININGTHREADS; if ( ASSETCHAINS_STAKED != 0 )
nGenProcLimit = KOMODO_MININGTHREADS;
else
KOMODO_MININGTHREADS = nGenProcLimit;
} }
else if (!fGenerate) else if (!fGenerate)
{ {
@@ -353,8 +356,6 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
} }
else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit; else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit;
fprintf(stderr, "BEFORE MAP miningthreads.%i generate.%i\n",KOMODO_MININGTHREADS,(fGenerate ? 1 : 0));
mapArgs["-gen"] = (fGenerate ? "1" : "0"); mapArgs["-gen"] = (fGenerate ? "1" : "0");
mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS); mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS);