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

Merge branch 'frfix' of https://github.com/MyHush/hush3 into frfix

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2019-04-12 14:52:14 +02:00
parent 85dd6ce61c 97eeeaa779
commit da53f2ca17
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/komodo_bitcoind.h
View File

@@ -1212,7 +1212,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height)
txn_count = pblock->vtx.size(); txn_count = pblock->vtx.size();
// HUSH prod values // HUSH prod values
//int32_t starting_commission = 125000000, HALVING1 = 340000, INTERVAL = 840000; //int32_t starting_commission = 125000000, HALVING1 = 340000, INTERVAL = 840000;
int64_t starting_commission = 125000000, HALVING1 = 340, INTERVAL = 840; int64_t starting_commission = 125000000, HALVING1 = 340, INTERVAL = 840, TRANSITION = 129;
if ( ASSETCHAINS_FOUNDERS != 0 ) if ( ASSETCHAINS_FOUNDERS != 0 )
{ {
nSubsidy = GetBlockSubsidy(height,Params().GetConsensus()); nSubsidy = GetBlockSubsidy(height,Params().GetConsensus());
@@ -1223,7 +1223,11 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height)
// You specify the BR, and the FR % gets added so 10% of 12.5 is 1.25 // You specify the BR, and the FR % gets added so 10% of 12.5 is 1.25
// but to tell the AC params, I need to say "11% of 11.25" is 1.25 // but to tell the AC params, I need to say "11% of 11.25" is 1.25
// 11% ie. 1/9th cannot be exactly represented and so the FR has tiny amounts of error unless done manually // 11% ie. 1/9th cannot be exactly represented and so the FR has tiny amounts of error unless done manually
if (height < HALVING1) {
// Transition period of 128 blocks has no FR
if (height < 129) {
commission = 0;
else if (height < HALVING1) {
commission = starting_commission; commission = starting_commission;
} else if (height < HALVING1+1*INTERVAL) { } else if (height < HALVING1+1*INTERVAL) {
commission = starting_commission / 2; commission = starting_commission / 2;