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

Merge pull request #63 from blackjok3rtt/FSM

Browse Source 
Fsm
This commit is contained in:
blackjok3rtt
2018-12-17 11:49:40 +08:00
committed by GitHub
parent 3028d884e5 4a2ea81f3c
commit ca2129e81d
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/init.cpp
View File

@@ -1874,9 +1874,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
VERUS_MINTBLOCKS = GetBoolArg("-mint", false); VERUS_MINTBLOCKS = GetBoolArg("-mint", false);
if (pwalletMain || !GetArg("-mineraddress", "").empty()) if (pwalletMain || !GetArg("-mineraddress", "").empty())
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 0)); GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", -1));
#else #else
GenerateBitcoins(GetBoolArg("-gen", false), GetArg("-genproclimit", 0)); GenerateBitcoins(GetBoolArg("-gen", false), GetArg("-genproclimit", -1));
#endif #endif
#endif #endif

10
src/komodo_utils.h
View File

@@ -1665,8 +1665,9 @@ void komodo_args(char *argv0)
MIN_RECV_SATS = GetArg("-mintxvalue",-1); MIN_RECV_SATS = GetArg("-mintxvalue",-1);
WHITELIST_ADDRESS = GetArg("-whitelistaddress",""); WHITELIST_ADDRESS = GetArg("-whitelistaddress","");
if ( GetBoolArg("-gen", false) != 0 ) if ( GetBoolArg("-gen", false) != 0 )
KOMODO_MININGTHREADS = GetArg("-genproclimit",1); {
else KOMODO_MININGTHREADS = 0; KOMODO_MININGTHREADS = GetArg("-genproclimit",-1);
}
if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 ) if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 )
fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n"); fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n");
DONATION_PUBKEY = GetArg("-donation", ""); DONATION_PUBKEY = GetArg("-donation", "");
@@ -1681,6 +1682,8 @@ void komodo_args(char *argv0)
if ( strcmp(NOTARY_PUBKEY.c_str(),Notaries_elected1[i][1]) == 0 ) if ( strcmp(NOTARY_PUBKEY.c_str(),Notaries_elected1[i][1]) == 0 )
{ {
IS_KOMODO_NOTARY = 1; IS_KOMODO_NOTARY = 1;
KOMODO_MININGTHREADS = 1;
mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS);
IS_STAKED_NOTARY = -1; IS_STAKED_NOTARY = -1;
fprintf(stderr,"running as notary.%d %s\n",i,Notaries_elected1[i][0]); fprintf(stderr,"running as notary.%d %s\n",i,Notaries_elected1[i][0]);
break; break;
@@ -1782,8 +1785,9 @@ void komodo_args(char *argv0)
// for now, we only support 50% PoS due to other parts of the algorithm needing adjustment for // for now, we only support 50% PoS due to other parts of the algorithm needing adjustment for
// other values // other values
if ( (ASSETCHAINS_LWMAPOS = GetArg("-ac_veruspos",0)) != 0 ) if ( (ASSETCHAINS_LWMAPOS = GetArg("-ac_veruspos",0)) != 0 )
{
ASSETCHAINS_LWMAPOS = 50; ASSETCHAINS_LWMAPOS = 50;
}
ASSETCHAINS_SAPLING = GetArg("-ac_sapling", -1); ASSETCHAINS_SAPLING = GetArg("-ac_sapling", -1);
if (ASSETCHAINS_SAPLING == -1) if (ASSETCHAINS_SAPLING == -1)
{ {

5
src/miner.cpp
View File

@@ -1466,7 +1466,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, ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0); CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey, pindexPrev->GetHeight()+1, gpucount, ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", -1) == 0);
#else #else
CBlockTemplate *ptr = CreateNewBlockWithKey(); CBlockTemplate *ptr = CreateNewBlockWithKey();
#endif #endif
@@ -1856,8 +1856,7 @@ void static BitcoinMiner()
} }
//fprintf(stderr,"nThreads.%d fGenerate.%d\n",(int32_t)nThreads,fGenerate); //fprintf(stderr,"nThreads.%d fGenerate.%d\n",(int32_t)nThreads,fGenerate);
if ( ASSETCHAINS_STAKED > 0 && nThreads == 0 && fGenerate )
if ( ASSETCHAINS_STAKED > 0 && nThreads == 0 )
{ {
if ( pwallet != NULL ) if ( pwallet != NULL )
nThreads = 1; nThreads = 1;

25
src/rpc/mining.cpp
View File

@@ -339,22 +339,25 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
//if (nGenProcLimit == 0) //if (nGenProcLimit == 0)
// fGenerate = false; // fGenerate = false;
} }
if ( ASSETCHAINS_LWMAPOS != 0 )
if (fGenerate && !nGenProcLimit)
{ {
VERUS_MINTBLOCKS = 1; if (fGenerate && !nGenProcLimit)
fGenerate = GetBoolArg("-gen", false); {
if ( ASSETCHAINS_STAKED == 0 ) VERUS_MINTBLOCKS = 1;
nGenProcLimit = KOMODO_MININGTHREADS; fGenerate = GetBoolArg("-gen", false);
else
KOMODO_MININGTHREADS = nGenProcLimit; KOMODO_MININGTHREADS = nGenProcLimit;
}
else if (!fGenerate)
{
VERUS_MINTBLOCKS = 0;
KOMODO_MININGTHREADS = 0;
}
else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit;
} }
else if (!fGenerate) else
{ {
VERUS_MINTBLOCKS = 0; KOMODO_MININGTHREADS = (int32_t)nGenProcLimit;
KOMODO_MININGTHREADS = 0;
} }
else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit;
mapArgs["-gen"] = (fGenerate ? "1" : "0"); mapArgs["-gen"] = (fGenerate ? "1" : "0");
mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS); mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS);