Skip to content

Commit

Permalink
Restore CalculateMaximumSignedTxSize function signature
Browse files Browse the repository at this point in the history
  • Loading branch information
jonasschnelli committed Apr 2, 2017
1 parent 51ea44f commit bb78c15
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/wallet/feebumper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// 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
// be IsAllFromMe).
int64_t CalculateMaximumSignedTxSize(const CWallet *pWallet, const CTransaction &tx)
int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *pWallet)
{
CMutableTransaction txNew(tx);
std::vector<std::pair<const CWalletTx *, unsigned int>> vCoins;
Expand Down Expand Up @@ -120,7 +120,7 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf

// Calculate the expected size of the new transaction.
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) {
vErrors.push_back("Transaction contains inputs that cannot be signed");
currentResult = BumpFeeResult::INVALID_ADDRESS_OR_KEY;
Expand Down

0 comments on commit bb78c15

Please sign in to comment.