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

Merge pull request #1489 from Alrighttt/FSM

Browse Source 
change oraclessamples output to obj
This commit is contained in:
jl777
2019-05-19 16:33:11 -11:00
committed by GitHub
parent 35d34e6bc6 5c77b99a66
commit 1ea6df970b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cc/oracles.cpp
View File

@@ -924,14 +924,13 @@ std::string OracleData(int64_t txfee,uint256 oracletxid,std::vector <uint8_t> da
UniValue OracleFormat(uint8_t *data,int32_t datalen,char *format,int32_t formatlen) UniValue OracleFormat(uint8_t *data,int32_t datalen,char *format,int32_t formatlen)
{ {
UniValue obj(UniValue::VARR); uint256 hash; int32_t i,j=0; int64_t val; char str[IGUANA_MAXSCRIPTSIZE*2+1]; uint256 hash; int32_t i,j=0; int64_t val; char str[IGUANA_MAXSCRIPTSIZE*2+1];
for (i=0; i<formatlen && j<datalen; i++) for (i=0; i<formatlen && j<datalen; i++)
{ {
str[0] = 0; str[0] = 0;
j = oracle_format(&hash,&val,str,format[i],data,j,datalen); j = oracle_format(&hash,&val,str,format[i],data,j,datalen);
if ( j < 0 ) if ( j < 0 )
break; break;
obj.push_back(str);
if ( j >= datalen ) if ( j >= datalen )
break; break;
} }
@@ -954,9 +953,9 @@ UniValue OracleDataSamples(uint256 reforacletxid,uint256 batontxid,int32_t num)
{ {
if ( (formatstr= (char *)format.c_str()) == 0 ) if ( (formatstr= (char *)format.c_str()) == 0 )
formatstr = (char *)""; formatstr = (char *)"";
UniValue a(UniValue::VARR); UniValue a(UniValue::VOBJ);
a.push_back(OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size())); a.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size())));
a.push_back(uint256_str(str,batontxid)); a.push_back(Pair("txid",uint256_str(str,batontxid)));
b.push_back(a); b.push_back(a);
batontxid = btxid; batontxid = btxid;
if ( ++n >= num && num != 0) if ( ++n >= num && num != 0)