From 177902aa8aa21b866229b759697234a3a2fff7fc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 9 Jul 2019 21:32:46 -1100
Subject: [PATCH] Validate KMD rewards

---
 src/komodo_nSPV.h           |  4 ++--
 src/komodo_nSPV_superlite.h | 16 +++++++++++++---
 src/komodo_nSPV_wallet.h    |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/komodo_nSPV.h b/src/komodo_nSPV.h
index e9253a167..2d50dec26 100644
--- a/src/komodo_nSPV.h
+++ b/src/komodo_nSPV.h
@@ -51,7 +51,7 @@
 #define NSPV_BROADCAST 0x0c
 #define NSPV_BROADCASTRESP 0x0d
 
-int32_t NSPV_gettransaction(int32_t skipvalidation,int32_t vout,uint256 txid,int32_t height,CTransaction &tx);
+int32_t NSPV_gettransaction(int32_t skipvalidation,int32_t vout,uint256 txid,int32_t height,CTransaction &tx,int64_t extradata,uint32_t tiptime);
 extern uint256 SIG_TXHASH;
 uint32_t NSPV_blocktime(int32_t hdrheight);
 
@@ -475,7 +475,7 @@ int32_t NSPV_notariescount(CTransaction tx,uint8_t elected[64][33])
     for (i=0; i<tx.vin.size(); i++)
     {
         utxovout = tx.vin[i].prevout.n;
-        if ( NSPV_gettransaction(1,utxovout,tx.vin[i].prevout.hash,0,vintx) != 0 )
+        if ( NSPV_gettransaction(1,utxovout,tx.vin[i].prevout.hash,0,vintx,-1,0) != 0 )
         {
             fprintf(stderr,"error getting %s/v%d\n",tx.vin[i].prevout.hash.GetHex().c_str(),utxovout);
             return(numsigs);
diff --git a/src/komodo_nSPV_superlite.h b/src/komodo_nSPV_superlite.h
index 66e921f4d..b81250424 100644
--- a/src/komodo_nSPV_superlite.h
+++ b/src/komodo_nSPV_superlite.h
@@ -25,7 +25,7 @@
 CAmount AmountFromValue(const UniValue& value);
 int32_t bitcoin_base58decode(uint8_t *data,char *coinaddr);
 
-uint32_t NSPV_lastinfo,NSPV_logintime;
+uint32_t NSPV_lastinfo,NSPV_logintime,NSPV_tiptime;
 CKey NSPV_key;
 char NSPV_wifstr[64],NSPV_pubkeystr[67];
 std::string NSPV_address;
@@ -59,7 +59,12 @@ void komodo_nSPVresp(CNode *pfrom,std::vector<uint8_t> response) // received a r
                     NSPV_inforesult = I;
                 }
                 else if ( NSPV_inforesult.height > I.height )
+                {
                     NSPV_lastinfo = timestamp - ASSETCHAINS_BLOCKTIME/4;
+                    // need to validate new header to make sure it is valid mainchain
+                    if ( NSPV_inforesult.height == NSPV_inforesult.hdrheight )
+                        NSPV_tiptime = NSPV_inforesult.hdr.nTime;
+                }
                 break;
             case NSPV_UTXOSRESP:
                 NSPV_utxosresp_purge(&NSPV_utxosresult);
@@ -604,9 +609,9 @@ int32_t NSPV_validatehdrs(struct NSPV_ntzsproofresp *ptr)
     return(0);
 }
 
-int32_t NSPV_gettransaction(int32_t skipvalidation,int32_t vout,uint256 txid,int32_t height,CTransaction &tx)
+int32_t NSPV_gettransaction(int32_t skipvalidation,int32_t vout,uint256 txid,int32_t height,CTransaction &tx,int64_t extradata,uint32_t tiptime)
 {
-    int32_t i,offset,retval = 0; std::vector<uint8_t> proof;
+    int32_t i,offset,retval = 0; int64_t rewards = 0; uint32_t nLockTime; std::vector<uint8_t> proof;
     for (i=0; i<3; i++)
     {
         NSPV_txproof(vout,txid,height);
@@ -623,6 +628,11 @@ int32_t NSPV_gettransaction(int32_t skipvalidation,int32_t vout,uint256 txid,int
         retval = -2000;
     else if ( skipvalidation == 0 && NSPV_txproofresult.unspentvalue <= 0 )
         retval = -2001;
+    else if ( ASSETCHAINS_SYMBOL[0] == 0 && extradata >= 0 && tiptime != 0 )
+    {
+        rewards = komodo_interestnew(height,tx.vout[vout].nValue,tx.nLockTime,tiptime);
+        fprintf(stderr,"extradata %.8f vs rewards %.8f\n",dstr(extradata),dstr(rewards));
+    }
     else if ( skipvalidation == 0 )
     {
         if ( NSPV_txproofresult.txprooflen > 0 )
diff --git a/src/komodo_nSPV_wallet.h b/src/komodo_nSPV_wallet.h
index 6cf2e82c6..c38b29598 100644
--- a/src/komodo_nSPV_wallet.h
+++ b/src/komodo_nSPV_wallet.h
@@ -170,7 +170,7 @@ std::string NSPV_signtx(UniValue &retcodes,CMutableTransaction &mtx,uint64_t txf
         utxovout = mtx.vin[i].prevout.n;
         if ( i > 0 )
             sleep(1);
-        validation = NSPV_gettransaction(0,utxovout,mtx.vin[i].prevout.hash,used[i].height,vintx);
+        validation = NSPV_gettransaction(0,utxovout,mtx.vin[i].prevout.hash,used[i].height,vintx,used[i].extradata,NSPV_tiptime);
         retcodes.push_back(validation);
         if ( validation != -1 ) // most others are degraded security
         {