sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 05:23:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use single random denom in new DS session

Browse Source
This commit is contained in:
UdjinM6 2015-08-10 02:28:43 +03:00
parent 7d00729177
commit 4046900499
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/darksend.cpp
View File

@ -1587,9 +1587,9 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun, bool ready)
std::vector<CAmount> vecAmounts; std::vector<CAmount> vecAmounts;
pwalletMain->ConvertList(vCoins, vecAmounts); pwalletMain->ConvertList(vCoins, vecAmounts);
// try to get random denoms out of vecAmounts // try to get a single random denom out of vecAmounts
while(sessionDenom == 0) while(sessionDenom == 0)
sessionDenom = GetDenominationsByAmounts(vecAmounts, true); sessionDenom = GetDenominationsByAmounts(vecAmounts);
pnode->PushMessage("dsa", sessionDenom, txCollateral); pnode->PushMessage("dsa", sessionDenom, txCollateral);
LogPrintf("DoAutomaticDenominating --- connected, sending dsa for %d\n", sessionDenom); LogPrintf("DoAutomaticDenominating --- connected, sending dsa for %d\n", sessionDenom);
@ -1914,7 +1914,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, bool fRandDenom){ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout, bool fSingleRandomDenom){
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
@ -1937,8 +1937,11 @@ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout, bool fRandD
int c = 0; int c = 0;
// 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 |= ((fRandDenom ? rand()%2 : 1) * s.second) << c++; int bit = (fSingleRandomDenom ? rand()%2 : 1) * s.second;
denom |= bit << c++;
if(fSingleRandomDenom && bit) break; // use just one random denomination
}
// Function returns as follows: // Function returns as follows:
// //
@ -1951,20 +1954,17 @@ int CDarksendPool::GetDenominations(const std::vector<CTxOut>& vout, bool fRandD
} }
int CDarksendPool::GetDenominationsByAmounts(std::vector<int64_t>& vecAmount, bool fRandDenom){ int CDarksendPool::GetDenominationsByAmounts(std::vector<int64_t>& vecAmount){
CScript e = CScript(); CScript e = CScript();
std::vector<CTxOut> vout1; std::vector<CTxOut> vout1;
// Make outputs by looping through denominations, from small to large // Make outputs by looping through denominations, from small to large
BOOST_REVERSE_FOREACH(int64_t v, vecAmount){ BOOST_REVERSE_FOREACH(int64_t v, vecAmount){
int nOutputs = 0;
CTxOut o(v, e); CTxOut o(v, e);
vout1.push_back(o); vout1.push_back(o);
nOutputs++;
} }
return GetDenominations(vout1, fRandDenom); return GetDenominations(vout1, true);
} }
int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){ int CDarksendPool::GetDenominationsByAmount(int64_t nAmount, int nDenomTarget){

4
src/darksend.h
View File

@ -481,14 +481,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, bool fRandDenom = false); int GetDenominations(const std::vector<CTxOut>& vout, bool fSingleRandomDenom = 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); // is not used anymore? int GetDenominationsByAmount(int64_t nAmount, int nDenomTarget=0); // is not used anymore?
int GetDenominationsByAmounts(std::vector<int64_t>& vecAmount, bool fRandDenom = false); int GetDenominationsByAmounts(std::vector<int64_t>& vecAmount);
std::string GetMessageByID(int messageID); std::string GetMessageByID(int messageID);