From c5f6fd77a3a33fd89f5f2b9e29895421cc2bbbcf Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 13 Jul 2019 08:16:45 -1100 Subject: [PATCH] Vin when -payment --- src/komodo_nSPV.h | 2 +- src/komodo_nSPV_superlite.h | 4 +++- src/script/script.cpp | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_nSPV.h b/src/komodo_nSPV.h index 048655b9c..1f404c243 100644 --- a/src/komodo_nSPV.h +++ b/src/komodo_nSPV.h @@ -16,9 +16,9 @@ // todo: -// myprivkey, scrub all destination buffers // new p2p messages: getrawmempool and support myIsutxo_spentinmempool and mytxid_inmempool // change skipcount to int32_t +// myprivkey, scrub all destination buffers // make req for utxo/txid more sane? // headers "sync" make sure it connects to prior blocks to notarization. use getinfo hdrht to get missing hdrs diff --git a/src/komodo_nSPV_superlite.h b/src/komodo_nSPV_superlite.h index bf8eab78d..de454f4b1 100644 --- a/src/komodo_nSPV_superlite.h +++ b/src/komodo_nSPV_superlite.h @@ -409,8 +409,10 @@ UniValue NSPV_txidresp_json(struct NSPV_txidresp *utxos,int32_t numutxos) UniValue item(UniValue::VOBJ); item.push_back(Pair("height",(int64_t)utxos[i].height)); item.push_back(Pair("txid",utxos[i].txid.GetHex())); - item.push_back(Pair("vout",(int64_t)utxos[i].vout)); item.push_back(Pair("value",(double)utxos[i].satoshis/COIN)); + if ( utxos[i].satoshis > 0 ) + item.push_back(Pair("vout",(int64_t)utxos[i].vout)); + else item.push_back(Pair("vin",(int64_t)utxos[i].vout)); array.push_back(item); } return(array); diff --git a/src/script/script.cpp b/src/script/script.cpp index aeeca24e6..475acdfd5 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -385,9 +385,7 @@ bool CScript::IsPayToCryptoCondition(CScript *pCCSubScript, std::vector> vParams; - //if ( pCCSubScript != 0 ) - return IsPayToCryptoCondition(pCCSubScript, vParams); - //else return(false); + return IsPayToCryptoCondition(pCCSubScript, vParams); } bool CScript::IsPayToCryptoCondition() const