Move output eligibility to a separate function
This commit is contained in:
parent
0185939be6
commit
ce7435cf1e
2 changed files with 19 additions and 12 deletions
|
@ -2484,6 +2484,20 @@ static void ApproximateBestSubset(const std::vector<CInputCoin>& vValue, const C
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CWallet::OutputEligibleForSpending(const COutput& output, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors) const
|
||||||
|
{
|
||||||
|
if (!output.fSpendable)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (output.nDepth < (output.tx->IsFromMe(ISMINE_ALL) ? nConfMine : nConfTheirs))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!mempool.TransactionWithinChainLimit(output.tx->GetHash(), nMaxAncestors))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, std::vector<COutput> vCoins,
|
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, std::vector<COutput> vCoins,
|
||||||
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet) const
|
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet) const
|
||||||
{
|
{
|
||||||
|
@ -2499,20 +2513,10 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
|
||||||
|
|
||||||
for (const COutput &output : vCoins)
|
for (const COutput &output : vCoins)
|
||||||
{
|
{
|
||||||
if (!output.fSpendable)
|
if (!OutputEligibleForSpending(output, nConfMine, nConfTheirs, nMaxAncestors))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
const CWalletTx *pcoin = output.tx;
|
CInputCoin coin = CInputCoin(output.tx, output.i);
|
||||||
|
|
||||||
if (output.nDepth < (pcoin->IsFromMe(ISMINE_ALL) ? nConfMine : nConfTheirs))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!mempool.TransactionWithinChainLimit(pcoin->GetHash(), nMaxAncestors))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int i = output.i;
|
|
||||||
|
|
||||||
CInputCoin coin = CInputCoin(pcoin, i);
|
|
||||||
|
|
||||||
if (coin.txout.nValue == nTargetValue)
|
if (coin.txout.nValue == nTargetValue)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1190,6 +1190,9 @@ public:
|
||||||
* This function will automatically add the necessary scripts to the wallet.
|
* This function will automatically add the necessary scripts to the wallet.
|
||||||
*/
|
*/
|
||||||
CTxDestination AddAndGetDestinationForScript(const CScript& script, OutputType);
|
CTxDestination AddAndGetDestinationForScript(const CScript& script, OutputType);
|
||||||
|
|
||||||
|
/** Whether a given output is spendable by this wallet */
|
||||||
|
bool OutputEligibleForSpending(const COutput& output, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** A key allocated from the key pool. */
|
/** A key allocated from the key pool. */
|
||||||
|
|
Loading…
Reference in a new issue