From 707b061c254fc96319bbf5d1b244cefacd0256c3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 16 Apr 2018 23:03:05 +0300 Subject: [PATCH] Test --- src/komodo_bitcoind.h | 3 ++- src/miner.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 072020c03..2b4848004 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -873,7 +873,8 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],uint32_t bloc } if ( blocktime != 0 && blocktimes[1] != 0 && blocktime < blocktimes[1]+57 ) { - fprintf(stderr,"lag.%d ht.%d n.%d blocktimes[%u vs %u %u]\n",blocktime-blocktimes[1],height,notaryid,blocktime,blocktimes[0],blocktimes[1]); + if ( height > 790000 ) + fprintf(stderr,"lag.%d ht.%d n.%d blocktimes[%u vs %u %u]\n",blocktime-blocktimes[1],height,notaryid,blocktime,blocktimes[0],blocktimes[1]); if ( height > 807000 ) return(-2); } diff --git a/src/miner.cpp b/src/miner.cpp index fc7bc1de7..3a181e64b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -485,7 +485,12 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus()); } if ( ASSETCHAINS_SYMBOL[0] == 0 && NOTARY_PUBKEY33[0] != 0 && pblock->nTime < pindexPrev->nTime+60 ) + { pblock->nTime = pindexPrev->nTime + 60; + fprintf(stderr,"block.nTime %u vs prev.%u, gettime.%u vs adjusted.%u\n",pblock->nTime,pindexPrev->nTime + 60,pblock->GetBlockTime(),GetAdjustedTime() + 60); + while ( pblock->GetBlockTime() > GetAdjustedTime() + 60 ) + sleep(1); + } pblock->nSolution.clear(); pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);