@ -197,7 +197,7 @@ int64_t OracleCurrentDatafee(uint256 reforacletxid,char *markeraddr,CPubKey publ
{
uint256 txid , oracletxid , hashBlock ; int64_t datafee = 0 , dfee ; int32_t dheight = 0 , vout , height , numvouts ; CTransaction tx ; CPubKey pk ;
std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > unspentOutputs ;
SetCCunspents ( unspentOutputs , markeraddr ) ;
SetCCunspents ( unspentOutputs , markeraddr , true ) ;
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
txid = it - > first . txhash ;
@ -260,7 +260,7 @@ uint256 OracleBatonUtxo(uint64_t txfee,struct CCcontract_info *cp,uint256 refora
{
uint256 txid , oracletxid , hashBlock , btxid , batontxid = zeroid ; int64_t dfee ; int32_t dheight = 0 , vout , height , numvouts ; CTransaction tx ; CPubKey pk ; uint8_t * ptr ; std : : vector < uint8_t > vopret , data ;
std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > unspentOutputs ;
SetCCunspents ( unspentOutputs , batonaddr ) ;
SetCCunspents ( unspentOutputs , batonaddr , true ) ;
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
txid = it - > first . txhash ;
@ -306,7 +306,7 @@ uint256 OraclesBatontxid(uint256 reforacletxid,CPubKey refpk)
batontxid = zeroid ;
cp = CCinit ( & C , EVAL_ORACLES ) ;
CCtxidaddr ( markeraddr , reforacletxid ) ;
SetCCunspents ( unspentOutputs , markeraddr ) ;
SetCCunspents ( unspentOutputs , markeraddr , true ) ;
//char str[67]; fprintf(stderr,"markeraddr.(%s) %s\n",markeraddr,pubkey33_str(str,(uint8_t *)&refpk));
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
@ -525,14 +525,14 @@ int32_t oracleprice_add(std::vector<struct oracleprice_info> &publishers,CPubKey
} else return ( 0 ) ;
}
int64_t OraclePrice ( int32_t height , uint256 reforacletxid , char * markeraddr , char * format )
/*int64_t OraclePrice(int32_t height,uint256 reforacletxid,char *markeraddr,char *format)
{
std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > unspentOutputs ;
CTransaction regtx ; uint256 hash , txid , oracletxid , batontxid ; CPubKey pk ; int32_t i , ht , maxheight = 0 ; int64_t datafee , price ; char batonaddr [ 64 ] ; std : : vector < uint8_t > data ; struct CCcontract_info * cp , C ; std : : vector < struct oracleprice_info > publishers ; std : : vector < int64_t > prices ;
if ( format [ 0 ] ! = ' L ' )
return ( 0 ) ;
cp = CCinit ( & C , EVAL_ORACLES ) ;
SetCCunspents ( unspentOutputs , markeraddr ) ;
SetCCunspents ( unspentOutputs , markeraddr , true ) ;
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
txid = it - > first . txhash ;
@ -562,7 +562,7 @@ int64_t OraclePrice(int32_t height,uint256 reforacletxid,char *markeraddr,char *
return ( OracleCorrelatedPrice ( height , prices ) ) ;
}
return ( 0 ) ;
}
} */
int64_t IsOraclesvout ( struct CCcontract_info * cp , const CTransaction & tx , int32_t v )
{
@ -708,7 +708,7 @@ int64_t AddOracleInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,uint
char coinaddr [ 64 ] , funcid ; int64_t nValue , price , totalinputs = 0 ; uint256 tmporacletxid , tmpbatontxid , txid , hashBlock ; std : : vector < uint8_t > origpubkey , data ; CTransaction vintx ; int32_t numvouts , vout , n = 0 ;
std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > unspentOutputs ; CPubKey tmppk ; int64_t tmpnum ;
GetCCaddress ( cp , coinaddr , pk ) ;
SetCCunspents ( unspentOutputs , coinaddr ) ;
SetCCunspents ( unspentOutputs , coinaddr , true ) ;
//fprintf(stderr,"addoracleinputs from (%s)\n",coinaddr);
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
@ -746,7 +746,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 < std : : pair < CAddressIndexKey , CAmount > > addressIndex ;
GetCCaddress ( cp , coinaddr , publisher ) ;
SetCCtxids ( addressIndex , coinaddr ) ;
SetCCtxids ( addressIndex , coinaddr , true ) ;
//fprintf(stderr,"scan lifetime of %s\n",coinaddr);
for ( std : : vector < std : : pair < CAddressIndexKey , CAmount > > : : const_iterator it = addressIndex . begin ( ) ; it ! = addressIndex . end ( ) ; it + + )
{
@ -992,7 +992,7 @@ UniValue OracleInfo(uint256 origtxid)
result . push_back ( Pair ( " description " , description ) ) ;
result . push_back ( Pair ( " format " , format ) ) ;
result . push_back ( Pair ( " marker " , markeraddr ) ) ;
SetCCunspents ( unspentOutputs , markeraddr ) ;
SetCCunspents ( unspentOutputs , markeraddr , true ) ;
for ( std : : vector < std : : pair < CAddressUnspentKey , CAddressUnspentValue > > : : const_iterator it = unspentOutputs . begin ( ) ; it ! = unspentOutputs . end ( ) ; it + + )
{
txid = it - > first . txhash ;
@ -1028,7 +1028,7 @@ UniValue OraclesList()
{
UniValue result ( UniValue : : VARR ) ; std : : vector < std : : pair < CAddressIndexKey , CAmount > > addressIndex ; struct CCcontract_info * cp , C ; uint256 txid , hashBlock ; CTransaction createtx ; std : : string name , description , format ; char str [ 65 ] ;
cp = CCinit ( & C , EVAL_ORACLES ) ;
SetCCtxids ( addressIndex , cp - > normaladdr ) ;
SetCCtxids ( addressIndex , cp - > normaladdr , true ) ;
for ( std : : vector < std : : pair < CAddressIndexKey , CAmount > > : : const_iterator it = addressIndex . begin ( ) ; it ! = addressIndex . end ( ) ; it + + )
{
txid = it - > first . txhash ;
jl777
5 years ago