From fa8d44fc9cbea077096eda8ac8c15a48dce402b3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 27 Nov 2016 15:06:47 -0300 Subject: [PATCH] test --- src/komodo.h | 2 +- src/komodo_pax.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index aea264253..a7c38399a 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -24,7 +24,7 @@ // b. automated distribution of test REVS snapshot #define KOMODO_ASSETCHAINS_WAITNOTARIZE -#define KOMODO_PAXMAX (100000 * COIN) +#define KOMODO_PAXMAX (10000 * COIN) #include #include diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 2e5ae40db..105a55743 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -388,11 +388,15 @@ uint64_t komodo_paxcalc(uint32_t *pvals,int32_t baseid,int32_t relid,uint64_t ba if ( pvals[USD] != 0 && kmdbtc != 0 && btcusd != 0 ) { baseusd = ((uint64_t)pvalb * 1000000000) / pvals[USD]; - usdvol = komodo_paxvol(basevolume,baseusd) / MINDENOMS[baseid]; + usdvol = komodo_paxvol(basevolume,baseusd); + if ( MINDENOMS[baseid] > MINDENOMS[USD] ) + usdvol /= (MINDENOMS[baseid] / MINDENOMS[USD]); usdkmd = ((uint64_t)btcusd * 1000000000) / kmdbtc; - //printf("base -> USD %llu, BTC %llu ",(long long)baseusd,(long long)btcusd); + printf("kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu ",(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd)); //printf("usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %.8f\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,dstr(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd))); - return(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd)); + if ( MINDENOMS[baseid] < MINDENOMS[USD] ) + return((MINDENOMS[USD]/MINDENOMS[baseid]) * komodo_paxvol(usdvol,usdkmd)); + else return(komodo_paxvol(usdvol,usdkmd)); } //else printf("zero val in KMD conv %llu %llu %llu\n",(long long)pvals[USD],(long long)kmdbtc,(long long)btcusd); } else if ( baseid == relid )