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

Syntax

Browse Source
This commit is contained in:
jl777
2019-07-03 20:53:31 -11:00
parent c3343e237e
commit eb851fe883
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/komodo_nSPV.h
View File

@@ -799,24 +799,24 @@ UniValue NSPV_getinfo()
{ {
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
result.push_back(Pair("height",(int64_t)ptr->height)); result.push_back(Pair("height",(int64_t)NSPV_inforesult.height));
result.push_back(Pair("chaintip",ptr->blockhash.GetHex())); result.push_back(Pair("chaintip",NSPV_inforesult.blockhash.GetHex()));
result.push_back(Pair("notarization",NSPV_ntz_json(&ptr->notarization))); result.push_back(Pair("notarization",NSPV_ntz_json(&NSPV_inforesult.notarization)));
return(result); return(result);
} }
UniValue NSPV_utxoresp_json(struct NSPV_utxosresp *utxos,int32_t numutxos) UniValue NSPV_utxoresp_json(struct NSPV_utxoresp *utxos,int32_t numutxos)
{ {
UniValue array(UniValue::VARR); int32_t i; UniValue array(UniValue::VARR); int32_t i;
for (i=0; i<numutxos; i++) for (i=0; i<numutxos; i++)
{ {
UniValue item(UniValue:VOBJ); UniValue item(UniValue:VOBJ);
obj.push_back(Pair("height",(int64_t)utxos[i].height)); item.push_back(Pair("height",(int64_t)utxos[i].height));
obj.push_back(Pair("txid",utxos[i].txid.GetHex())); item.push_back(Pair("txid",utxos[i].txid.GetHex()));
obj.push_back(Pair("vout",(int64_t)utxos[i].vout)); item.push_back(Pair("vout",(int64_t)utxos[i].vout));
obj.push_back(Pair("value",AmountFromValue(utxos[i].satoshis))); item.push_back(Pair("value",AmountFromValue(utxos[i].satoshis)));
if ( ASSETCHAINS_SYMBOL[0] == 0 ) if ( ASSETCHAINS_SYMBOL[0] == 0 )
obj.push_back(Pair("interest",AmountFromValue(utxos[i].extradata))); item.push_back(Pair("interest",AmountFromValue(utxos[i].extradata)));
array.push_back(item); array.push_back(item);
} }
return(array); return(array);

17
src/main.cpp
View File

@@ -7427,16 +7427,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
komodo_nSPVreq(pfrom,payload); komodo_nSPVreq(pfrom,payload);
return(true); return(true);
} }
else if ( KOMODO_NSPV != 0 ) else if (strCommand == "nSPV")
{ {
if (strCommand == "nSPV") std::vector<uint8_t> payload;
{ vRecv >> payload;
std::vector<uint8_t> payload; komodo_nSPVresp(pfrom,payload);
vRecv >> payload;
komodo_nSPVresp(pfrom,payload);
return(true);
}
fprintf(stderr,"ignore message %s\n",strCommand.c_str());
return(true); return(true);
} }
@@ -8228,11 +8223,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
} }
state.fShouldBan = false; state.fShouldBan = false;
} }
komodo_nSPV(pto);
if ( KOMODO_NSPV != 0 ) if ( KOMODO_NSPV != 0 )
{
komodo_nSPV(pto);
return(true); return(true);
}
BOOST_FOREACH(const CBlockReject& reject, state.rejects) BOOST_FOREACH(const CBlockReject& reject, state.rejects)
pto->PushMessage("reject", (string)"block", reject.chRejectCode, reject.strRejectReason, reject.hashBlock); pto->PushMessage("reject", (string)"block", reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
state.rejects.clear(); state.rejects.clear();