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:34:46 +08:00
parent 5acd49d9e6
commit a78c87124a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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) if (!isStake && ASSETCHAINS_STAKED != 0)
{ {
if (!reservekey.GetReservedKey(pubkey)) if (!reservekey.GetReservedKey(pubkey))
{ {
@@ -783,13 +783,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, int32_t nHeight,
} }
scriptPubKey[34] = OP_CHECKSIG; scriptPubKey[34] = OP_CHECKSIG;
} }
else fprintf(stderr,"IsStake\n");
} }
fprintf(stderr,"selected pubkey for new block: ");
for (i=0; i<33; i++) {
fprintf(stderr,"%02x",scriptPubKey[i+1]);
}
fprintf(stderr,"\n");
return CreateNewBlock(scriptPubKey, gpucount, isStake); return CreateNewBlock(scriptPubKey, gpucount, isStake);
} }
@@ -1479,7 +1473,7 @@ void static BitcoinMiner()
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
// notaries always default to staking // notaries always default to staking
CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey, pindexPrev->GetHeight()+1, gpucount, 0); CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey, pindexPrev->GetHeight()+1, gpucount, ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0);
#else #else
CBlockTemplate *ptr = CreateNewBlockWithKey(); CBlockTemplate *ptr = CreateNewBlockWithKey();
#endif #endif

2
src/rpc/mining.cpp
View File

@@ -353,6 +353,8 @@ 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);