From 7ad554ba6eefc8a7bd94469d7204a394144e92b0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 24 Oct 2016 09:44:00 -0300 Subject: [PATCH] test --- src/komodo.h | 4 +++- src/komodo_interest.h | 1 - src/komodo_pax.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index ceb06e828..0f2165126 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -19,6 +19,8 @@ // Todo: handle reorg: clear all entries above reorged height #define KOMODO_TESTNET_EXPIRATION 60000 +//#define KOMODO_ENABLE_INTEREST enabling this is a hardfork + #define KOMODO_SOURCE "KMD" #define KOMODO_PAX @@ -111,7 +113,7 @@ int32_t komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numno if ( numpvals*sizeof(uint32_t) <= sizeof(pvals) && fread(pvals,sizeof(uint32_t),numpvals,fp) == numpvals ) { komodo_pvals(ht,pvals,numpvals); - printf("load pvals ht.%d numpvals.%d\n",ht,numpvals); + //printf("load pvals ht.%d numpvals.%d\n",ht,numpvals); } else printf("error loading pvals[%d]\n",numpvals); } #endif diff --git a/src/komodo_interest.h b/src/komodo_interest.h index 2e7585516..5a4f0c2c4 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -1,5 +1,4 @@ -//#define KOMODO_ENABLE_INTEREST #define KOMODO_INTEREST ((uint64_t)(0.05 * COIN)) #define dstr(x) ((double)(x)/COIN) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index 79b31d4fe..6a501ede7 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -120,14 +120,14 @@ uint64_t komodo_paxprice(int32_t height,char *base,char *rel,uint64_t volume) //KMDBTC = ((double)kmdbtc / (1000000000. * 1000.)); //BTCUSD = ((double)btcusd / (1000000000. / 1000.)); //KMDUSD = (KMDBTC * BTCUSD); - printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd); - return((volume * baseusd) / kmdbtc); + //printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd); + return((volume * baseusd) / kmdusd); } } else if ( (pvalr= ptr[1 + relid]) != 0 ) { baserel = ((uint64_t)pvalb * 1000000000) / pvalr; - return(volume * baserel); + return((volume * baserel) / 1000000000); } } return(0);