diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-04 10:15:39 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-04 10:15:39 -0700 |
| commit | 33edd0a477f4448be9c6c4949fbff4e53f16cac6 (patch) | |
| tree | 52fce70249d5eff657c7cad299c84beaf85efcfe /src/main.h | |
| parent | f309cb76c2c932317307d51961ca25cf051eb255 (diff) | |
| parent | 000dc55181f77cd96076c76b2cc13f8bcbe4146e (diff) | |
| download | bitcoin-33edd0a477f4448be9c6c4949fbff4e53f16cac6.tar.xz | |
Merge pull request #2577 from gavinandresen/fee_bandaid
Treat dust outputs as non-standard, un-hardcode TX_FEE constants
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.h b/src/main.h index e02edbc529..cba8421c85 100644 --- a/src/main.h +++ b/src/main.h @@ -44,10 +44,6 @@ static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB /** Fake height value used in CCoins to signify they are only in the memory pool (since 0.8) */ static const unsigned int MEMPOOL_HEIGHT = 0x7FFFFFFF; -/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ -static const int64 MIN_TX_FEE = 10000; -/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ -static const int64 MIN_RELAY_TX_FEE = 10000; /** No amount larger than this (in satoshi) is valid */ static const int64 MAX_MONEY = 21000000 * COIN; inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } @@ -439,6 +435,8 @@ public: return !(a == b); } + bool IsDust() const; + std::string ToString() const { if (scriptPubKey.size() < 6) @@ -467,6 +465,8 @@ enum GetMinFee_mode class CTransaction { public: + static int64 nMinTxFee; + static int64 nMinRelayTxFee; static const int CURRENT_VERSION=1; int nVersion; std::vector<CTxIn> vin; |