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

+print

Browse Source
This commit is contained in:
jl777
2019-03-02 07:49:37 -11:00
parent 1d692f4df3
commit ef8df0fd1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/komodo_globals.h
View File

@@ -169,7 +169,9 @@ uint64_t komodo_current_supply(uint32_t nHeight)
if (!period) if (!period)
{ {
// no halving, straight multiply // no halving, straight multiply
fprintf(stderr,"cur_money %.8f += %.8f * %d\n",(double)cur_money/COIN,(double)reward/COIN,nHeight);
cur_money += reward * (nHeight - 1); cur_money += reward * (nHeight - 1);
fprintf(stderr,"cur_money %.8f\n",(double)cur_money/COIN);
} }
// if exactly SATOSHIDEN, linear decay to zero or to next era, same as: // if exactly SATOSHIDEN, linear decay to zero or to next era, same as:
// (next_era_reward + (starting reward - next_era_reward) / 2) * num_blocks // (next_era_reward + (starting reward - next_era_reward) / 2) * num_blocks
@@ -264,12 +266,11 @@ uint64_t komodo_current_supply(uint32_t nHeight)
} }
} }
} }
fprintf(stderr,"cur_money %.8f\n",(double)cur_money/COIN);
if ( KOMODO_BIT63SET(cur_money) != 0 ) if ( KOMODO_BIT63SET(cur_money) != 0 )
return(KOMODO_MAXNVALUE); return(KOMODO_MAXNVALUE);
if ( ASSETCHAINS_COMMISSION != 0 ) if ( ASSETCHAINS_COMMISSION != 0 )
{ {
uint64_t newval = (cur_money + (cur_money * ASSETCHAINS_COMMISSION)/COIN); uint64_t newval = (cur_money + (cur_money/COIN * ASSETCHAINS_COMMISSION));
if ( KOMODO_BIT63SET(newval) != 0 ) if ( KOMODO_BIT63SET(newval) != 0 )
return(KOMODO_MAXNVALUE); return(KOMODO_MAXNVALUE);
else if ( newval < cur_money ) // check for underflow else if ( newval < cur_money ) // check for underflow