Merge branch 'dev' into jl777

2018-04-20 09:32:24 +03:00
parent 02290a3fd8 0a4ffaff30
commit 74d30ec279
11 changed files with 41 additions and 48 deletions
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -887,8 +887,6 @@ int32_t komodo_is_special(uint8_t pubkeys[66][33],int32_t mids[66],uint32_t bloc
            }
            if ( blocktime != 0 && blocktimes[1] != 0 && blocktime < blocktimes[1]+57 )
            {
-                //if ( height > 790000 )
-                //    fprintf(stderr,"lag.%d ht.%d n.%d blocktimes[%u vs %u %u]\n",blocktime-blocktimes[1],height,notaryid,blocktime,blocktimes[0],blocktimes[1]);
                if ( height > 807000 )
                    return(-2);
            }