LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

feebumper: Use PreconditionChecks to determine bump eligibility

Browse source
This commit is contained in:
MarcoFalke 2018-01-29 18:25:35 -05:00
parent 718f05cab5
commit faca18dcf4
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/feebumper.cpp
View file

@ -89,11 +89,15 @@ static feebumper::Result PreconditionChecks(const CWallet* wallet, const CWallet
namespace feebumper { namespace feebumper {
bool TransactionCanBeBumped(CWallet* wallet, const uint256& txid) bool TransactionCanBeBumped(const CWallet* wallet, const uint256& txid)
{ {
LOCK2(cs_main, wallet->cs_wallet); LOCK2(cs_main, wallet->cs_wallet);
const CWalletTx* wtx = wallet->GetWalletTx(txid); const CWalletTx* wtx = wallet->GetWalletTx(txid);
return wtx && SignalsOptInRBF(*wtx->tx) && !wtx->mapValue.count("replaced_by_txid"); if (wtx == nullptr) return false;
std::vector<std::string> errors_dummy;
feebumper::Result res = PreconditionChecks(wallet, *wtx, errors_dummy);
return res == feebumper::Result::OK;
} }
Result CreateTransaction(const CWallet* wallet, const uint256& txid, const CCoinControl& coin_control, CAmount total_fee, std::vector<std::string>& errors, Result CreateTransaction(const CWallet* wallet, const uint256& txid, const CCoinControl& coin_control, CAmount total_fee, std::vector<std::string>& errors,

2
src/wallet/feebumper.h
View file

@ -26,7 +26,7 @@ enum class Result
}; };
//! Return whether transaction can be bumped. //! Return whether transaction can be bumped.
bool TransactionCanBeBumped(CWallet* wallet, const uint256& txid); bool TransactionCanBeBumped(const CWallet* wallet, const uint256& txid);
//! Create bumpfee transaction. //! Create bumpfee transaction.
Result CreateTransaction(const CWallet* wallet, Result CreateTransaction(const CWallet* wallet,