diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -237,7 +237,7 @@ * Pass this transaction to the mempool. Fails if absolute fee exceeds * absurd fee. */ - bool AcceptToMemoryPool(const CAmount &nAbsurdFee, CValidationState &state); + bool AcceptToMemoryPool(const Amount nAbsurdFee, CValidationState &state); bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1804,7 +1804,7 @@ LOCK(mempool.cs); CValidationState state; - wtx.AcceptToMemoryPool(maxTxFee.GetSatoshis(), state); + wtx.AcceptToMemoryPool(maxTxFee, state); } } @@ -1816,7 +1816,7 @@ CValidationState state; // GetDepthInMainChain already catches known conflicts. - if (InMempool() || AcceptToMemoryPool(maxTxFee.GetSatoshis(), state)) { + if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) { LogPrintf("Relaying wtx %s\n", GetId().ToString()); if (connman) { CInv inv(MSG_TX, GetId()); @@ -3056,7 +3056,7 @@ if (fBroadcastTransactions) { // Broadcast - if (!wtxNew.AcceptToMemoryPool(maxTxFee.GetSatoshis(), state)) { + if (!wtxNew.AcceptToMemoryPool(maxTxFee, state)) { LogPrintf("CommitTransaction(): Transaction cannot be " "broadcast immediately, %s\n", state.GetRejectReason()); @@ -4486,7 +4486,7 @@ return std::max(0, (COINBASE_MATURITY + 1) - GetDepthInMainChain()); } -bool CMerkleTx::AcceptToMemoryPool(const CAmount &nAbsurdFee, +bool CMerkleTx::AcceptToMemoryPool(const Amount nAbsurdFee, CValidationState &state) { return ::AcceptToMemoryPool(GetConfig(), mempool, state, tx, true, nullptr, nullptr, false, nAbsurdFee);