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

Restore CalculateMaximumSignedTxSize function signature

Browse source
This commit is contained in:
Jonas Schnelli 2017-03-28 08:56:35 +02:00
parent 51ea44f01c
commit bb78c1599e
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/feebumper.cpp
View file

@ -20,7 +20,7 @@
// calculation, but we should be able to refactor after priority is removed). // calculation, but we should be able to refactor after priority is removed).
// NOTE: this requires that all inputs must be in mapWallet (eg the tx should // NOTE: this requires that all inputs must be in mapWallet (eg the tx should
// be IsAllFromMe). // be IsAllFromMe).
int64_t CalculateMaximumSignedTxSize(const CWallet *pWallet, const CTransaction &tx) int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *pWallet)
{ {
CMutableTransaction txNew(tx); CMutableTransaction txNew(tx);
std::vector<std::pair<const CWalletTx *, unsigned int>> vCoins; std::vector<std::pair<const CWalletTx *, unsigned int>> vCoins;
@ -120,7 +120,7 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf
// Calculate the expected size of the new transaction. // Calculate the expected size of the new transaction.
int64_t txSize = GetVirtualTransactionSize(*(wtx.tx)); int64_t txSize = GetVirtualTransactionSize(*(wtx.tx));
const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(pWallet, *wtx.tx); const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(*wtx.tx, pWallet);
if (maxNewTxSize < 0) { if (maxNewTxSize < 0) {
vErrors.push_back("Transaction contains inputs that cannot be signed"); vErrors.push_back("Transaction contains inputs that cannot be signed");
currentResult = BumpFeeResult::INVALID_ADDRESS_OR_KEY; currentResult = BumpFeeResult::INVALID_ADDRESS_OR_KEY;