DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Vin when -payment

Browse Source
This commit is contained in:
jl777
2019-07-13 08:16:45 -11:00
parent 37a9a0b8a8
commit c5f6fd77a3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo_nSPV.h
View File

@@ -16,9 +16,9 @@
// todo: // todo:
// myprivkey, scrub all destination buffers
// new p2p messages: getrawmempool and support myIsutxo_spentinmempool and mytxid_inmempool // new p2p messages: getrawmempool and support myIsutxo_spentinmempool and mytxid_inmempool
// change skipcount to int32_t // change skipcount to int32_t
// myprivkey, scrub all destination buffers
// make req for utxo/txid more sane? // 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 // headers "sync" make sure it connects to prior blocks to notarization. use getinfo hdrht to get missing hdrs

4
src/komodo_nSPV_superlite.h
View File

@@ -409,8 +409,10 @@ UniValue NSPV_txidresp_json(struct NSPV_txidresp *utxos,int32_t numutxos)
UniValue item(UniValue::VOBJ); UniValue item(UniValue::VOBJ);
item.push_back(Pair("height",(int64_t)utxos[i].height)); item.push_back(Pair("height",(int64_t)utxos[i].height));
item.push_back(Pair("txid",utxos[i].txid.GetHex())); 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)); 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); array.push_back(item);
} }
return(array); return(array);

4
src/script/script.cpp
View File

@@ -385,9 +385,7 @@ bool CScript::IsPayToCryptoCondition(CScript *pCCSubScript, std::vector<std::vec
bool CScript::IsPayToCryptoCondition(CScript *pCCSubScript) const bool CScript::IsPayToCryptoCondition(CScript *pCCSubScript) const
{ {
std::vector<std::vector<unsigned char>> vParams; std::vector<std::vector<unsigned char>> vParams;
//if ( pCCSubScript != 0 ) return IsPayToCryptoCondition(pCCSubScript, vParams);
return IsPayToCryptoCondition(pCCSubScript, vParams);
//else return(false);
} }
bool CScript::IsPayToCryptoCondition() const bool CScript::IsPayToCryptoCondition() const