From 5d214ce738f1c0d29ed36fdb67c149c8313d1d0e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 25 Apr 2018 00:24:07 +0300
Subject: [PATCH] New approach for komodo_ensure

---
 src/main.cpp | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ca7f8517a..ee418a022 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3561,7 +3561,7 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block)
         }
         if ( miPrev != mapBlockIndex.end() && (*miPrev).second == 0 )
         {
-            //fprintf(stderr,"edge case of both block and prevblock in the strange state\n");
+            fprintf(stderr,"edge case of both block and prevblock in the strange state\n");
             return(0); // return here to avoid the state of pindex->nHeight not set and pprev NULL
         }
     }
@@ -4195,25 +4195,25 @@ void komodo_currentheight_set(int32_t height);
 CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash)
 {
     CBlockIndex *pindex=0,*previndex=0;
+    if ( (pindex= mapBlockIndex[hash]) == 0 )
+        pindex = InsertBlockIndex(hash);
     BlockMap::iterator miSelf = mapBlockIndex.find(hash);
     if ( miSelf == mapBlockIndex.end() )
     {
-        pindex = InsertBlockIndex(hash);
-        LogPrintf("autocreate pindex %s\n",hash.ToString().c_str());
+        LogPrintf("komodo_ensure unexpected missing hash %s\n",hash.ToString().c_str());
+        return(0);
     }
-    if ( (miSelf= mapBlockIndex.find(hash)) != mapBlockIndex.end() )
+    if ( miSelf->second == 0 ) // create pindex so first Accept block doesnt fail
     {
-        if ( miSelf->second == 0 ) // create pindex so first Accept block doesnt fail
+        if ( pindex == 0 )
+            pindex = AddToBlockIndex(*pblock);
+        if ( pindex != 0 )
         {
-            if ( pindex == 0 )
-                pindex = AddToBlockIndex(*pblock);
-            if ( pindex != 0 )
-            {
-                miSelf->second = pindex;
-                LogPrintf("Block header %s is already known, but without pindex -> ensured %p\n",hash.ToString().c_str(),miSelf->second);
-            } else LogPrintf("komodo_ensure unexpected null pindex\n");
-        }
-        if ( hash != Params().GetConsensus().hashGenesisBlock )
+            miSelf->second = pindex;
+            LogPrintf("Block header %s is already known, but without pindex -> ensured %p\n",hash.ToString().c_str(),miSelf->second);
+        } else LogPrintf("komodo_ensure unexpected null pindex\n");
+    }
+    /*if ( hash != Params().GetConsensus().hashGenesisBlock )
         {
             miSelf = mapBlockIndex.find(pblock->hashPrevBlock);
             if ( miSelf == mapBlockIndex.end() )
@@ -4232,7 +4232,8 @@ CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash)
                 }
             } else LogPrintf("komodo_ensure unexpected null miprev\n");
         }
-    } else LogPrintf("komodo_ensure unexpected error creating pindex %s\n",hash.ToString().c_str());
+     }*/
+    return(pindex);
 }
 
 bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNode* pfrom, CBlock* pblock, bool fForceProcessing, CDiskBlockPos *dbp)