Merge pull request #5831
1d9b378qa/rpc-tests/wallet: Tests for sendmany (Luke Dashjr)40a7573rpcwallet/sendmany: Just take an array of addresses to subtract fees from, rather than an Object with all values being identical (Luke Dashjr)292623aSubtract fee from amount (Cozz Lovan)90a43c1[Qt] Code-movement-only: Format confirmation message in sendcoinsdialog (Cozz Lovan)
This commit is contained in:
@@ -135,7 +135,7 @@ public:
|
||||
|
||||
uint256 GetHash() const;
|
||||
|
||||
bool IsDust(CFeeRate minRelayTxFee) const
|
||||
CAmount GetDustThreshold(const CFeeRate &minRelayTxFee) const
|
||||
{
|
||||
// "Dust" is defined in terms of CTransaction::minRelayTxFee,
|
||||
// which has units satoshis-per-kilobyte.
|
||||
@@ -146,7 +146,12 @@ public:
|
||||
// so dust is a txout less than 546 satoshis
|
||||
// with default minRelayTxFee.
|
||||
size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
|
||||
return (nValue < 3*minRelayTxFee.GetFee(nSize));
|
||||
return 3*minRelayTxFee.GetFee(nSize);
|
||||
}
|
||||
|
||||
bool IsDust(const CFeeRate &minRelayTxFee) const
|
||||
{
|
||||
return (nValue < GetDustThreshold(minRelayTxFee));
|
||||
}
|
||||
|
||||
friend bool operator==(const CTxOut& a, const CTxOut& b)
|
||||
|
||||
Reference in New Issue
Block a user