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

Implement safer version of CWallet::PrepareDarksendDenominate:

Browse Source 
Make outputs by looping through denominations: try to add every needed denomination, repeat up to 5-10 times.
This way we can be pretty sure that it should have at least one of each needed denomination.
We also do not care about full amount as long as we have right denominations, just pass what we found.
This commit is contained in:
UdjinM6 2015-07-07 01:09:28 +03:00
parent 6c6a280df8
commit 05d93445a2
1 changed files with 59 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/wallet.cpp
View File

@ -2318,6 +2318,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds)
// ** find the coins we'll use // ** find the coins we'll use
std::vector<CTxIn> vCoins; std::vector<CTxIn> vCoins;
std::vector<CTxIn> vCoinsResult;
std::vector<COutput> vCoins2; std::vector<COutput> vCoins2;
int64_t nValueIn = 0; int64_t nValueIn = 0;
CReserveKey reservekey(this); CReserveKey reservekey(this);
@ -2329,129 +2330,95 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds)
*/ */
if(minRounds >= 0){ if(minRounds >= 0){
if (!SelectCoinsByDenominations(darkSendPool.sessionDenom, 0.1*COIN, DARKSEND_POOL_MAX, vCoins, vCoins2, nValueIn, minRounds, maxRounds)) if (!SelectCoinsByDenominations(darkSendPool.sessionDenom, 0.1*COIN, DARKSEND_POOL_MAX, vCoins, vCoins2, nValueIn, minRounds, maxRounds))
return _("Insufficient funds"); return _("Error: can't select current denominated inputs");
} }
// calculate total value out LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nValueIn);
int64_t nTotalValue = GetTotalValue(vCoins);
LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nTotalValue);
BOOST_FOREACH(CTxIn v, vCoins) BOOST_FOREACH(CTxIn v, vCoins)
LockCoin(v.prevout); LockCoin(v.prevout);
// denominate our funds int64_t nValueLeft = nValueIn;
int64_t nValueLeft = nTotalValue;
std::vector<CTxOut> vOut; std::vector<CTxOut> vOut;
std::vector<int64_t> vDenoms;
/* /*
TODO: Front load with needed denominations (e.g. .1, 1 ) TODO: Front load with needed denominations (e.g. .1, 1 )
*/ */
/* // Make outputs by looping through denominations: try to add every needed denomination, repeat up to 5-10 times.
Add all denominations once // This way we can be pretty sure that it should have at least one of each needed denomination.
// NOTE: No need to randomize order of inputs because they were
// initially shuffled in CWallet::SelectCoinsByDenominations already.
int nStep = 0;
int nStepsMax = 5 + GetRandInt(5);
while(nStep < nStepsMax) {
The beginning of the list is front loaded with each possible BOOST_FOREACH(int64_t v, darkSendDenominations){
denomination in random order. This means we'll at least get 1 // only use the ones that are approved
of each that is required as outputs. bool fAccepted = false;
*/ if((darkSendPool.sessionDenom & (1 << 0)) && v == ((100*COIN) +100000)) {fAccepted = true;}
BOOST_FOREACH(int64_t d, darkSendDenominations){ else if((darkSendPool.sessionDenom & (1 << 1)) && v == ((10*COIN) +10000)) {fAccepted = true;}
vDenoms.push_back(d); else if((darkSendPool.sessionDenom & (1 << 2)) && v == ((1*COIN) +1000)) {fAccepted = true;}
vDenoms.push_back(d); else if((darkSendPool.sessionDenom & (1 << 3)) && v == ((.1*COIN) +100)) {fAccepted = true;}
} if(!fAccepted) continue;
//randomize the order of these denominations // try to add it
std::random_shuffle (vDenoms.begin(), vDenoms.end()); if(nValueLeft - v >= 0) {
// Note: this relies on a fact that both vectors MUST have same size
std::vector<CTxIn>::iterator it = vCoins.begin();
std::vector<COutput>::iterator it2 = vCoins2.begin();
while(it2 != vCoins2.end()) {
// we have matching inputs
if((*it2).tx->vout[(*it2).i].nValue == v) {
// add new input in resulting vector
vCoinsResult.push_back(*it);
// remove corresponting items from initial vectors
vCoins.erase(it);
vCoins2.erase(it2);
/* CScript scriptChange;
Build a long list of denominations CPubKey vchPubKey;
// use a unique change address
assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked
scriptChange = GetScriptForDestination(vchPubKey.GetID());
reservekey.KeepKey();
Next we'll build a long random list of denominations to add. // add new output
Eventually as the algorithm goes through these it'll find the ones CTxOut o(v, scriptChange);
it nees to get exact change. vOut.push_back(o);
*/
for(int i = 0; i <= 500; i++)
BOOST_FOREACH(int64_t d, darkSendDenominations)
vDenoms.push_back(d);
//randomize the order of inputs we get back // subtract denomination amount
std::random_shuffle (vDenoms.begin() + (int)darkSendDenominations.size() + 1, vDenoms.end()); nValueLeft -= v;
// Make outputs by looping through denominations randomly break;
}
BOOST_REVERSE_FOREACH(int64_t v, vDenoms){ ++it;
//only use the ones that are approved ++it2;
bool fAccepted = false; }
if((darkSendPool.sessionDenom & (1 << 0)) && v == ((100*COIN) +100000)) {fAccepted = true;} }
else if((darkSendPool.sessionDenom & (1 << 1)) && v == ((10*COIN) +10000)) {fAccepted = true;}
else if((darkSendPool.sessionDenom & (1 << 2)) && v == ((1*COIN) +1000)) {fAccepted = true;}
else if((darkSendPool.sessionDenom & (1 << 3)) && v == ((.1*COIN) +100)) {fAccepted = true;}
if(!fAccepted) continue;
int nOutputs = 0;
// add each output up to 10 times until it can't be added again
while(nValueLeft - v >= 0 && nOutputs <= 10) {
CScript scriptChange;
CPubKey vchPubKey;
//use a unique change address
assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked
scriptChange = GetScriptForDestination(vchPubKey.GetID());
reservekey.KeepKey();
CTxOut o(v, scriptChange);
vOut.push_back(o);
//increment outputs and subtract denomination amount
nOutputs++;
nValueLeft -= v;
} }
nStep++;
if(nValueLeft == 0) break; if(nValueLeft == 0) break;
} }
//back up mode , incase we couldn't successfully make the outputs for some reason // unlock unused coins
if(vOut.size() > 40 || darkSendPool.GetDenominations(vOut) != darkSendPool.sessionDenom || nValueLeft != 0){ BOOST_FOREACH(CTxIn v, vCoins)
vOut.clear(); UnlockCoin(v.prevout);
nValueLeft = nTotalValue;
// Make outputs by looping through denominations, from small to large
BOOST_FOREACH(const COutput& out, vCoins2){
CScript scriptChange;
CPubKey vchPubKey;
//use a unique change address
assert(reservekey.GetReservedKey(vchPubKey)); // should never fail, as we just unlocked
scriptChange = GetScriptForDestination(vchPubKey.GetID());
reservekey.KeepKey();
CTxOut o(out.tx->vout[out.i].nValue, scriptChange);
vOut.push_back(o);
//increment outputs and subtract denomination amount
nValueLeft -= out.tx->vout[out.i].nValue;
if(nValueLeft == 0) break;
}
}
if(darkSendPool.GetDenominations(vOut) != darkSendPool.sessionDenom) { if(darkSendPool.GetDenominations(vOut) != darkSendPool.sessionDenom) {
BOOST_FOREACH(CTxIn v, vCoins) // unlock used coins on failure
BOOST_FOREACH(CTxIn v, vCoinsResult)
UnlockCoin(v.prevout); UnlockCoin(v.prevout);
return "Error: can't make current denominated outputs"; return "Error: can't make current denominated outputs";
} }
// we don't support change at all // randomize the output order
if(nValueLeft != 0) {
BOOST_FOREACH(CTxIn v, vCoins)
UnlockCoin(v.prevout);
return "Error: change left-over in pool. Must use denominations only";
}
//randomize the output order
std::random_shuffle (vOut.begin(), vOut.end()); std::random_shuffle (vOut.begin(), vOut.end());
darkSendPool.SendDarksendDenominate(vCoins, vOut, nValueIn); // We also do not care about full amount as long as we have right denominations, just pass what we found
darkSendPool.SendDarksendDenominate(vCoinsResult, vOut, nValueIn - nValueLeft);
return ""; return "";
} }