diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-12-13 16:19:17 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-01-16 08:40:40 -0500 |
| commit | eb30d1a5b215c6dd3763d7f7948f2dd8cb61f6bf (patch) | |
| tree | 4145415de105b56023c630c9da4e421971793981 /src/policy | |
| parent | 7b1add3c28aae8caf2e1517f15cd953eacbb4931 (diff) | |
| download | bitcoin-eb30d1a5b215c6dd3763d7f7948f2dd8cb61f6bf.tar.xz | |
Introduce -dustrelayfee
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.cpp | 3 | ||||
| -rw-r--r-- | src/policy/policy.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 4dacd6b545..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; } @@ -207,6 +207,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) } 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) diff --git a/src/policy/policy.h b/src/policy/policy.h index 039122a59e..9b1323ac26 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -40,6 +40,12 @@ static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100; static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80; /** The maximum size of a standard witnessScript */ static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600; +/** Min feerate for defining dust. Historically this has been the same as the + * minRelayTxFee, however changing the dust limit changes which transactions are + * standard and should be done with care and ideally rarely. It makes sense to + * only increase the dust limit after prior releases were already not creating + * outputs below the new threshold */ +static const unsigned int DUST_RELAY_TX_FEE = 1000; /** * Standard script verification flags that standard transactions will comply * with. However scripts violating these flags may still be present in valid @@ -88,6 +94,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs); extern CFeeRate incrementalRelayFee; +extern CFeeRate dustRelayFee; extern unsigned int nBytesPerSigOp; /** Compute the virtual transaction size (weight reinterpreted as bytes). */ |