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

Reorder son

Browse Source
This commit is contained in:
jl777
2019-03-21 23:01:10 -11:00
parent f596a2b5e8
commit a543449878
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cc/payments.cpp
View File

@@ -608,22 +608,21 @@ 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].GetHex())); obj.push_back(Pair("txid",txidoprets[i].GetHex()));
fprintf(stderr,"i%d of %d\n",i,(int32_t)txidoprets.size());
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' )
{ {
outstr = (char *)malloc(2*(scriptPubKey.size() + opret.size()) + 1); outstr = (char *)malloc(2*(scriptPubKey.size() + opret.size()) + 1);
for (j=0; j<scriptPubKey.size(); j++) for (j=0; j<scriptPubKey.size(); j++)
sprintf(&outstr[j<<1],"%02x",scriptPubKey[j]); sprintf(&outstr[j<<1],"%02x",scriptPubKey[j]);
outstr[j<<1] = 0; outstr[j<<1] = 0;
fprintf(stderr,"scriptPubKey.(%s)\n",outstr); //fprintf(stderr,"scriptPubKey.(%s)\n",outstr);
obj.push_back(Pair("scriptPubKey",outstr)); obj.push_back(Pair("scriptPubKey",outstr));
if ( opret.size() != 0 ) if ( opret.size() != 0 )
{ {
for (j=0; j<opret.size(); j++) for (j=0; j<opret.size(); j++)
sprintf(&outstr[j<<1],"%02x",opret[j]); sprintf(&outstr[j<<1],"%02x",opret[j]);
outstr[j<<1] = 0; outstr[j<<1] = 0;
fprintf(stderr,"opret.(%s)\n",outstr); //fprintf(stderr,"opret.(%s)\n",outstr);
obj.push_back(Pair("opreturn",outstr)); obj.push_back(Pair("opreturn",outstr));
numoprets++; numoprets++;
} }
@@ -632,21 +631,21 @@ UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr)
a.push_back(obj); a.push_back(obj);
} }
flag++; flag++;
result.push_back(Pair("numoprets",(int64_t)numoprets));
if ( numoprets > 1 ) if ( numoprets > 1 )
{ {
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
result.push_back(Pair("error","too many opreturns")); result.push_back(Pair("error","too many opreturns"));
result.push_back(Pair("numoprets",(int64_t)numoprets));
} }
else else
{ {
result.push_back(Pair("txidoprets",a));
txidpk = CCtxidaddr(txidaddr,createtxid); 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)));
GetCCaddress(cp,fundsopretaddr,Paymentspk); GetCCaddress(cp,fundsopretaddr,Paymentspk);
fundsopret = CCaddress_balance(fundsopretaddr); fundsopret = CCaddress_balance(fundsopretaddr);
result.push_back(Pair("txidoprets",a));
result.push_back(Pair(fundsopretaddr,ValueFromAmount(fundsopret))); result.push_back(Pair(fundsopretaddr,ValueFromAmount(fundsopret)));
result.push_back(Pair("totalfunds",ValueFromAmount(funds+fundsopret))); result.push_back(Pair("totalfunds",ValueFromAmount(funds+fundsopret)));
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));