Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev

fix merge conflict
2018-09-19 13:46:01 +08:00
parent 0c0befd6c4 119f1c1e0c
commit 876a6e0f9b
9 changed files with 35 additions and 18 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3375,6 +3375,15 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
    CBlock block;
    if (!ReadBlockFromDisk(block, pindexDelete,1))
        return AbortNode(state, "Failed to read block");
+    {
+        int32_t prevMoMheight; uint256 notarizedhash,txid;
+        komodo_notarized_height(&prevMoMheight,&notarizedhash,&txid);
+        if ( block.GetHash() == notarizedhash )
+        {
+            fprintf(stderr,"DisconnectTip trying to disconnect notarized block at ht.%d\n",(int32_t)pindexDelete->nHeight);
+            return(false);
+        }
+    }
    // Apply the block atomically to the chain state.
    uint256 anchorBeforeDisconnect = pcoinsTip->GetBestAnchor();
    int64_t nStart = GetTimeMicros();