This commit is contained in:
jl777
2018-11-01 07:25:45 -11:00
parent 0751d17dad
commit 0cf7cae07c
3 changed files with 4 additions and 3 deletions

View File

@@ -692,7 +692,7 @@ std::string ChannelRefund(uint64_t txfee,uint256 opentxid,uint256 closetxid)
UniValue ChannelsInfo(uint256 channeltxid) UniValue ChannelsInfo(uint256 channeltxid)
{ {
UniValue result(UniValue::VOBJ); CTransaction tx,opentx; uint256 txid,tmp_txid,hashBlock,param3,opentxid,hashchain,prevtxid; UniValue result(UniValue::VOBJ); CTransaction tx,opentx; uint256 txid,tmp_txid,hashBlock,param3,opentxid,hashchain,prevtxid;
struct CCcontract_info *cp,C; char myCCaddr[65],addr[65],str1[256],str2[256]; int32_t vout,numvouts,param1,numpayments; struct CCcontract_info *cp,C; char myCCaddr[65],addr[65],str1[512],str2[256]; int32_t vout,numvouts,param1,numpayments;
int64_t nValue,param2,payment; CPubKey srcpub,destpub,mypk; int64_t nValue,param2,payment; CPubKey srcpub,destpub,mypk;
std::vector<std::pair<CAddressIndexKey, CAmount> > txids; std::vector<std::pair<CAddressIndexKey, CAmount> > txids;
@@ -768,4 +768,4 @@ UniValue ChannelsInfo(uint256 channeltxid)
} }
} }
return(result); return(result);
} }

View File

@@ -143,7 +143,7 @@
*/ */
int32_t GatewaysAddQueue(std::string coin,uint256 txid,CScript scriptPubKey,int64_t nValue) void GatewaysAddQueue(std::string coin,uint256 txid,CScript scriptPubKey,int64_t nValue)
{ {
char destaddr[64],str[65]; char destaddr[64],str[65];
Getscriptaddress(destaddr,scriptPubKey); Getscriptaddress(destaddr,scriptPubKey);

View File

@@ -440,6 +440,7 @@ int64_t correlate_price(int32_t height,int64_t *prices,int32_t n)
for (i=0; i<n; i++) for (i=0; i<n; i++)
fprintf(stderr,"%llu ",(long long)prices[i]); fprintf(stderr,"%llu ",(long long)prices[i]);
fprintf(stderr,"-> %llu ht.%d\n",(long long)price,height); fprintf(stderr,"-> %llu ht.%d\n",(long long)price,height);
return(price);
} }
int64_t OracleCorrelatedPrice(int32_t height,std::vector <int64_t> origprices) int64_t OracleCorrelatedPrice(int32_t height,std::vector <int64_t> origprices)