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

.GetHex()

Browse Source
This commit is contained in:
jl777
2019-03-21 03:37:53 -11:00
parent 3e7e013503
commit d2fce5741f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/payments.cpp
View File

@@ -505,13 +505,13 @@ UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr)
for (i=0; i<txidoprets.size(); i++) for (i=0; i<txidoprets.size(); i++)
{ {
UniValue obj(UniValue::VOBJ); std::vector<uint8_t> scriptPubKey,opret; UniValue obj(UniValue::VOBJ); std::vector<uint8_t> scriptPubKey,opret;
obj.push_back(Pair("txidopret",txidoprets[i])); obj.push_back(Pair("txidopret",txidoprets[i].GetHex()));
if ( myGetTransaction(txidoprets[i],txO,hashBlock) != 0 && txO.vout.size() > 1 && DecodePaymentsTxidOpRet(txO.vout[txO.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' ) if ( myGetTransaction(txidoprets[i],txO,hashBlock) != 0 && txO.vout.size() > 1 && DecodePaymentsTxidOpRet(txO.vout[txO.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' )
{ {
obj.push_back(Pair("scriptPubKey",scriptPubKey)); obj.push_back(Pair("scriptPubKey",scriptPubKey.GetHex()));
if ( opret.size() != 0 ) if ( opret.size() != 0 )
{ {
obj.push_back(Pair("opreturn",opret)); obj.push_back(Pair("opreturn",opret.GetHex()));
numoprets++; numoprets++;
} }
} }
@@ -525,7 +525,7 @@ UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr)
} }
else else
{ {
txidpk = CCtxidaddr(txidaddr,txid); txidpk = CCtxidaddr(txidaddr,createtxid);
GetCCaddress1of2(cp,fundsaddr,Paymentspk,txidpk); GetCCaddress1of2(cp,fundsaddr,Paymentspk,txidpk);
funds = CCaddress_balance(fundsaddr); funds = CCaddress_balance(fundsaddr);
result.push_back(Pair(fundsaddr,ValueFromAmount(funds))); result.push_back(Pair(fundsaddr,ValueFromAmount(funds)));