fixed a fee issue and added latest checkpoints

Author: deeponion

src/checkpoints.cpp

@@ -53,6 +53,8 @@ namespace Checkpoints
 	    (1200000, uint256("0x0000000000044a81ecdf2d5d7b6a314ddc23d6aade3e3c91724c5b16ae70a081"))
 	    (1250000, uint256("0x000000000001ef93e11ef086b7df375f8312c2b504d63655f96c9240b142d43c"))
 	    (1300021, uint256("0x000000000000e4f01a75810a68958b831435d8d8778badda7cc108b0f1837180"))
+	    (1350006, uint256("0x00000000000283363cc3b6932640850e39c09b5e8989a1bc55cc5e074d737a61"))
+	    (1390072, uint256("0x000000000004cd4562361ac51ccd1887cf615ec4f142be6a551b92e2bd9c16ea"))
 		;
 
     // TestNet has no checkpoints

src/clientversion.h

@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       8
-#define CLIENT_VERSION_REVISION    3
+#define CLIENT_VERSION_REVISION    5
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

src/kernel.cpp

@@ -46,6 +46,8 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
     (1200000, 0x4328bd8fu)
     (1250000, 0xa3689d70u)
     (1300021, 0x6fa62d97u)
+    (1350006, 0x469c6019u)
+    (1390072, 0xaf6e8a1du)
 	;
 
 // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet)

src/main.cpp

@@ -82,7 +82,7 @@ int64_t nTransactionFee = MIN_TX_FEE_NEW;
 int64_t nReserveBalance = 0;
 int64_t nMinimumInputValue = 0;
 
-static const int NUM_OF_POW_CHECKPOINT = 29;
+static const int NUM_OF_POW_CHECKPOINT = 31;
 static const int checkpointPoWHeight[NUM_OF_POW_CHECKPOINT][2] =
 {
 		{   9601,   4611},
@@ -114,6 +114,8 @@ static const int checkpointPoWHeight[NUM_OF_POW_CHECKPOINT][2] =
 		{1200000, 235100},
 		{1250000, 243054},
 		{1300021, 252612},
+		{1350006, 261895},
+		{1390072, 269386},
 };
 
 extern enum Checkpoints::CPMode CheckpointsMode;
@@ -135,7 +137,10 @@ int64_t GetMinTxFee()
 
 	if(pindexBest->nHeight < SWITCH_BLOCK_HARD_FORK && !fTestNet)
 		return MIN_TX_FEE; 
-
+	
+	if((pindexBest->nHeight > SWITCH_BLOCK_DSBUG_START && pindexBest->nHeight < SWITCH_BLOCK_DSBUG_END) && !fTestNet)
+		return MIN_TX_FEE_NEW2;
+	
 	return MIN_TX_FEE_NEW;	
 }
 
@@ -146,7 +151,10 @@ int64_t GetMinRelayTxFee()
 
 	if(pindexBest->nHeight < SWITCH_BLOCK_HARD_FORK && !fTestNet)
 		return MIN_RELAY_TX_FEE; 
- 
+
+	if((pindexBest->nHeight > SWITCH_BLOCK_DSBUG_START && pindexBest->nHeight < SWITCH_BLOCK_DSBUG_END) && !fTestNet)
+		return MIN_RELAY_TX_FEE_NEW2;
+
 	return MIN_RELAY_TX_FEE_NEW;	
 }
 
@@ -1718,7 +1726,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map<uint256, CTx
 
             // enforce transaction fees for every block
             if (nTxFee < GetMinFee())
-                return fBlock? DoS(100, error("ConnectInputs() : %s not paying required fee=%s, paid=%s", GetHash().ToString().substr(0,10).c_str(), FormatMoney(GetMinFee()).c_str(), FormatMoney(nTxFee).c_str())) : false;
+                return fBlock? DoS(100, error("ConnectInputs() : %s not paying required fee=%s, paid=%s", GetHash().ToString().c_str(), FormatMoney(GetMinFee()).c_str(), FormatMoney(nTxFee).c_str())) : false;
 
             nFees += nTxFee;
             if (!MoneyRange(nFees))

src/main.h

@@ -35,11 +35,15 @@ static const unsigned int MAX_INV_SZ = 50000;
 static const int64_t MIN_TX_FEE = 100000;
 static const int64_t MIN_RELAY_TX_FEE = MIN_TX_FEE;
 static const int64_t MIN_TX_FEE_NEW = 10000;
+static const int64_t MIN_TX_FEE_NEW2 = 5000;
 static const int64_t MIN_RELAY_TX_FEE_NEW = MIN_TX_FEE_NEW;
+static const int64_t MIN_RELAY_TX_FEE_NEW2 = MIN_TX_FEE_NEW2;
 static const int64_t MAX_MONEY = 25000000 * COIN;
 static const int64_t MAX_PROOF_OF_STAKE_STABLE = 0.01 * COIN;	
 static const int64_t MIN_TXOUT_AMOUNT = MIN_TX_FEE_NEW;
 static const int SWITCH_BLOCK_HARD_FORK = 540000;
+static const int SWITCH_BLOCK_DSBUG_START = 1377000;
+static const int SWITCH_BLOCK_DSBUG_END = 1423000;
 
 inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 // Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp.