mirror of
https://github.com/twisterarmy/twister-core.git
synced 2025-02-02 18:04:23 +00:00
remove code
This commit is contained in:
Miguel Freitas
parent
27ee7c328b
commit
41f5e9f846
157
src/wallet.cpp
157
src/wallet.cpp
@ -1007,163 +1007,6 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed) const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ApproximateBestSubset(vector<pair<int64, pair<const CWalletTx*,unsigned int> > >vValue, int64 nTotalLower, int64 nTargetValue,
|
|
||||||
vector<char>& vfBest, int64& nBest, int iterations = 1000)
|
|
||||||
{
|
|
||||||
vector<char> vfIncluded;
|
|
||||||
|
|
||||||
vfBest.assign(vValue.size(), true);
|
|
||||||
nBest = nTotalLower;
|
|
||||||
|
|
||||||
seed_insecure_rand();
|
|
||||||
|
|
||||||
for (int nRep = 0; nRep < iterations && nBest != nTargetValue; nRep++)
|
|
||||||
{
|
|
||||||
vfIncluded.assign(vValue.size(), false);
|
|
||||||
int64 nTotal = 0;
|
|
||||||
bool fReachedTarget = false;
|
|
||||||
for (int nPass = 0; nPass < 2 && !fReachedTarget; nPass++)
|
|
||||||
{
|
|
||||||
for (unsigned int i = 0; i < vValue.size(); i++)
|
|
||||||
{
|
|
||||||
//The solver here uses a randomized algorithm,
|
|
||||||
//the randomness serves no real security purpose but is just
|
|
||||||
//needed to prevent degenerate behavior and it is important
|
|
||||||
//that the rng fast. We do not use a constant random sequence,
|
|
||||||
//because there may be some privacy improvement by making
|
|
||||||
//the selection random.
|
|
||||||
if (nPass == 0 ? insecure_rand()&1 : !vfIncluded[i])
|
|
||||||
{
|
|
||||||
nTotal += vValue[i].first;
|
|
||||||
vfIncluded[i] = true;
|
|
||||||
if (nTotal >= nTargetValue)
|
|
||||||
{
|
|
||||||
fReachedTarget = true;
|
|
||||||
if (nTotal < nBest)
|
|
||||||
{
|
|
||||||
nBest = nTotal;
|
|
||||||
vfBest = vfIncluded;
|
|
||||||
}
|
|
||||||
nTotal -= vValue[i].first;
|
|
||||||
vfIncluded[i] = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, vector<COutput> vCoins,
|
|
||||||
set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64& nValueRet) const
|
|
||||||
{
|
|
||||||
setCoinsRet.clear();
|
|
||||||
nValueRet = 0;
|
|
||||||
/*
|
|
||||||
// List of values less than target
|
|
||||||
pair<int64, pair<const CWalletTx*,unsigned int> > coinLowestLarger;
|
|
||||||
coinLowestLarger.first = std::numeric_limits<int64>::max();
|
|
||||||
coinLowestLarger.second.first = NULL;
|
|
||||||
vector<pair<int64, pair<const CWalletTx*,unsigned int> > > vValue;
|
|
||||||
int64 nTotalLower = 0;
|
|
||||||
|
|
||||||
random_shuffle(vCoins.begin(), vCoins.end(), GetRandInt);
|
|
||||||
|
|
||||||
BOOST_FOREACH(COutput output, vCoins)
|
|
||||||
{
|
|
||||||
const CWalletTx *pcoin = output.tx;
|
|
||||||
|
|
||||||
if (output.nDepth < (pcoin->IsFromMe() ? nConfMine : nConfTheirs))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int i = output.i;
|
|
||||||
int64 n = pcoin->vout[i].nValue;
|
|
||||||
|
|
||||||
pair<int64,pair<const CWalletTx*,unsigned int> > coin = make_pair(n,make_pair(pcoin, i));
|
|
||||||
|
|
||||||
if (n == nTargetValue)
|
|
||||||
{
|
|
||||||
setCoinsRet.insert(coin.second);
|
|
||||||
nValueRet += coin.first;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else if (n < nTargetValue + CENT)
|
|
||||||
{
|
|
||||||
vValue.push_back(coin);
|
|
||||||
nTotalLower += n;
|
|
||||||
}
|
|
||||||
else if (n < coinLowestLarger.first)
|
|
||||||
{
|
|
||||||
coinLowestLarger = coin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nTotalLower == nTargetValue)
|
|
||||||
{
|
|
||||||
for (unsigned int i = 0; i < vValue.size(); ++i)
|
|
||||||
{
|
|
||||||
setCoinsRet.insert(vValue[i].second);
|
|
||||||
nValueRet += vValue[i].first;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nTotalLower < nTargetValue)
|
|
||||||
{
|
|
||||||
if (coinLowestLarger.second.first == NULL)
|
|
||||||
return false;
|
|
||||||
setCoinsRet.insert(coinLowestLarger.second);
|
|
||||||
nValueRet += coinLowestLarger.first;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Solve subset sum by stochastic approximation
|
|
||||||
sort(vValue.rbegin(), vValue.rend(), CompareValueOnly());
|
|
||||||
vector<char> vfBest;
|
|
||||||
int64 nBest;
|
|
||||||
|
|
||||||
ApproximateBestSubset(vValue, nTotalLower, nTargetValue, vfBest, nBest, 1000);
|
|
||||||
if (nBest != nTargetValue && nTotalLower >= nTargetValue + CENT)
|
|
||||||
ApproximateBestSubset(vValue, nTotalLower, nTargetValue + CENT, vfBest, nBest, 1000);
|
|
||||||
|
|
||||||
// If we have a bigger coin and (either the stochastic approximation didn't find a good solution,
|
|
||||||
// or the next bigger coin is closer), return the bigger coin
|
|
||||||
if (coinLowestLarger.second.first &&
|
|
||||||
((nBest != nTargetValue && nBest < nTargetValue + CENT) || coinLowestLarger.first <= nBest))
|
|
||||||
{
|
|
||||||
setCoinsRet.insert(coinLowestLarger.second);
|
|
||||||
nValueRet += coinLowestLarger.first;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (unsigned int i = 0; i < vValue.size(); i++)
|
|
||||||
if (vfBest[i])
|
|
||||||
{
|
|
||||||
setCoinsRet.insert(vValue[i].second);
|
|
||||||
nValueRet += vValue[i].first;
|
|
||||||
}
|
|
||||||
|
|
||||||
//// debug print
|
|
||||||
printf("SelectCoins() best subset: ");
|
|
||||||
for (unsigned int i = 0; i < vValue.size(); i++)
|
|
||||||
if (vfBest[i])
|
|
||||||
printf("%s ", FormatMoney(vValue[i].first).c_str());
|
|
||||||
printf("total %s\n", FormatMoney(nBest).c_str());
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CWallet::SelectCoins(int64 nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64& nValueRet) const
|
|
||||||
{
|
|
||||||
vector<COutput> vCoins;
|
|
||||||
AvailableCoins(vCoins);
|
|
||||||
|
|
||||||
return (SelectCoinsMinConf(nTargetValue, 1, 6, vCoins, setCoinsRet, nValueRet) ||
|
|
||||||
SelectCoinsMinConf(nTargetValue, 1, 1, vCoins, setCoinsRet, nValueRet) ||
|
|
||||||
SelectCoinsMinConf(nTargetValue, 0, 1, vCoins, setCoinsRet, nValueRet));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend,
|
bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend,
|
||||||
CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason)
|
CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, std::string& strFailReason)
|
||||||
|
|||||||
@ -70,8 +70,6 @@ public:
|
|||||||
class CWallet : public CCryptoKeyStore
|
class CWallet : public CCryptoKeyStore
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
bool SelectCoins(int64 nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64& nValueRet) const;
|
|
||||||
|
|
||||||
CWalletDB *pwalletdbEncryption;
|
CWalletDB *pwalletdbEncryption;
|
||||||
|
|
||||||
// the current wallet version: clients below this version are not able to load the wallet
|
// the current wallet version: clients below this version are not able to load the wallet
|
||||||
@ -129,7 +127,6 @@ public:
|
|||||||
bool CanSupportFeature(enum WalletFeature wf) { return nWalletMaxVersion >= wf; }
|
bool CanSupportFeature(enum WalletFeature wf) { return nWalletMaxVersion >= wf; }
|
||||||
|
|
||||||
void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true) const;
|
void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true) const;
|
||||||
bool SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, int64& nValueRet) const;
|
|
||||||
bool IsLockedCoin(uint256 hash, unsigned int n) const;
|
bool IsLockedCoin(uint256 hash, unsigned int n) const;
|
||||||
void LockCoin(COutPoint& output);
|
void LockCoin(COutPoint& output);
|
||||||
void UnlockCoin(COutPoint& output);
|
void UnlockCoin(COutPoint& output);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user