Changed MIN_TX_FEE to 1DOG, changed others to 100x

jaekwon · jaekwon · commit a6497846bf7f · 2013-12-25T17:29:55.000-08:00
diff --git 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.cpp b/src/main.cpp
@@ -61,7 +61,7 @@ int64 nHPSTimerStart;
 
 // Settings
 int64 nTransactionFee = 0;
-int64 nMinimumInputValue = CENT / 100;
+int64 nMinimumInputValue = CENT;
 
 
 
diff --git 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); }
@@ -540,7 +540,7 @@ class CTransaction
     {
         // Large (in bytes) low-priority (new, small-coin) transactions
         // need a fee.
-        return dPriority > COIN * 1440 / 250; // DogeCoin: 1440 blocks found a day. Priority cutoff is 1 dogecoin day / 250 bytes.
+        return dPriority > 100 * COIN * 1440 / 250; // DogeCoin: 1440 blocks found a day. Priority cutoff is 100 dogecoin day / 250 bytes.
     }
 
     int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const
@@ -569,9 +569,9 @@ class CTransaction
             }
         }
 
-        // To limit dust spam, add MIN_TX_FEE/MIN_RELAY_TX_FEE for any output that is less than 0.01
+        // To limit dust spam, add MIN_TX_FEE/MIN_RELAY_TX_FEE for any output that is less than 1.00
         BOOST_FOREACH(const CTxOut& txout, vout)
-            if (txout.nValue < CENT)
+            if (txout.nValue < COIN)
                 nMinFee += nBaseFee;
 
         // Raise the price as the block approaches full
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ bool AppInit2()`
`415`	`415`	`{`
`416`	`416`	`if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))`
`417`	`417`	`return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"].c_str()));`
`418`		`- if (nTransactionFee > 0.25 * COIN)`
	`418`	`+ if (nTransactionFee > 25.0 * COIN)`
`419`	`419`	`InitWarning(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."));`
`420`	`420`	`}`
`421`	`421`
Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW`
`1125`	`1125`	`// if sub-cent change is required, the fee must be raised to at least MIN_TX_FEE`
`1126`	`1126`	`// or until nChange becomes zero`
`1127`	`1127`	`// NOTE: this depends on the exact behaviour of GetMinFee`
`1128`		`- if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < CENT)`
	`1128`	`+ if (nFeeRet < MIN_TX_FEE && nChange > 0 && nChange < COIN)`
`1129`	`1129`	`{`
`1130`	`1130`	`int64 nMoveToFee = min(nChange, MIN_TX_FEE - nFeeRet);`
`1131`	`1131`	`nChange -= nMoveToFee;`