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

- Randomize denoms calculated ot of vecAmounts. Should help to find partners faster/more often and maybe slightly improve anonymity also.

Browse Source 
- sessionTotal doesn't makes sense anymore, get rid of it.
- GetDenominationsByAmount cleaned but it is not used anywhere else so maybe it should be removed too (placed a comment there but didn't remove it yet).
This commit is contained in:
UdjinM6 2015-05-30 05:46:09 +03:00
parent de562d89f7
commit 4292d4d87d
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/darksend.cpp
View File

@ -1497,14 +1497,6 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
int nUseQueue = rand()%100; int nUseQueue = rand()%100;
UpdateState(POOL_STATUS_ACCEPTING_ENTRIES); UpdateState(POOL_STATUS_ACCEPTING_ENTRIES);
sessionTotalValue = pwalletMain->GetTotalValue(vCoins);
//randomize the amounts we mix
if(sessionTotalValue > nBalanceNeedsAnonymized) sessionTotalValue = nBalanceNeedsAnonymized;
double fDarkcoinSubmitted = (sessionTotalValue / CENT);
LogPrintf("Submitting Darksend for %f DASH CENT - sessionTotalValue %d\n", fDarkcoinSubmitted, sessionTotalValue);
if(pwalletMain->GetDenominatedBalance(true, true) > 0){ //get denominated unconfirmed inputs if(pwalletMain->GetDenominatedBalance(true, true) > 0){ //get denominated unconfirmed inputs
LogPrintf("DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n"); LogPrintf("DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n");
strAutoDenomResult = _("Found unconfirmed denominated outputs, will wait till they confirm to continue."); strAutoDenomResult = _("Found unconfirmed denominated outputs, will wait till they confirm to continue.");
@ -1554,8 +1546,8 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
// connect to Masternode and submit the queue request // connect to Masternode and submit the queue request
if(ConnectNode((CAddress)addr, NULL, true)){ if(ConnectNode((CAddress)addr, NULL, true)){
CNode* pNode = FindNode(addr); CNode* pnode = FindNode(addr);
if(pNode) if(pnode)
{ {
std::string strReason; std::string strReason;
if(txCollateral == CMutableTransaction()){ if(txCollateral == CMutableTransaction()){
@ -1575,8 +1567,8 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
vecMasternodesUsed.push_back(dsq.vin); vecMasternodesUsed.push_back(dsq.vin);
sessionDenom = dsq.nDenom; sessionDenom = dsq.nDenom;
pNode->PushMessage("dsa", sessionDenom, txCollateral); pnode->PushMessage("dsa", sessionDenom, txCollateral);
LogPrintf("DoAutomaticDenominating --- connected (from queue), sending dsa for %d %d - %s\n", sessionDenom, GetDenominationsByAmount(sessionTotalValue), pNode->addr.ToString().c_str()); LogPrintf("DoAutomaticDenominating --- connected (from queue), sending dsa for %d - %s\n", sessionDenom, pnode->addr.ToString().c_str());
strAutoDenomResult = ""; strAutoDenomResult = "";
dsq.time = 0; //remove node dsq.time = 0; //remove node
return true; return true;
@ -1641,10 +1633,12 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
std::vector<CAmount> vecAmounts; std::vector<CAmount> vecAmounts;
pwalletMain->ConvertList(vCoins, vecAmounts); pwalletMain->ConvertList(vCoins, vecAmounts);
sessionDenom = GetDenominationsByAmounts(vecAmounts); // try to get random denoms out of vecAmounts
while(sessionDenom == 0)
sessionDenom = GetDenominationsByAmounts(vecAmounts, true);
pnode->PushMessage("dsa", sessionDenom, txCollateral); pnode->PushMessage("dsa", sessionDenom, txCollateral);
LogPrintf("DoAutomaticDenominating --- connected, sending dsa for %d - denom %d\n", sessionDenom, GetDenominationsByAmount(sessionTotalValue)); LogPrintf("DoAutomaticDenominating --- connected, sending dsa for %d\n", sessionDenom);
strAutoDenomResult = ""; strAutoDenomResult = "";
return true; return true;
} }
@ -1946,7 +1940,7 @@ int CDarksendPool::GetDenominations(const std::vector<CTxDSOut>& vout){
} }
// return a bitshifted integer representing the denominations in this list // return a bitshifted integer representing the denominations in this list
int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout){ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout, bool fRandDenom){
std::vector<pair<int64_t, int> > denomUsed; std::vector<pair<int64_t, int> > denomUsed;
// make a list of denominations, with zero uses // make a list of denominations, with zero uses
@ -1970,7 +1964,7 @@ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout){
// if the denomination is used, shift the bit on. // if the denomination is used, shift the bit on.
// then move to the next // then move to the next
BOOST_FOREACH (PAIRTYPE(int64_t, int)& s, denomUsed) BOOST_FOREACH (PAIRTYPE(int64_t, int)& s, denomUsed)
denom |= s.second << c++; denom |= ((fRandDenom ? rand()%2 : 1) * s.second) << c++;
// Function returns as follows: // Function returns as follows:
// //
@ -1983,7 +1977,7 @@ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout){
} }
int CDarksendPool::GetDenominationsByAmounts(std::vector<int64_t>& vecAmount){ int CDarksendPool::GetDenominationsByAmounts(std::vector<int64_t>& vecAmount, bool fRandDenom){
CScript e = CScript(); CScript e = CScript();
std::vector<CTxOut> vout1; std::vector<CTxOut> vout1;
@ -1996,7 +1990,7 @@ int CDarksendPool::GetDenominationsByAmounts(std::vector<int64_t>& vecAmount){
nOutputs++; nOutputs++;
} }
return GetDenominations(vout1); return GetDenominations(vout1, fRandDenom);
} }
int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){
@ -2028,12 +2022,6 @@ int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){
LogPrintf("GetDenominationsByAmount --- %d nOutputs %d\n", v, nOutputs); LogPrintf("GetDenominationsByAmount --- %d nOutputs %d\n", v, nOutputs);
} }
//add non-denom left overs as change
if(nValueLeft > 0){
CTxOut o(nValueLeft, e);
vout1.push_back(o);
}
return GetDenominations(vout1); return GetDenominations(vout1);
} }

7
src/darksend.h
View File

@ -318,7 +318,6 @@ public:
int sessionDenom; //Users must submit an denom matching this int sessionDenom; //Users must submit an denom matching this
int sessionUsers; //N Users have said they'll join int sessionUsers; //N Users have said they'll join
bool sessionFoundMasternode; //If we've found a compatible Masternode bool sessionFoundMasternode; //If we've found a compatible Masternode
int64_t sessionTotalValue; //used for autoDenom
std::vector<CTransaction> vecSessionCollateral; std::vector<CTransaction> vecSessionCollateral;
int cachedLastSuccess; int cachedLastSuccess;
@ -494,14 +493,14 @@ public:
bool CreateDenominated(int64_t nTotalValue); bool CreateDenominated(int64_t nTotalValue);
/// Get the denominations for a list of outputs (returns a bitshifted integer) /// Get the denominations for a list of outputs (returns a bitshifted integer)
int GetDenominations(const std::vector<CTxOut>& vout); int GetDenominations(const std::vector<CTxOut>& vout, bool fRandDenom = false);
int GetDenominations(const std::vector<CTxDSOut>& vout); int GetDenominations(const std::vector<CTxDSOut>& vout);
void GetDenominationsToString(int nDenom, std::string& strDenom); void GetDenominationsToString(int nDenom, std::string& strDenom);
/// Get the denominations for a specific amount of dash. /// Get the denominations for a specific amount of dash.
int GetDenominationsByAmount(int64_t nAmount, int nDenomTarget=0); int GetDenominationsByAmount(int64_t nAmount, int nDenomTarget=0); // is not used anymore?
int GetDenominationsByAmounts(std::vector<int64_t>& vecAmount); int GetDenominationsByAmounts(std::vector<int64_t>& vecAmount, bool fRandDenom = false);
std::string GetMessageByID(int messageID); std::string GetMessageByID(int messageID);