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

Merge pull request #1706 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
jl777
2019-09-07 20:12:37 -11:00
committed by GitHub
parent 873ae098c7 798f68a05c
commit c8e4ccb4c5
11 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/oracles.cpp
View File

@@ -794,7 +794,7 @@ int64_t LifetimeOraclesFunds(struct CCcontract_info *cp,uint256 oracletxid,CPubK
char coinaddr[64]; CPubKey pk; int64_t total=0,num; uint256 txid,hashBlock,subtxid; CTransaction subtx;
std::vector<uint256> txids;
GetCCaddress(cp,coinaddr,publisher);
SetCCtxids(txids,coinaddr,true,EVAL_ORACLES,oracletxid,'S');
SetCCtxids(txids,coinaddr,true,cp->evalcode,oracletxid,'S');
//fprintf(stderr,"scan lifetime of %s\n",coinaddr);
for (std::vector<uint256>::const_iterator it=txids.begin(); it!=txids.end(); it++)
{
@@ -1122,7 +1122,7 @@ UniValue OracleDataSamples(uint256 reforacletxid,char* batonaddr,int32_t num)
break;
}
}
SetCCtxids(txids,batonaddr,true,EVAL_ORACLES,zeroid,'D');
SetCCtxids(txids,batonaddr,true,EVAL_ORACLES,reforacletxid,'D');
if (txids.size()>0)
{
for (std::vector<uint256>::const_iterator it=txids.end()-1; it!=txids.begin(); it--)
@@ -1224,7 +1224,7 @@ UniValue OraclesList()
{
UniValue result(UniValue::VARR); std::vector<uint256> txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock; CTransaction createtx; std::string name,description,format; char str[65];
cp = CCinit(&C,EVAL_ORACLES);
SetCCtxids(txids,cp->normaladdr,false,EVAL_ORACLES,zeroid,'C');
SetCCtxids(txids,cp->normaladdr,false,cp->evalcode,zeroid,'C');
for (std::vector<uint256>::const_iterator it=txids.begin(); it!=txids.end(); it++)
{
txid = *it;