From 223fbb65cb19d61e5facac30cdba280dd8f72aee Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 24 Apr 2018 23:56:42 +0300 Subject: [PATCH] Fix komodo_ensure --- src/komodo_gateway.h | 2 +- src/main.cpp | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ab114e892..ce51746f7 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1772,7 +1772,7 @@ void komodo_passport_iteration() if ( expired == 0 && KOMODO_PASSPORT_INITDONE == 0 ) { KOMODO_PASSPORT_INITDONE = 1; - printf("done PASSPORT %s refid.%d\n",ASSETCHAINS_SYMBOL,refid); + printf("READY for RPC calls at %u! done PASSPORT %s refid.%d\n",(uint32_t)time(NULL),ASSETCHAINS_SYMBOL,refid); } } diff --git a/src/main.cpp b/src/main.cpp index 63afcc656..214831fe7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4002,13 +4002,16 @@ CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash) previndex = InsertBlockIndex(pblock->hashPrevBlock); if ( (miSelf= mapBlockIndex.find(pblock->hashPrevBlock)) != mapBlockIndex.end() ) { - if ( previndex == 0 ) - previndex = InsertBlockIndex(pblock->hashPrevBlock); - if ( previndex != 0 ) + if ( miSelf->second == 0 ) // create pindex so first Accept block doesnt fail { - miSelf->second = previndex; - LogPrintf("autocreate previndex %s\n",pblock->hashPrevBlock.ToString().c_str()); - } else LogPrintf("komodo_ensure unexpected null previndex\n"); + if ( previndex == 0 ) + previndex = InsertBlockIndex(pblock->hashPrevBlock); + if ( previndex != 0 ) + { + miSelf->second = previndex; + LogPrintf("autocreate previndex %s\n",pblock->hashPrevBlock.ToString().c_str()); + } else LogPrintf("komodo_ensure unexpected null previndex\n"); + } } else LogPrintf("komodo_ensure unexpected null miprev\n"); } } else LogPrintf("komodo_ensure unexpected error creating pindex %s\n",hash.ToString().c_str());