diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:57:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:58:00 +0100 |
| commit | 9fa54a1b0c1ae1b12c292d5cb3158c58c975eb24 (patch) | |
| tree | a6c750dc620b99c57d7b887da54c467a91218cb4 /src/primitives/transaction.h | |
| parent | 755b4ba848bc61c6c0a858aba042739f34fe37ff (diff) | |
| parent | e20d9245e58bafdab51105c985478ccb3e0c9095 (diff) | |
| download | bitcoin-9fa54a1b0c1ae1b12c292d5cb3158c58c975eb24.tar.xz | |
Merge pull request #6822
e20d924 [trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE (MarcoFalke)
536766c [trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000 (MarcoFalke)
5f46a7d transaction_tests: Be more strict checking dust (MarcoFalke)
Diffstat (limited to 'src/primitives/transaction.h')
| -rw-r--r-- | src/primitives/transaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 2a457cdae7..98882d315e 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -143,8 +143,8 @@ public: // to spend something, then we consider it dust. // A typical spendable txout is 34 bytes big, and will // need a CTxIn of at least 148 bytes to spend: - // so dust is a spendable txout less than 546 satoshis - // with default minRelayTxFee. + // so dust is a spendable txout less than + // 546*minRelayTxFee/1000 (in satoshis) if (scriptPubKey.IsUnspendable()) return 0; |