From b075bbf9862df41cdf5265026ba787b7d0fecb07 Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Sun, 6 Dec 2009 00:38:11 +0000 Subject: [PATCH] misc git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@43 1a98c847-1fd6-4fd8-948a-caf3550aa51b --- main.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/main.cpp b/main.cpp index 6575099f59..46e7475246 100644 --- a/main.cpp +++ b/main.cpp @@ -1254,8 +1254,8 @@ bool CBlock::AcceptBlock() if (nTime <= pindexPrev->GetMedianTimePast()) return error("AcceptBlock() : block's timestamp is too early"); - // Check that all transactions are finalized (starting around Dec 2009) - if (nBestHeight > 31000) + // Check that all transactions are finalized (starting around Mar 2010) + if (nBestHeight > 36000) foreach(const CTransaction& tx, vtx) if (!tx.IsFinal(nTime)) return error("AcceptBlock() : contains a non-final transaction"); @@ -2059,13 +2059,9 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) vRecv >> *pblock; //// debug print - if (false) - { - printf("received block:\n"); - pblock->print(); - } - else - printf("received block %s\n", pblock->GetHash().ToString().substr(0,16).c_str()); + // printf("received block:\n"); + // pblock->print(); + printf("received block %s\n", pblock->GetHash().ToString().substr(0,16).c_str()); CInv inv(MSG_BLOCK, pblock->GetHash()); pfrom->AddInventoryKnown(inv);