From fb0f519301b7cb105b2087e7a4364b9eaaba5de5 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Tue, 16 Oct 2018 21:17:27 +0800
Subject: [PATCH] try to make miner spend p2pk utxo

---
 src/miner.cpp            | 20 ++++++++++++++++++++
 src/wallet/rpcwallet.cpp | 14 ++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 1c83c5a61..668c5127f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -493,6 +493,26 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
                 return(0);
             }
         }
+        else if (( ASSETCHAINS_STREAM != 0 ) && ( ASSETCHAINS_SYMBOL[0] != 0 ))
+        {
+          CMutableTransaction txStream = CreateNewContextualCMutableTransaction(Params().GetConsensus(), chainActive.Height() + 1);
+          if ( komodo_notaryvin(txStream,ASSETCHAINS_OVERRIDE_PUBKEY33) > 0 )
+          {
+              CAmount txfees = 10000;
+              pblock->vtx.push_back(txStream);
+              pblocktemplate->vTxFees.push_back(txfees);
+              pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStream));
+              nFees += txfees;
+              pblocktemplate->vTxFees[0] = -nFees;
+              //*(uint64_t *)(&pblock->vtx[0].vout[0].nValue) += txfees;
+              //fprintf(stderr,"added notaryvin\n");
+          }
+          else
+          {
+              fprintf(stderr,"error adding streamer vin, the chain broke! \n");
+              return(0);
+          }
+        }
         else if ( ASSETCHAINS_CC == 0 && pindexPrev != 0 && ASSETCHAINS_STAKED == 0 && (ASSETCHAINS_SYMBOL[0] != 0 || IS_KOMODO_NOTARY == 0 || My_notaryid < 0) )
         {
             CValidationState state;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 936c31fd9..6359dfca5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -44,6 +44,8 @@ using namespace std;
 using namespace libzcash;
 
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
+extern std::string ASSETCHAINS_OVERRIDE_PUBKEY;
+extern int32_t ASSETCHAINS_STREAM;
 extern UniValue TxJoinSplitToJSON(const CTransaction& tx);
 extern uint8_t ASSETCHAINS_PRIVATE;
 uint32_t komodo_segid32(char *coinaddr);
@@ -4606,8 +4608,16 @@ 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;
-        txNew.vout[0].scriptPubKey = CScript() << ParseHex(CRYPTO777_PUBSECPSTR) << OP_CHECKSIG;
-        txNew.vout[0].nValue = utxovalue - txfee;
+        if ( ASSETCHAINS_STREAM != 0 )
+        {
+            txNew.vout[0].scriptPubKey = CScript() << ParseHex(ASSETCHAINS_OVERRIDE_PUBKEY) << OP_CHECKSIG;
+            txNew.vout[0].nValue = 0;
+        }
+        else
+        {
+            txNew.vout[0].scriptPubKey = CScript() << ParseHex(CRYPTO777_PUBSECPSTR) << OP_CHECKSIG;
+            txNew.vout[0].nValue = utxovalue - txfee;
+        }
         CTransaction txNewConst(txNew);
         signSuccess = ProduceSignature(TransactionSignatureCreator(&keystore, &txNewConst, 0, utxovalue, SIGHASH_ALL), best_scriptPubKey, sigdata, consensusBranchId);
         if (!signSuccess)