From db1c0bb740eb87054b7bf3b64a87bf3ba28a6796 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 7 Jul 2019 03:46:56 -1100
Subject: [PATCH] Syntax

---
 src/komodo_nSPV_fullnode.h | 10 +++++-----
 src/komodo_nSPV_wallet.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/komodo_nSPV_fullnode.h b/src/komodo_nSPV_fullnode.h
index b958e877d..e2bc60acc 100644
--- a/src/komodo_nSPV_fullnode.h
+++ b/src/komodo_nSPV_fullnode.h
@@ -267,7 +267,7 @@ int32_t NSPV_setequihdr(struct NSPV_equihdr *hdr,int32_t height)
     return(-1);
 }
 
-int32_t NSPV_getntzsproofresp(struct NSPV_ntzsproofresp *ptr,uint256 prevntztxid,uint256 nextntxtxid)
+int32_t NSPV_getntzsproofresp(struct NSPV_ntzsproofresp *ptr,uint256 prevntztxid,uint256 nextntztxid)
 {
     int32_t i; uint256 hashBlock,bhash0,bhash1,desttxid0,desttxid1; CTransaction tx;
     ptr->prevtxid = prevntztxid;
@@ -292,19 +292,19 @@ int32_t NSPV_getntzsproofresp(struct NSPV_ntzsproofresp *ptr,uint256 prevntztxid
 
     else if ( ptr->common.prevht > ptr->common.nextht || (ptr->common.nextht - ptr->common.prevht) > 1440 )
     {
-        fprintf(stderr,"illegal prevht.%d nextht.%d\n",prevht,nextht);
+        fprintf(stderr,"illegal prevht.%d nextht.%d\n",ptr->common.prevht,ptr->common.nextht);
         return(-7);
     }
-    ptr->common.numhdrs = (nextht - prevht + 1);
+    ptr->common.numhdrs = (ptr->common.nextht - ptr->common.prevht + 1);
     ptr->common.hdrs = (struct NSPV_equihdr *)calloc(ptr->common.numhdrs,sizeof(*ptr->common.hdrs));
     //fprintf(stderr,"prev.%d next.%d allocate numhdrs.%d\n",prevht,nextht,ptr->common.numhdrs);
     for (i=0; i<ptr->common.numhdrs; i++)
     {
         //hashBlock = NSPV_hdrhash(&ptr->common.hdrs[i]);
         //fprintf(stderr,"hdr[%d] %s\n",prevht+i,hashBlock.GetHex().c_str());
-        if ( NSPV_setequihdr(&ptr->common.hdrs[i],prevht+i) < 0 )
+        if ( NSPV_setequihdr(&ptr->common.hdrs[i],ptr->common.prevht+i) < 0 )
         {
-            fprintf(stderr,"error setting hdr.%d\n",prevht+i);
+            fprintf(stderr,"error setting hdr.%d\n",ptr->common.prevht+i);
             free(ptr->common.hdrs);
             ptr->common.hdrs = 0;
             return(-1);
diff --git a/src/komodo_nSPV_wallet.h b/src/komodo_nSPV_wallet.h
index 1cfad0d29..615eff2ad 100644
--- a/src/komodo_nSPV_wallet.h
+++ b/src/komodo_nSPV_wallet.h
@@ -57,10 +57,10 @@ int32_t NSPV_validatehdrs(struct NSPV_ntzsproofresp *ptr)
     return(0);
 }
 
-int32_t NSPV_gettransaction(uint256 txid,int32_t height,CTransaction &tx)
+int32_t NSPV_gettransaction(int32_t vout,uint256 txid,int32_t height,CTransaction &tx)
 {
     int32_t offset,retval = 0;
-    NSPV_txproof(txid,height);
+    NSPV_txproof(vout,txid,height);
     if ( NSPV_txproofresult.txid != txid )
         return(-1);
     if ( NSPV_txextract(tx,NSPV_txproofresult.tx,NSPV_txproofresult.txlen) < 0 || NSPV_txproofresult.txlen <= 0 )
@@ -243,9 +243,9 @@ std::string NSPV_signtx(CMutableTransaction &mtx,uint64_t txfee,CScript opret,st
         mtx.vout.push_back(CTxOut(0,opret));
     for (i=0; i<n; i++)
     {
-        if ( NSPV_gettransaction(mtx.vin[i].prevout.hash,used[i].height,vintx) == 0 )
+        utxovout = mtx.vin[i].prevout.n;
+        if ( NSPV_gettransaction(utxovout,mtx.vin[i].prevout.hash,used[i].height,vintx) == 0 )
         {
-            utxovout = mtx.vin[i].prevout.n;
             if ( vintx.vout[utxovout].nValue != used[i].satoshis )
             {
                 fprintf(stderr,"vintx mismatch %.8f != %.8f\n",(double)vintx.vout[utxovout].nValue/COIN,(double)used[i].satoshis/COIN);