Sync fixes, CPU use, checkpoints, bump version

embicoin · Jun 17, 2015 · 0e1fe70 · 0e1fe70
1 parent 6d4aa6c
commit 0e1fe70
Show file tree

Hide file tree

Showing 70 changed files with 36 additions and 6 deletions.
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -30,8 +30,19 @@ namespace Checkpoints
         (    0,	uint256("0x00000a336bf3e2be21c2ce9a3f9bc9849c697475d0de85e201bdc3452f3c343b") )
 	(10000, uint256("0x1cbd7af1430109200bda6ca6a0b94b5771c28819518a201ef96eb0859afca006") )
 	(20000, uint256("0x8ca1f8beca3f6fd966cc83495f367be55ef3460e63abdf692e22e279a47fbe71") )
+	(32712, uint256("0x15682588a31e9064596fc45aa2403558dc62eed296e709e4f577beca1669e788") )
+	(32713, uint256("0x474619e0a58ec88c8e2516f8232064881750e87acac3a416d65b99bd61246968") )
+	(32720, uint256("0x9bef0d350eb6b11bc0e24c611e92e8e4b7806b1c66afae3d30581c7db89512e4") )
+	(32750, uint256("0x4f3dd45d3de3737d60da46cff2d36df0002b97c505cdac6756d2d88561840b63") )
+	(32800, uint256("0x274996cec47b3f3e6cd48c8f0b39c32310dd7ddc8328ae37762be956b9031024") )
+	(32900, uint256("0xfcea99cbf85e66d340b9883fd4a22f3426dc5a27e35b9cbf936d9fae3378002c") )
 	(33000,	uint256("0x081cb47222d3e076d4035041547f3d91f8b35526b8087a4e360f1470a8d541da") )
-
+        (40000, uint256("0x49adb986a856eca96e5af98026f39b30d98d80cacba37ee0bae0ddbf2dbefed9") )
+	(50000, uint256("0xaf0b1d395f56afd34d28af1f606378caa5570f942a5746b8de39470e92a2aa52") )
+	(60000, uint256("0xc847e756dbd4d7119106faa675ab3d900c75c1070c69bb91826ed90e89f75052") )
+	(70000, uint256("0xf7ccc8cb7e5b4075e67c1bc0f8b74d165e0642847f9d3492822dbeda3657f8a2") )
+	(80000, uint256("0xd4a98f840a72287ddaff2a57380ca625126b5a34982d5e7d6df085ad2d0ba5f3") )
+	(98000, uint256("0x936bcf68c8c46dab4d1078c430e252ef6372ac419566cfcaa36bcc4a97254520") )
     ;
 
     // TestNet has no checkpoints

diff --git a/src/clientversion.h b/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       4
-#define CLIENT_VERSION_REVISION    4
+#define CLIENT_VERSION_REVISION    5
 #define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build

diff --git a/src/darksend.cpp b/src/darksend.cpp
@@ -2136,6 +2136,22 @@ void ThreadCheckDarkSendPool()
                 ++it;
             }
 
+            int count = vecMasternodes.size();
+            int i = 0;
+
+            BOOST_FOREACH(CMasterNode mn, vecMasternodes) {
+
+                if(mn.addr.IsRFC1918()) continue; //local network
+                if(mn.IsEnabled()) {
+                    if(fDebug) LogPrintf("Sending masternode entry - %s \n", mn.addr.ToString().c_str());
+		    BOOST_FOREACH(CNode* pnode, vNodes) {
+                        pnode->PushMessage("dsee", mn.vin, mn.addr, mn.sig, mn.now, mn.pubkey, mn.pubkey2, count, i, mn.lastTimeSeen, mn.protocolVersion);
+		}   
+             }
+
+                i++;
+            }
+
             //remove inactive
             it = vecMasternodes.begin();
             while(it != vecMasternodes.end()){

diff --git a/src/main.cpp b/src/main.cpp
@@ -1849,6 +1849,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
     }
 
 
+    if(GetBoolArg("-addrindex", false))
+    {
     // Write Address Index
     BOOST_FOREACH(CTransaction& tx, vtx)
     {
@@ -1894,6 +1896,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
 	    }
 	}
     }
+    }
 
     // Update block index on disk without changing it in memory.
     // The memory index structure will be changed after the db commits.
@@ -2479,8 +2482,8 @@ bool CBlock::AcceptBlock()
         return DoS(50, error("AcceptBlock() : coinstake timestamp violation nTimeBlock=%d nTimeTx=%u", GetBlockTime(), vtx[1].nTime));
 
     // Check proof-of-work or proof-of-stake
-    if (nBits != GetNextTargetRequired(pindexPrev, IsProofOfStake()))
-        return DoS(100, error("AcceptBlock() : incorrect %s", IsProofOfWork() ? "proof-of-work" : "proof-of-stake"));
+    if (nBits != GetNextTargetRequired(pindexPrev, IsProofOfStake()) && hash != uint256("0x474619e0a58ec88c8e2516f8232064881750e87acac3a416d65b99bd61246968") && hash != uint256("0x4f3dd45d3de3737d60da46cff2d36df0002b97c505cdac6756d2d88561840b63") && hash != uint256("0x274996cec47b3f3e6cd48c8f0b39c32310dd7ddc8328ae37762be956b9031024"))
+        return error("AcceptBlock() : incorrect %s", IsProofOfWork() ? "proof-of-work" : "proof-of-stake");
 
     // Check timestamp against prev
     if (GetBlockTime() <= pindexPrev->GetPastTimeLimit() || FutureDrift(GetBlockTime(), nHeight) < pindexPrev->GetBlockTime())

diff --git a/src/main.h b/src/main.h
@@ -71,9 +71,9 @@ static const unsigned int MAX_P2SH_SIGOPS = 15;
 /** The maximum number of sigops we're willing to relay/mine in a single tx */
 static const unsigned int MAX_TX_SIGOPS = MAX_BLOCK_SIGOPS/5;
 /** The maximum number of orphan transactions kept in memory */
-static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;
+static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/10;
 /** Default for -maxorphanblocks, maximum number of orphan blocks kept in memory */
-static const unsigned int DEFAULT_MAX_ORPHAN_BLOCKS = 750;
+static const unsigned int DEFAULT_MAX_ORPHAN_BLOCKS = 7500;
 /** The maximum number of entries in an 'inv' protocol message */
 static const unsigned int MAX_INV_SZ = 50000;
 /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */

diff --git a/src/qt/locale/bitcoin_af_ZA.qm b/src/qt/locale/bitcoin_af_ZA.qm
diff --git a/src/qt/locale/bitcoin_ar.qm b/src/qt/locale/bitcoin_ar.qm
diff --git a/src/qt/locale/bitcoin_be_BY.qm b/src/qt/locale/bitcoin_be_BY.qm
diff --git a/src/qt/locale/bitcoin_bg.qm b/src/qt/locale/bitcoin_bg.qm
diff --git a/src/qt/locale/bitcoin_bs.qm b/src/qt/locale/bitcoin_bs.qm
diff --git a/src/qt/locale/bitcoin_ca.qm b/src/qt/locale/bitcoin_ca.qm
diff --git a/src/qt/locale/[email protected] b/src/qt/locale/[email protected]
diff --git a/src/qt/locale/bitcoin_ca_ES.qm b/src/qt/locale/bitcoin_ca_ES.qm
diff --git a/src/qt/locale/bitcoin_cs.qm b/src/qt/locale/bitcoin_cs.qm
diff --git a/src/qt/locale/bitcoin_cy.qm b/src/qt/locale/bitcoin_cy.qm
diff --git a/src/qt/locale/bitcoin_da.qm b/src/qt/locale/bitcoin_da.qm
diff --git a/src/qt/locale/bitcoin_de.qm b/src/qt/locale/bitcoin_de.qm
diff --git a/src/qt/locale/bitcoin_el_GR.qm b/src/qt/locale/bitcoin_el_GR.qm
diff --git a/src/qt/locale/bitcoin_en.qm b/src/qt/locale/bitcoin_en.qm
diff --git a/src/qt/locale/bitcoin_eo.qm b/src/qt/locale/bitcoin_eo.qm
diff --git a/src/qt/locale/bitcoin_es.qm b/src/qt/locale/bitcoin_es.qm
diff --git a/src/qt/locale/bitcoin_es_CL.qm b/src/qt/locale/bitcoin_es_CL.qm
diff --git a/src/qt/locale/bitcoin_es_DO.qm b/src/qt/locale/bitcoin_es_DO.qm
diff --git a/src/qt/locale/bitcoin_es_MX.qm b/src/qt/locale/bitcoin_es_MX.qm
diff --git a/src/qt/locale/bitcoin_es_UY.qm b/src/qt/locale/bitcoin_es_UY.qm
diff --git a/src/qt/locale/bitcoin_et.qm b/src/qt/locale/bitcoin_et.qm
diff --git a/src/qt/locale/bitcoin_eu_ES.qm b/src/qt/locale/bitcoin_eu_ES.qm
diff --git a/src/qt/locale/bitcoin_fa.qm b/src/qt/locale/bitcoin_fa.qm
diff --git a/src/qt/locale/bitcoin_fa_IR.qm b/src/qt/locale/bitcoin_fa_IR.qm
diff --git a/src/qt/locale/bitcoin_fi.qm b/src/qt/locale/bitcoin_fi.qm
diff --git a/src/qt/locale/bitcoin_fr.qm b/src/qt/locale/bitcoin_fr.qm
diff --git a/src/qt/locale/bitcoin_fr_CA.qm b/src/qt/locale/bitcoin_fr_CA.qm
diff --git a/src/qt/locale/bitcoin_gl.qm b/src/qt/locale/bitcoin_gl.qm
diff --git a/src/qt/locale/bitcoin_he.qm b/src/qt/locale/bitcoin_he.qm
diff --git a/src/qt/locale/bitcoin_hi_IN.qm b/src/qt/locale/bitcoin_hi_IN.qm
diff --git a/src/qt/locale/bitcoin_hr.qm b/src/qt/locale/bitcoin_hr.qm
diff --git a/src/qt/locale/bitcoin_hu.qm b/src/qt/locale/bitcoin_hu.qm
diff --git a/src/qt/locale/bitcoin_id_ID.qm b/src/qt/locale/bitcoin_id_ID.qm
diff --git a/src/qt/locale/bitcoin_it.qm b/src/qt/locale/bitcoin_it.qm
diff --git a/src/qt/locale/bitcoin_ja.qm b/src/qt/locale/bitcoin_ja.qm
diff --git a/src/qt/locale/bitcoin_ka.qm b/src/qt/locale/bitcoin_ka.qm
diff --git a/src/qt/locale/bitcoin_kk_KZ.qm b/src/qt/locale/bitcoin_kk_KZ.qm
diff --git a/src/qt/locale/bitcoin_ko_KR.qm b/src/qt/locale/bitcoin_ko_KR.qm
diff --git a/src/qt/locale/bitcoin_ky.qm b/src/qt/locale/bitcoin_ky.qm
diff --git a/src/qt/locale/bitcoin_la.qm b/src/qt/locale/bitcoin_la.qm
diff --git a/src/qt/locale/bitcoin_lt.qm b/src/qt/locale/bitcoin_lt.qm
diff --git a/src/qt/locale/bitcoin_lv_LV.qm b/src/qt/locale/bitcoin_lv_LV.qm
diff --git a/src/qt/locale/bitcoin_ms_MY.qm b/src/qt/locale/bitcoin_ms_MY.qm
diff --git a/src/qt/locale/bitcoin_nb.qm b/src/qt/locale/bitcoin_nb.qm
diff --git a/src/qt/locale/bitcoin_nl.qm b/src/qt/locale/bitcoin_nl.qm
diff --git a/src/qt/locale/bitcoin_pam.qm b/src/qt/locale/bitcoin_pam.qm
diff --git a/src/qt/locale/bitcoin_pl.qm b/src/qt/locale/bitcoin_pl.qm
diff --git a/src/qt/locale/bitcoin_pt_BR.qm b/src/qt/locale/bitcoin_pt_BR.qm
diff --git a/src/qt/locale/bitcoin_pt_PT.qm b/src/qt/locale/bitcoin_pt_PT.qm
diff --git a/src/qt/locale/bitcoin_ro_RO.qm b/src/qt/locale/bitcoin_ro_RO.qm
diff --git a/src/qt/locale/bitcoin_ru.qm b/src/qt/locale/bitcoin_ru.qm
diff --git a/src/qt/locale/bitcoin_sah.qm b/src/qt/locale/bitcoin_sah.qm
diff --git a/src/qt/locale/bitcoin_sk.qm b/src/qt/locale/bitcoin_sk.qm
diff --git a/src/qt/locale/bitcoin_sl_SI.qm b/src/qt/locale/bitcoin_sl_SI.qm
diff --git a/src/qt/locale/bitcoin_sq.qm b/src/qt/locale/bitcoin_sq.qm
diff --git a/src/qt/locale/bitcoin_sr.qm b/src/qt/locale/bitcoin_sr.qm
diff --git a/src/qt/locale/bitcoin_sv.qm b/src/qt/locale/bitcoin_sv.qm
diff --git a/src/qt/locale/bitcoin_th_TH.qm b/src/qt/locale/bitcoin_th_TH.qm
diff --git a/src/qt/locale/bitcoin_tr.qm b/src/qt/locale/bitcoin_tr.qm
diff --git a/src/qt/locale/bitcoin_uk.qm b/src/qt/locale/bitcoin_uk.qm
diff --git a/src/qt/locale/bitcoin_ur_PK.qm b/src/qt/locale/bitcoin_ur_PK.qm
diff --git a/src/qt/locale/bitcoin_vi.qm b/src/qt/locale/bitcoin_vi.qm
diff --git a/src/qt/locale/bitcoin_vi_VN.qm b/src/qt/locale/bitcoin_vi_VN.qm
diff --git a/src/qt/locale/bitcoin_zh_CN.qm b/src/qt/locale/bitcoin_zh_CN.qm
diff --git a/src/qt/locale/bitcoin_zh_TW.qm b/src/qt/locale/bitcoin_zh_TW.qm