From 572f12e98878d60f86cf0aa757aa251db89b5044 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 17 Mar 2017 06:55:35 +0200 Subject: [PATCH] Test --- src/bitcoind.cpp | 2 +- src/main.cpp | 2 +- src/miner.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 3abaef959..63adecece 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -42,7 +42,7 @@ void WaitForShutdown(boost::thread_group* threadGroup) while (!fShutdown) { //fprintf(stderr,"call passport iteration\n"); - MilliSleep(10000/100); + MilliSleep(10000); komodo_passport_iteration(); fShutdown = ShutdownRequested(); } diff --git a/src/main.cpp b/src/main.cpp index 455e6f78e..c674a3766 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3293,7 +3293,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn CScript expect = CScript() << nHeight; if (block.vtx[0].vin[0].scriptSig.size() < expect.size() || !std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin())) { - return state.DoS(100, error("%s: block height mismatch in coinbase", __func__), REJECT_INVALID, "bad-cb-height"); + return state.DoS(100, error("%s: block height mismatch in coinbase ht.%d", __func__,nHeight), REJECT_INVALID, "bad-cb-height"); } } diff --git a/src/miner.cpp b/src/miner.cpp index e9ab80741..e18e0d962 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -383,6 +383,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) // Add fees txNew.vout[0].nValue += nFees; txNew.vin[0].scriptSig = CScript() << nHeight << OP_0; + fprintf(stderr,"set coinbase height to %d\n",nHeight); if ( ASSETCHAINS_SYMBOL[0] == 0 ) { int32_t i,opretlen; uint8_t opret[256],*ptr;