From a8256266cc70858f85b6343345265fa71a8c29f6 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 31 Aug 2017 17:48:14 +0200 Subject: [PATCH 1/3] Test --- src/komodo_pax.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 0bdd75ef8..ae45651c7 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -454,11 +454,14 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re if ( height >= 236000-10 ) { BTCUSD = PAX_BTCUSD(height,btcusd); - if ( height >= BTCFACTOR_HEIGHT && BTCUSD >= 43 ) - usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; - else usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; + if ( height < 500000 && BTCUSD > 20000 ) + usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; + else usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; + ///if ( height >= BTCFACTOR_HEIGHT && BTCUSD >= 43 ) + // usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; + //else usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd); - //fprintf(stderr,"ht.%d kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); + fprintf(stderr,"ht.%d %.3f kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,BTCUSD,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)); From 5246c7edf89b6043a70ef7af80e7f0d204d5fd50 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 31 Aug 2017 18:17:26 +0200 Subject: [PATCH 2/3] Fix paxprice --- src/komodo_pax.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index ae45651c7..3175e7a71 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -461,7 +461,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re // usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; //else usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; price = ((uint64_t)10000000000 * MINDENOMS[USD] / MINDENOMS[baseid]) / komodo_paxvol(usdvol,usdkmd); - fprintf(stderr,"ht.%d %.3f kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,BTCUSD,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); + //fprintf(stderr,"ht.%d %.3f kmdbtc.%llu btcusd.%llu base -> USD %llu, usdkmd %llu usdvol %llu -> %llu\n",height,BTCUSD,(long long)kmdbtc,(long long)btcusd,(long long)baseusd,(long long)usdkmd,(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)),(long long)price); //fprintf(stderr,"usdkmd.%llu basevolume.%llu baseusd.%llu paxvol.%llu usdvol.%llu -> %llu\n",(long long)usdkmd,(long long)basevolume,(long long)baseusd,(long long)komodo_paxvol(basevolume,baseusd),(long long)usdvol,(long long)(MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100))); } else price = (MINDENOMS[USD] * komodo_paxvol(usdvol,usdkmd) / (MINDENOMS[baseid]/100)); From 95d884b6af59b567d285c51d48f4fdc753162b89 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 1 Sep 2017 10:46:11 +0200 Subject: [PATCH 3/3] Test --- src/komodo_pax.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 3175e7a71..aeeb486d8 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -185,7 +185,7 @@ double PAX_BTCUSD(int32_t height,uint32_t btcusd) btcfactor = 100000.; else btcfactor = 1000.; BTCUSD = ((double)btcusd / (1000000000. / btcfactor)); - if ( height < 500000 && BTCUSD > 20000 ) + if ( height >= BTCFACTOR_HEIGHT && height < 500000 && BTCUSD > 20000 && btcfactor == 100000. ) BTCUSD /= 100; return(BTCUSD); } @@ -454,7 +454,7 @@ uint64_t komodo_paxcalc(int32_t height,uint32_t *pvals,int32_t baseid,int32_t re if ( height >= 236000-10 ) { BTCUSD = PAX_BTCUSD(height,btcusd); - if ( height < 500000 && BTCUSD > 20000 ) + if ( height < BTCFACTOR_HEIGHT || (height < 500000 && BTCUSD > 20000) ) usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; else usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; ///if ( height >= BTCFACTOR_HEIGHT && BTCUSD >= 43 )