Merge branch 'FSM' of https://github.com/jl777/komodo

2019-01-26 15:59:29 +08:00
parent 9bf744ef26 b778dbef8e
commit 3da846ce85
23 changed files with 462 additions and 90 deletions
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -689,11 +689,15 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
                pindexNew->nTx            = diskindex.nTx;
                pindexNew->nSproutValue   = diskindex.nSproutValue;
                pindexNew->nSaplingValue  = diskindex.nSaplingValue;
+<<<<<<< HEAD
                pindexNew->segid          = diskindex.segid;
                pindexNew->newcoins       = diskindex.newcoins;
                pindexNew->zfunds         = diskindex.zfunds;
                pindexNew->sproutfunds    = diskindex.sproutfunds;
                
+=======
+//fprintf(stderr,"loadguts ht.%d\n",pindexNew->GetHeight());
+>>>>>>> b778dbef8e85f3f95e36223beb41d4d51eb6072e
                // Consistency checks
                auto header = pindexNew->GetBlockHeader();
                if (header.GetHash() != pindexNew->GetBlockHash())