Merge branch 'master' into beta

2018-09-24 05:09:14 -11:00
parent b9281f45e7 12832b1d22
commit 49adb58081
4 changed files with 26 additions and 6 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3399,6 +3399,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
    CBlock block;
    if (!ReadBlockFromDisk(block, pindexDelete,1))
        return AbortNode(state, "Failed to read block");
+    //if ( ASSETCHAINS_SYMBOL[0] != 0 || pindexDelete->nHeight > 1400000 )
    {
        int32_t prevMoMheight; uint256 notarizedhash,txid;
        komodo_notarized_height(&prevMoMheight,&notarizedhash,&txid);