Merge pull request #166 from jl777/dev

test

iguana/dpow/dpow_network.c

@@ -993,11 +993,11 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
             }
         }
         bp->notaries[bp->myind].paxwdcrc = bp->paxwdcrc;
-        if ( bp->bestmask == 0 )
+        //if ( bp->bestmask == 0 )
         {
             bp->recvmask |= (1LL << senderind) | (1LL << bp->myind);
             bp->bestmask = dpow_maskmin(bp->recvmask,bp,&bp->bestk);
-            dpow_bestconsensus(bp);
+            //dpow_bestconsensus(bp);
         }
         if ( bp->bestk >= 0 )
             bp->notaries[bp->myind].bestk = bp->bestk;

iguana/dpow/dpow_tx.c

@@ -135,7 +135,7 @@ uint64_t dpow_maskmin(uint64_t refmask,struct dpow_block *bp,int8_t *lastkp)
         k = DPOW_MODIND(bp,j);
         //if ( (bp->require0 == 0 || k != 0) && bp->scores[k] < DPOW_BLACKLIST )
         //    continue;
-        if ( bits256_nonz(bp->notaries[k].src.prev_hash) != 0 && bits256_nonz(bp->notaries[k].dest.prev_hash) != 0 )
+        if ( bits256_nonz(bp->notaries[k].src.prev_hash) != 0 && bits256_nonz(bp->notaries[k].dest.prev_hash) != 0 && bp->paxwdcrc == bp->notaries[k].paxwdcrc )
         {
             mask |= (1LL << k);
             if ( ++m == bp->minsigs )