darksend disabled

This commit is contained in:
Evan Duffield 2014-07-17 02:29:41 -07:00
parent 2748306d09
commit ee303c89fb
4 changed files with 13 additions and 4 deletions

View File

@ -1168,11 +1168,16 @@ bool AppInit2(boost::thread_group& threadGroup)
} }
} }
nDarksendRounds = GetArg("-darksendrounds", 2); fDisableDarksend = GetBoolArg("-disabledarksend", false);
if(nDarksendRounds > 8) nDarksendRounds = 8; if(!fDisableDarksend){
if(nDarksendRounds < 1) nDarksendRounds = 1; nDarksendRounds = GetArg("-darksendrounds", 2);
if(nDarksendRounds > 8) nDarksendRounds = 8;
if(nDarksendRounds < 1) nDarksendRounds = 1;
printf("Darksend rounds %d\n", nDarksendRounds); printf("Darksend rounds %d\n", nDarksendRounds);
} else {
printf("Darksend is disabled!\n");
}
darkSendDenominations.push_back( 1000 * COIN ); darkSendDenominations.push_back( 1000 * COIN );
darkSendDenominations.push_back( 100 * COIN ); darkSendDenominations.push_back( 100 * COIN );

View File

@ -6954,6 +6954,8 @@ int CDarkSendPool::GetCurrentMasterNode(int mod, int64 nBlockHeight)
void CDarkSendPool::DoAutomaticDenominating() void CDarkSendPool::DoAutomaticDenominating()
{ {
if(fDisableDarksend) return;
// ** find the coins we'll use // ** find the coins we'll use
std::vector<CTxIn> vCoins; std::vector<CTxIn> vCoins;
int64 nValueMin = 0.01*COIN; int64 nValueMin = 0.01*COIN;

View File

@ -74,6 +74,7 @@ bool fMasterNode = false;
string strMasterNodePrivKey = ""; string strMasterNodePrivKey = "";
string strMasterNodeAddr = ""; string strMasterNodeAddr = "";
int nDarksendRounds = 2; int nDarksendRounds = 2;
bool fDisableDarksend = false;
bool fDebug = false; bool fDebug = false;
bool fDebugNet = false; bool fDebugNet = false;
bool fPrintToConsole = false; bool fPrintToConsole = false;

View File

@ -131,6 +131,7 @@ extern std::map<std::string, std::string> mapArgs;
extern std::map<std::string, std::vector<std::string> > mapMultiArgs; extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
extern bool fMasterNode; extern bool fMasterNode;
extern int nDarksendRounds; extern int nDarksendRounds;
extern bool fDisableDarksend;
extern std::string strMasterNodeAddr; extern std::string strMasterNodeAddr;
extern bool fDebug; extern bool fDebug;
extern bool fDebugNet; extern bool fDebugNet;