This commit is contained in:
jl777
2016-10-24 09:44:00 -03:00
parent 58c94994e9
commit 7ad554ba6e
3 changed files with 6 additions and 5 deletions

View File

@@ -19,6 +19,8 @@
// Todo: handle reorg: clear all entries above reorged height // Todo: handle reorg: clear all entries above reorged height
#define KOMODO_TESTNET_EXPIRATION 60000 #define KOMODO_TESTNET_EXPIRATION 60000
//#define KOMODO_ENABLE_INTEREST enabling this is a hardfork
#define KOMODO_SOURCE "KMD" #define KOMODO_SOURCE "KMD"
#define KOMODO_PAX #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 ) if ( numpvals*sizeof(uint32_t) <= sizeof(pvals) && fread(pvals,sizeof(uint32_t),numpvals,fp) == numpvals )
{ {
komodo_pvals(ht,pvals,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); } else printf("error loading pvals[%d]\n",numpvals);
} }
#endif #endif

View File

@@ -1,5 +1,4 @@
//#define KOMODO_ENABLE_INTEREST
#define KOMODO_INTEREST ((uint64_t)(0.05 * COIN)) #define KOMODO_INTEREST ((uint64_t)(0.05 * COIN))
#define dstr(x) ((double)(x)/COIN) #define dstr(x) ((double)(x)/COIN)

View File

@@ -120,14 +120,14 @@ uint64_t komodo_paxprice(int32_t height,char *base,char *rel,uint64_t volume)
//KMDBTC = ((double)kmdbtc / (1000000000. * 1000.)); //KMDBTC = ((double)kmdbtc / (1000000000. * 1000.));
//BTCUSD = ((double)btcusd / (1000000000. / 1000.)); //BTCUSD = ((double)btcusd / (1000000000. / 1000.));
//KMDUSD = (KMDBTC * BTCUSD); //KMDUSD = (KMDBTC * BTCUSD);
printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd); //printf("base -> USD %llu, BTC %llu KMDUSD %llu\n",(long long)baseusd,(long long)btcusd,(long long)kmdusd);
return((volume * baseusd) / kmdbtc); return((volume * baseusd) / kmdusd);
} }
} }
else if ( (pvalr= ptr[1 + relid]) != 0 ) else if ( (pvalr= ptr[1 + relid]) != 0 )
{ {
baserel = ((uint64_t)pvalb * 1000000000) / pvalr; baserel = ((uint64_t)pvalb * 1000000000) / pvalr;
return(volume * baserel); return((volume * baserel) / 1000000000);
} }
} }
return(0); return(0);