Merge pull request #700 from jl777/jl777

Fix 100th block free

iguana/dpow/dpow_fsm.c

@@ -604,7 +604,7 @@ void dpow_statemachinestart(void *ptr)
     {
         if ( (checkpoint.blockhash.height % 100) != 0 && dp->checkpoint.blockhash.height > checkpoint.blockhash.height )
         {
-            printf("abort %s ht.%d due to new checkpoint.%d\n",dp->symbol,checkpoint.blockhash.height,dp->checkpoint.blockhash.height);
+            //printf("abort %s ht.%d due to new checkpoint.%d\n",dp->symbol,checkpoint.blockhash.height,dp->checkpoint.blockhash.height);
             dp->ratifying -= bp->isratify;
             free(ptr);
             return;
@@ -638,7 +638,7 @@ void dpow_statemachinestart(void *ptr)
             bp->notaries[bp->myind].paxwdcrc = bp->paxwdcrc;
         }
         sleep(13);
-        if ( dp->checkpoint.blockhash.height > checkpoint.blockhash.height )
+        if ( (checkpoint.blockhash.height % 100) != 0 && dp->checkpoint.blockhash.height > checkpoint.blockhash.height )
         {
             if ( bp->isratify == 0 )
             {

iguana/iguana_notary.c

@@ -139,7 +139,7 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
         {
             for (i=ht-100; i>=0; i--)
             {
-                if ( (bp= dp->blocks[i]) != 0 && bp->state == 0xffffffff )
+                if ( (i % 100) != 0 && (bp= dp->blocks[i]) != 0 && bp->state == 0xffffffff )
                 {
                     dp->blocks[i] = 0;
                     Numallocated--;