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

Use login address if nspv_listunspent doesn't specify

Browse Source
This commit is contained in:
jl777
2019-07-03 22:33:11 -11:00
parent b4b339af72
commit 1b4f65c45e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/komodo_nSPV.h
View File

@@ -133,6 +133,7 @@ int32_t NSPV_rwutxosresp(int32_t rwflag,uint8_t *serialized,struct NSPV_utxosres
ptr->utxos = (struct NSPV_utxoresp *)calloc(sizeof(*ptr->utxos),ptr->numutxos); // relies on uint16_t being "small" to prevent mem exhaustion ptr->utxos = (struct NSPV_utxoresp *)calloc(sizeof(*ptr->utxos),ptr->numutxos); // relies on uint16_t being "small" to prevent mem exhaustion
for (i=0; i<ptr->numutxos; i++) for (i=0; i<ptr->numutxos; i++)
len += NSPV_rwutxoresp(rwflag,&serialized[len],&ptr->utxos[i]); len += NSPV_rwutxoresp(rwflag,&serialized[len],&ptr->utxos[i]);
fprintf(stderr,"parsed numutxos.%d\n",ptr->numutxos);
} }
len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->total),&ptr->total); len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->total),&ptr->total);
len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->interest),&ptr->interest); len += iguana_rwnum(rwflag,&serialized[len],sizeof(ptr->interest),&ptr->interest);
@@ -820,9 +821,9 @@ UniValue NSPV_utxoresp_json(struct NSPV_utxoresp *utxos,int32_t numutxos)
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("vout",(int64_t)utxos[i].vout));
item.push_back(Pair("value",AmountFromValue(utxos[i].satoshis))); item.push_back(Pair("value",(doublt)utxos[i].satoshis/COIN));
if ( ASSETCHAINS_SYMBOL[0] == 0 ) if ( ASSETCHAINS_SYMBOL[0] == 0 )
item.push_back(Pair("interest",AmountFromValue(utxos[i].extradata))); item.push_back(Pair("interest",(doublt)utxos[i].extradata/COIN));
array.push_back(item); array.push_back(item);
} }
return(array); return(array);
@@ -835,8 +836,9 @@ UniValue NSPV_utxosresp_json(struct NSPV_utxosresp *ptr)
result.push_back(Pair("utxos",NSPV_utxoresp_json(ptr->utxos,ptr->numutxos))); result.push_back(Pair("utxos",NSPV_utxoresp_json(ptr->utxos,ptr->numutxos)));
result.push_back(Pair("height",(int64_t)ptr->nodeheight)); result.push_back(Pair("height",(int64_t)ptr->nodeheight));
result.push_back(Pair("numutxos",(int64_t)ptr->numutxos)); result.push_back(Pair("numutxos",(int64_t)ptr->numutxos));
result.push_back(Pair("balance",AmountFromValue(ptr->total))); result.push_back(Pair("balance",(doublt)ptr->total/COIN));
result.push_back(Pair("interest",AmountFromValue(ptr->interest))); if ( ASSETCHAINS_SYMBOL[0] == 0 )
result.push_back(Pair("interest",(doublt)ptr->interest/COIN));
return(result); return(result);
} }

3
src/wallet/rpcdump.cpp
View File

@@ -977,6 +977,7 @@ UniValue NSPV_login(char *wifstr);
UniValue NSPV_addressutxos(char *coinaddr); UniValue NSPV_addressutxos(char *coinaddr);
UniValue NSPV_spentinfo(uint256 txid,int32_t vout); UniValue NSPV_spentinfo(uint256 txid,int32_t vout);
uint256 Parseuint256(const char *hexstr); uint256 Parseuint256(const char *hexstr);
extern std::string NSPV_address;
UniValue nspv_getinfo(const UniValue& params, bool fHelp) UniValue nspv_getinfo(const UniValue& params, bool fHelp)
{ {
@@ -994,6 +995,8 @@ UniValue nspv_login(const UniValue& params, bool fHelp)
UniValue nspv_listunspent(const UniValue& params, bool fHelp) UniValue nspv_listunspent(const UniValue& params, bool fHelp)
{ {
if ( params.size() == 0 && NSPV_address.size() != 0 )
return(NSPV_addressutxos((char *)NSPV_address.c_str()));
if ( fHelp || params.size() != 1 ) if ( fHelp || params.size() != 1 )
throw runtime_error("nspv_listunspent address\n"); throw runtime_error("nspv_listunspent address\n");
return(NSPV_addressutxos((char *)params[0].get_str().c_str())); return(NSPV_addressutxos((char *)params[0].get_str().c_str()));