Skip to content

Commit cb26772

Browse files
ghostlanderghostlander
committed
Checkpoints Every 100K Blocks and Final Tweaks
1 parent 57b22f1 commit cb26772

File tree

9 files changed

+204
-221
lines changed

9 files changed

+204
-221
lines changed

‎src/checkpoints.cpp

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,23 @@ namespace Checkpoints
2525
static MapCheckpoints mapCheckpoints =
2626
boost::assign::map_list_of
2727
( 0, std::make_pair(hashGenesisBlock, 1375030725) )
28-
( 433333, std::make_pair(uint256("0x2ecb07c0bb2e53f0af0bd79d24510e73de3be324e622bfef5dbe28896c37ad75"), 1392829201) )
28+
( 100000, std::make_pair(uint256("0x0000002110f858359934b537f51100852227b37fa9cdc40a9af6140e33bcd1ce"), 1378396404) )
29+
( 200002, std::make_pair(uint256("0x0000000a9764650de7124d6a1a0806be3a4b2ecf9d0f6144ce1559a4ab3c3b9f"), 1381441905) )
30+
( 300000, std::make_pair(uint256("0x00000153128697d4ba3c0468596b3b03d68fa04f0b5428af9b8e5ae0b7aa7e00"), 1384511282) )
31+
( 400000, std::make_pair(uint256("0x000000035953822f6d1bab635ce32c5773ecbe3feb29ba9bc9c89202da5944fd"), 1388117099) )
32+
( 500000, std::make_pair(uint256("0x00000007094a82c428b1cc4a02db5c99e03e6ab7702ad4904fc3bd2b7b5ae07f"), 1395308803) )
2933
( 600000, std::make_pair(uint256("0x00000025e4214dd10eb7a4d7d088935dbc5c05b18574b56574d19c839e48e8ff"), 1398098754) )
30-
( 655000, std::make_pair(uint256("0x0000000165e3c5604e2c9d05d0e0b0cf295d97f2df19ee86108342e882c926d8"), 1400456789) )
31-
( 818000, std::make_pair(uint256("0x4bcde87b6c1123a6f38c4427cbdb1b828521f9f193d0c750db21ace71f6e5682"), 1407667430) )
32-
(1000010, std::make_pair(uint256("0xbbddf2c25a8b26651d387f232201fcab7a9e2c543a9d12ac2302174800c1d982"), 1407667430) )
34+
( 700000, std::make_pair(uint256("0x00000002a3e5e5da2a28479e3273990963d8d78a0b6d4e16e47d85fffc4e6102"), 1402161441) )
35+
( 800000, std::make_pair(uint256("0x34a4c166f83cc7b63a8b842747e6bf0926b3e47c9f183adca90f1b83c7aa04da"), 1406649771) )
36+
( 900000, std::make_pair(uint256("0x0000000012374f96b2c32564e4c6b410908a9f2085973d0af8981655c86ee85c"), 1412284335) )
37+
( 1000010, std::make_pair(uint256("0xbbddf2c25a8b26651d387f232201fcab7a9e2c543a9d12ac2302174800c1d982"), 1407667430) )
38+
( 1100000, std::make_pair(uint256("0x30e612dbced71b7727e6e9e6fcb53d9d8d9ffc3802ca86e4f527a8f5cb5ae61e"), 1423808796) )
39+
( 1200000, std::make_pair(uint256("0x6dffd3e69e2d69ad42486f888746aea9d921c02be44025b102357180f2c3995d"), 1429531549) )
40+
( 1300000, std::make_pair(uint256("0x0a1fcc37d7c5fe14d801c305177d7b76bbe922d8a215a13e26aadc87737e8c19"), 1435206331) )
41+
( 1400000, std::make_pair(uint256("0xa1e2f90a8178c3aed30518525e9f6aa94ce5151bf5594478bc9433ee447200cc"), 1440836751) )
42+
( 1500000, std::make_pair(uint256("0x7e88ac1ffc93b47ba9be1b9140a68da0df667f025e007e072ef64d6042b4662a"), 1446415032) )
43+
( 1600000, std::make_pair(uint256("0xc89eb4f8af0826aac8db812479183a6aa6a2ebe3a4da81e7e4a34f33f32f0399"), 1452195893) )
44+
( 1700000, std::make_pair(uint256("0xff60685fb0b88216fd4f385ebbb01c2c490d66162d080959f62c4c40f3158ca7"), 1458048568) )
3345
;
3446

3547
// TestNet has no checkpoints

‎src/main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3553,8 +3553,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
35533553

35543554
if(IsInitialBlockDownload()) {
35553555
/* Aggressive synchronisation:
3556-
* ask this peer for inventory if nothing received in the last 10 seconds */
3557-
if((pfrom->nStartingHeight > nBestHeight) && ((GetTime() - nTimeBestReceived) > 10LL))
3556+
* ask this peer for inventory if nothing received in the last 5 seconds */
3557+
if((pfrom->nStartingHeight > nBestHeight) && ((GetTime() - nTimeBestReceived) > 5LL))
35583558
pfrom->PushGetBlocks(pindexBest, uint256(0));
35593559
} else {
35603560
Checkpoints::AskForPendingSyncCheckpoint(pfrom);
@@ -3767,7 +3767,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
37673767

37683768
/* Time limit for responding to a particular peer */
37693769
uint nCurrentTime = (uint)GetTime();
3770-
if((nCurrentTime - 10U) < pfrom->nLastGetblocksReceived) {
3770+
if((nCurrentTime - 5U) < pfrom->nLastGetblocksReceived) {
37713771
return(error("message getblocks spam"));
37723772
} else {
37733773
pfrom->nLastGetblocksReceived = nCurrentTime;
@@ -3933,8 +3933,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
39333933
printf("received and discarded distant block %s height %d\n",
39343934
hashBlock.ToString().substr(0,20).c_str(), nBlockHeight);
39353935
/* Aggressive synchronisation:
3936-
* ask this peer for inventory if nothing received in the last 10 seconds */
3937-
if((pfrom->nStartingHeight > nBestHeight) && ((GetTime() - nTimeBestReceived) > 10LL))
3936+
* ask this peer for inventory if nothing received in the last 5 seconds */
3937+
if((pfrom->nStartingHeight > nBestHeight) && ((GetTime() - nTimeBestReceived) > 5LL))
39383938
pfrom->PushGetBlocks(pindexBest, uint256(0));
39393939
} else {
39403940
printf("received block %s height %d\n",

‎src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void CNode::PushGetBlocks(CBlockIndex *pindexBegin, uint256 hashEnd) {
9696
uint nCurrentTime = (uint)GetTime();
9797

9898
/* Time limit for asking a particular peer */
99-
if((nCurrentTime - 10U) < nLastGetblocksAsked)
99+
if((nCurrentTime - 5U) < nLastGetblocksAsked)
100100
return;
101101
else
102102
nLastGetblocksAsked = nCurrentTime;

‎src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
207207
connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
208208

209209
rpcConsole = new RPCConsole(this);
210-
connect(consoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
211-
connect(trafficAction, SIGNAL(triggered()), rpcConsole, SLOT(showTabStats()));
210+
connect(consoleAction, SIGNAL(triggered()), rpcConsole, SLOT(showConsole()));
211+
connect(trafficAction, SIGNAL(triggered()), rpcConsole, SLOT(showTraffic()));
212212

213213
blockExplorer = new BlockExplorer(this);
214214
connect(explorerAction, SIGNAL(triggered()), blockExplorer, SLOT(gotoBlockExplorer()));

0 commit comments

Comments
 (0)