From db4721816c34dea5b86b92b83f871d62b4c4b365 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 22 Jul 2019 05:30:04 -1100
Subject: [PATCH] Have full node txproof return height if not set

---
 src/komodo_nSPV_fullnode.h | 54 ++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/komodo_nSPV_fullnode.h b/src/komodo_nSPV_fullnode.h
index 9dab5b147..2700f293b 100644
--- a/src/komodo_nSPV_fullnode.h
+++ b/src/komodo_nSPV_fullnode.h
@@ -408,34 +408,42 @@ int32_t NSPV_gettxproof(struct NSPV_txproof *ptr,int32_t vout,uint256 txid,int32
         return(-1);
     ptr->txid = txid;
     ptr->vout = vout;
-    ptr->height = height;
-    if ( height != 0 && (pindex= komodo_chainactive(height)) != 0 && komodo_blockload(block,pindex) == 0 )
+    if ( height != 0 )
     {
-        BOOST_FOREACH(const CTransaction&tx, block.vtx)
+        ptr->height = height;
+        if ((pindex= komodo_chainactive(height)) != 0 && komodo_blockload(block,pindex) == 0 )
         {
-            if ( tx.GetHash() == txid )
+            BOOST_FOREACH(const CTransaction&tx, block.vtx)
             {
-                flag = 1;
-                break;
+                if ( tx.GetHash() == txid )
+                {
+                    flag = 1;
+                    break;
+                }
+            }
+            if ( flag != 0 )
+            {
+                set<uint256> setTxids;
+                CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION);
+                setTxids.insert(txid);
+                CMerkleBlock mb(block, setTxids);
+                ssMB << mb;
+                std::vector<uint8_t> proof(ssMB.begin(), ssMB.end());
+                ptr->txprooflen = (int32_t)proof.size();
+                //fprintf(stderr,"%s txproof.(%s)\n",txid.GetHex().c_str(),HexStr(proof).c_str());
+                if ( ptr->txprooflen > 0 )
+                {
+                    ptr->txproof = (uint8_t *)calloc(1,ptr->txprooflen);
+                    memcpy(ptr->txproof,&proof[0],ptr->txprooflen);
+                }
+                //fprintf(stderr,"gettxproof slen.%d\n",(int32_t)(sizeof(*ptr) - sizeof(ptr->tx) - sizeof(ptr->txproof) + ptr->txlen + ptr->txprooflen));
             }
         }
-        if ( flag != 0 )
-        {
-            set<uint256> setTxids;
-            CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION);
-            setTxids.insert(txid);
-            CMerkleBlock mb(block, setTxids);
-            ssMB << mb;
-            std::vector<uint8_t> proof(ssMB.begin(), ssMB.end());
-            ptr->txprooflen = (int32_t)proof.size();
-            //fprintf(stderr,"%s txproof.(%s)\n",txid.GetHex().c_str(),HexStr(proof).c_str());
-            if ( ptr->txprooflen > 0 )
-            {
-                ptr->txproof = (uint8_t *)calloc(1,ptr->txprooflen);
-                memcpy(ptr->txproof,&proof[0],ptr->txprooflen);
-            }
-            //fprintf(stderr,"gettxproof slen.%d\n",(int32_t)(sizeof(*ptr) - sizeof(ptr->tx) - sizeof(ptr->txproof) + ptr->txlen + ptr->txprooflen));
-        }
+    }
+    else
+    {
+        if ( GetTransaction(args->txid,tx,hashBlock,false) != 0 )
+            ptr->height = komodo_blockheight(hashBlock);
     }
     ptr->unspentvalue = CCgettxout(txid,vout,1,1);
     return(sizeof(*ptr) - sizeof(ptr->tx) - sizeof(ptr->txproof) + ptr->txlen + ptr->txprooflen);