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

test

Browse Source
This commit is contained in:
jl777
2016-10-24 12:24:19 -03:00
parent 83a7f513e8
commit d836ec3f63
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_pax.h
View File

@@ -162,7 +162,7 @@ uint64_t komodo_paxcalc(uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t vo
if ( baseid != MAX_CURRENCIES ) if ( baseid != MAX_CURRENCIES )
{ {
pax_rank(ranked,pvals); pax_rank(ranked,pvals);
return(ranked[baseid]); return(10 * ranked[baseid]); // map to percentage
} }
} }
else if ( (pvalr= pvals[relid]) != 0 ) else if ( (pvalr= pvals[relid]) != 0 )
@@ -189,7 +189,7 @@ uint64_t komodo_paxprice(int32_t height,char *base,char *rel,uint64_t volume)
return(0); return(0);
} }
int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,int32_t width,char *base,char *rel) int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,char *base,char *rel)
{ {
int32_t baseid=-1,relid=-1,i,ht,num = 0; uint32_t *ptr; int32_t baseid=-1,relid=-1,i,ht,num = 0; uint32_t *ptr;
if ( (baseid= komodo_baseid(base)) >= 0 && (relid= komodo_baseid(rel)) >= 0 ) if ( (baseid= komodo_baseid(base)) >= 0 && (relid= komodo_baseid(rel)) >= 0 )

16
src/rpcblockchain.cpp
View File

@@ -383,7 +383,7 @@ Value gettxoutsetinfo(const Array& params, bool fHelp)
uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime);
uint32_t komodo_txtime(uint256 hash); uint32_t komodo_txtime(uint256 hash);
uint64_t komodo_paxprice(int32_t height,char *base,char *rel,uint64_t basevolume); uint64_t komodo_paxprice(int32_t height,char *base,char *rel,uint64_t basevolume);
int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,int32_t width,char *base,char *rel); int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,char *base,char *rel);
Value paxprice(const Array& params, bool fHelp) Value paxprice(const Array& params, bool fHelp)
{ {
@@ -413,17 +413,19 @@ Value paxprice(const Array& params, bool fHelp)
Value paxprices(const Array& params, bool fHelp) Value paxprices(const Array& params, bool fHelp)
{ {
if ( fHelp || params.size() != 3 ) if ( fHelp || params.size() != 3 )
throw runtime_error("paxprices \"base\" \"rel\" width\n"); throw runtime_error("paxprices \"base\" \"rel\" maxsamples\n");
LOCK(cs_main); LOCK(cs_main);
Object ret; uint64_t relvolume,prices[1024]; uint32_t i,n; int32_t heights[1024]; Object ret; uint64_t relvolume,prices[4096]; uint32_t i,n; int32_t heights[sizeof(prices)/sizeof(*prices)];
std::string base = params[0].get_str(); std::string base = params[0].get_str();
std::string rel = params[1].get_str(); std::string rel = params[1].get_str();
int32_t width = atoi(params[2].get_str().c_str()); int32_t max = atoi(params[2].get_str().c_str());
if ( width < 60 ) if ( maxsamples < 60 )
width = 60; maxsamples = 60;
else if ( maxsamples > sizeof(heights)/sizeof(*heights) )
maxsamples = sizeof(heights)/sizeof(*heights);
ret.push_back(Pair("base", base)); ret.push_back(Pair("base", base));
ret.push_back(Pair("rel", rel)); ret.push_back(Pair("rel", rel));
n = komodo_paxprices(heights,prices,(int32_t)(sizeof(prices)/sizeof(*prices)),width,(char *)base.c_str(),(char *)rel.c_str()); n = komodo_paxprices(heights,prices,maxsamples,(char *)base.c_str(),(char *)rel.c_str());
Array a; Array a;
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {