diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-16 19:32:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-16 19:33:08 +0100 |
| commit | dd98f045382428f450dc917a3933c9e4e8e1ba99 (patch) | |
| tree | 3dcc0f69a886c8eb4fee8378447ca4a15031b22d /src/policy/policy.cpp | |
| parent | 8a445c5651edb9a1f51497055b7ddf4402be9188 (diff) | |
| parent | eb30d1a5b215c6dd3763d7f7948f2dd8cb61f6bf (diff) | |
| download | bitcoin-dd98f045382428f450dc917a3933c9e4e8e1ba99.tar.xz | |
Merge #9380: Separate different uses of minimum fees
eb30d1a Introduce -dustrelayfee (Alex Morcos)
7b1add3 Introduce -incrementalrelayfee (Alex Morcos)
daec955 Introduce -blockmintxfee (Alex Morcos)
Diffstat (limited to 'src/policy/policy.cpp')
| -rw-r--r-- | src/policy/policy.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index d318a0997c..ec398f6627 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -105,7 +105,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) { reason = "bare-multisig"; return false; - } else if (txout.IsDust(::minRelayTxFee)) { + } else if (txout.IsDust(dustRelayFee)) { reason = "dust"; return false; } @@ -206,6 +206,8 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) return true; } +CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE); +CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE); unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP; int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost) |