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

Merge pull request #39 from jl777/beta

Browse Source 
beta update
This commit is contained in:
ca333
2017-09-01 12:12:19 +02:00
committed by GitHub
parent 15c45c89e5 2198f1cc19
commit 27ac018fd7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_pax.h
View File

@@ -185,7 +185,7 @@ double PAX_BTCUSD(int32_t height,uint32_t btcusd)
btcfactor = 100000.; btcfactor = 100000.;
else btcfactor = 1000.; else btcfactor = 1000.;
BTCUSD = ((double)btcusd / (1000000000. / btcfactor)); BTCUSD = ((double)btcusd / (1000000000. / btcfactor));
if ( height < 500000 && BTCUSD > 20000 ) if ( height >= BTCFACTOR_HEIGHT && height < 500000 && BTCUSD > 20000 && btcfactor == 100000. )
BTCUSD /= 100; BTCUSD /= 100;
return(BTCUSD); 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 ) if ( height >= 236000-10 )
{ {
BTCUSD = PAX_BTCUSD(height,btcusd); BTCUSD = PAX_BTCUSD(height,btcusd);
if ( height < 500000 && BTCUSD > 20000 ) if ( height < BTCFACTOR_HEIGHT || (height < 500000 && BTCUSD > 20000) )
usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000; usdkmd = ((uint64_t)kmdbtc * btcusd) / 1000000000;
else usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000; else usdkmd = ((uint64_t)kmdbtc * btcusd) / 10000000;
///if ( height >= BTCFACTOR_HEIGHT && BTCUSD >= 43 ) ///if ( height >= BTCFACTOR_HEIGHT && BTCUSD >= 43 )