Created
December 26, 2013 00:07
-
-
Save jaekwon/8128126 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/init.cpp b/src/init.cpp | |
index b358734..45bf9f7 100644 | |
--- a/src/init.cpp | |
+++ b/src/init.cpp | |
@@ -415,7 +415,7 @@ bool AppInit2() | |
{ | |
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) | |
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"].c_str())); | |
- if (nTransactionFee > 0.25 * COIN) | |
+ if (nTransactionFee > 25.0 * COIN) | |
InitWarning(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.")); | |
} | |
diff --git a/src/main.h b/src/main.h | |
index c5777c6..bb63cc7 100644 | |
--- a/src/main.h | |
+++ b/src/main.h | |
@@ -31,7 +31,7 @@ static const unsigned int MAX_BLOCK_SIZE = 1000000; | |
static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; | |
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; | |
static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; | |
-static const int64 MIN_TX_FEE = 10000; | |
+static const int64 MIN_TX_FEE = 100000000; | |
static const int64 MIN_RELAY_TX_FEE = MIN_TX_FEE; | |
static const int64 MAX_MONEY = 500000000 * COIN; // DogeCoin: maximum of 100B coins (given some randomness), max transaction 500,000,000 for now | |
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } | |
diff --git a/src/wallet.cpp b/src/wallet.cpp | |
index f828261..f710d83 100644 | |
--- a/src/wallet.cpp | |
+++ b/src/wallet.cpp | |
@@ -1125,7 +1125,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW | |
// if sub-cent change is required, the fee must be raised to at least MIN_TX_FEE | |
// or until nChange becomes zero | |
// NOTE: this depends on the exact behaviour of GetMinFee | |
- if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < CENT) | |
+ if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < COIN) | |
{ | |
int64 nMoveToFee = min(nChange, MIN_TX_FEE - nFeeRet); | |
nChange -= nMoveToFee; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment