From b6b33147b1d85e3b736035d25ac03e5dbdb16845 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Wed, 17 Oct 2018 00:31:57 +0800
Subject: [PATCH] change it, might be safter this way

---
 src/komodo_bitcoind.h    | 16 ++++++++++------
 src/wallet/rpcwallet.cpp |  9 +--------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 278bba0af..ad8da74d4 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1582,10 +1582,18 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
                 return(-1);
             }
         }
-        else if ( ASSETCHAINS_STREAM != 0 ) {
+        else
+        {
+            if ( komodo_checkcommission(pblock,height) < 0 )
+                return(-1);
+        }
+        if ( ASSETCHAINS_STREAM != 0 && height > 128 )
+        {
             int lasttx = ( pblock->vtx.size() -1 );
-            uint256 hash; CTransaction tx;
             printf("ABOUT TO CHECK LAST TX: %d\n",lasttx);
+            if ( lasttx == 0 )
+                return(-1);
+            uint256 hash; CTransaction tx;
             if (GetTransaction(pblock->vtx[lasttx].vin[0].prevout.hash,tx,hash,false))
             {
                 printf("CHECKING THE script pubkey\n");
@@ -1596,10 +1604,6 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
                 }
                 printf("THE PUBKEY IS RIGHT! \n");
             }
-        } else
-        {
-            if ( komodo_checkcommission(pblock,height) < 0 )
-                return(-1);
         }
     }
     //fprintf(stderr,"komodo_checkPOW possible.%d slowflag.%d ht.%d notaryid.%d failed.%d\n",possible,slowflag,height,notaryid,failed);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d352c89e4..0e9fc8e80 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4608,14 +4608,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
         //    ((uint8_t *)&revtxid)[i] = ((uint8_t *)&utxotxid)[31 - i];
         txNew.vin[0].prevout.hash = utxotxid; //revtxid;
         txNew.vin[0].prevout.n = utxovout;
-        if ( ASSETCHAINS_STREAM != 0 )
-        {
-            txNew.vout[0].nValue = 0;
-        }
-        else
-        {    
-            txNew.vout[0].nValue = utxovalue - txfee;
-        }
+        txNew.vout[0].nValue = utxovalue - txfee;
         txNew.vout[0].scriptPubKey = CScript() << ParseHex(CRYPTO777_PUBSECPSTR) << OP_CHECKSIG;
         CTransaction txNewConst(txNew);
         signSuccess = ProduceSignature(TransactionSignatureCreator(&keystore, &txNewConst, 0, utxovalue, SIGHASH_ALL), best_scriptPubKey, sigdata, consensusBranchId);