diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-05-08 10:40:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-05-08 10:48:07 +0200 |
| commit | 0ecd8aae203f87850672d4cd1166dfd77e4aeb72 (patch) | |
| tree | 05839997b0375e825057c7e6a7dcaf04ddf526e6 /src/wallet.cpp | |
| parent | Merge pull request #4141 (diff) | |
| parent | add DEFAULT_TRANSACTION_FEE constant in wallet (diff) | |
| download | discoin-0ecd8aae203f87850672d4cd1166dfd77e4aeb72.tar.xz discoin-0ecd8aae203f87850672d4cd1166dfd77e4aeb72.zip | |
Merge pull request #4131
3e1cf9b add DEFAULT_TRANSACTION_FEE constant in wallet (Philip Kaufmann)
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 7cf236109..418720de9 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -6,9 +6,9 @@ #include "wallet.h" #include "base58.h" +#include "checkpoints.h" #include "coincontrol.h" #include "net.h" -#include "checkpoints.h" #include <boost/algorithm/string/replace.hpp> #include <openssl/rand.h> @@ -16,7 +16,7 @@ using namespace std; // Settings -int64_t nTransactionFee = 0; +int64_t nTransactionFee = DEFAULT_TRANSACTION_FEE; bool bSpendZeroConfChange = true; ////////////////////////////////////////////////////////////////////////////// |