test

diff --git a/src/miner.cpp b/src/miner.cpp
index 749e31ce061e84fec65beb5ad43279e28969a884..0bb74a0ccd881f803c0b654da0eaf6aecfa8bfcb 100644 (file)
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -605,7 +605,7 @@ void static BitcoinMiner(CWallet *pwallet)
             if ( ASSETCHAINS_SYMBOL[0] == 0 && komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 )
             {
                 hashTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS);
-                //fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1);
+                fprintf(stderr,"I am the chosen one for %s ht.%d\n",ASSETCHAINS_SYMBOL,pindexPrev->nHeight+1);
             } else Mining_start = 0;
             while (true)
             {

diff --git a/src/pow.cpp b/src/pow.cpp
index 3b64ce72c999b874ff607dce54f90cf8465b5f8d..a5d75e7bac0f98ce4a65ff85ef8a9b44b13d063d 100644 (file)
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -128,31 +128,18 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
         }
         if ( nonz == 0 )
             return(true); // will come back via different path with pubkey set
-        //if ( height > 60000 )
+        if ( notaryid >= 0 )
         {
-            if ( notaryid >= 0 )
+            special2 = komodo_is_special(height,pubkey33);
+            if ( special2 == -2 )
+                printf("height.%d special2.%d special.%d\n",height,special2,special);
+            if ( special2 == -2 || (height < 80000 && (special != 0 || special2 > 0)) ||
+                (height >= 80000 && special2 > 0) )
             {
-                special2 = komodo_is_special(height,pubkey33);
-                if ( special2 == -2 )
-                    printf("height.%d special2.%d special.%d\n",height,special2,special);
-                if ( special2 == -2 || (height < 80000 && (special != 0 || special2 > 0)) ||
-                    (height >= 80000 && special2 > 0) )
-                {
-                    bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-                    flag = 1;
-                }
-            }
-        }
-        /*else
-        {
-            if ( special > 0 ) // special notary id == (height % numnotaries)
-            {
-                if (UintToArith256(hash) <= bnTarget) // accept normal diff
-                    return true;
                 bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
                 flag = 1;
             }
-        }*/
+        }
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");