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

Merge remote branch 'refs/remotes/svn/trunk' into svn

Browse Source
This commit is contained in:
Gavin Andresen 2010-11-09 17:10:43 -05:00
commit 695aa2d5a2
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.cpp
View File

@ -3400,7 +3400,7 @@ int64 GetBalance()
} }
bool SelectCoins(int64 nTargetValue, set<CWalletTx*>& setCoinsRet) bool SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfTheirs, set<CWalletTx*>& setCoinsRet)
{ {
setCoinsRet.clear(); setCoinsRet.clear();
@ -3422,6 +3422,11 @@ bool SelectCoins(int64 nTargetValue, set<CWalletTx*>& setCoinsRet)
{ {
if (!pcoin->IsFinal() || pcoin->fSpent || !pcoin->IsConfirmed()) if (!pcoin->IsFinal() || pcoin->fSpent || !pcoin->IsConfirmed())
continue; continue;
int nDepth = pcoin->GetDepthInMainChain();
if (nDepth < (pcoin->IsFromMe() ? nConfMine : nConfTheirs))
continue;
int64 n = pcoin->GetCredit(); int64 n = pcoin->GetCredit();
if (n <= 0) if (n <= 0)
continue; continue;
@ -3506,6 +3511,13 @@ bool SelectCoins(int64 nTargetValue, set<CWalletTx*>& setCoinsRet)
return true; return true;
} }
bool SelectCoins(int64 nTargetValue, set<CWalletTx*>& setCoinsRet)
{
return (SelectCoinsMinConf(nTargetValue, 1, 6, setCoinsRet) ||
SelectCoinsMinConf(nTargetValue, 1, 1, setCoinsRet) ||
SelectCoinsMinConf(nTargetValue, 0, 1, setCoinsRet));
}

22
main.h
View File

@ -487,6 +487,11 @@ public:
return false; return false;
} }
bool IsFromMe() const
{
return (GetDebit() > 0);
}
int64 GetDebit() const int64 GetDebit() const
{ {
int64 nDebit = 0; int64 nDebit = 0;
@ -789,8 +794,23 @@ public:
return nCreditCached; return nCreditCached;
} }
bool IsFromMe() const
{
return (GetDebit() > 0);
}
bool IsConfirmed() const bool IsConfirmed() const
{ {
// Quick answer in most cases
if (!IsFinal())
return false;
if (GetDepthInMainChain() >= 1)
return true;
if (!IsFromMe()) // using wtx's cached debit
return false;
// If no confirmations but it's from us, we can still
// consider it confirmed if all dependencies are confirmed
map<uint256, const CMerkleTx*> mapPrev; map<uint256, const CMerkleTx*> mapPrev;
vector<const CMerkleTx*> vWorkQueue; vector<const CMerkleTx*> vWorkQueue;
vWorkQueue.reserve(vtxPrev.size()+1); vWorkQueue.reserve(vtxPrev.size()+1);
@ -803,7 +823,7 @@ public:
return false; return false;
if (ptx->GetDepthInMainChain() >= 1) if (ptx->GetDepthInMainChain() >= 1)
return true; return true;
if (ptx->GetDebit() <= 0) if (!ptx->IsFromMe())
return false; return false;
if (mapPrev.empty()) if (mapPrev.empty())