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

Update to production mainnet block reward values

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2019-04-13 19:08:38 -07:00
parent 95d29ee2af
commit d2bec31a7a
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hush-cli-testnet
View File

@@ -5,7 +5,7 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR cd $DIR
NAME=HUSHT7 NAME=HUSHT
CLI=${KOMODOCLI:-./komodo-cli} CLI=${KOMODOCLI:-./komodo-cli}
$CLI -ac_name=$NAME "$@" $CLI -ac_name=$NAME "$@"

4
src/hushd
View File

@@ -5,7 +5,7 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR cd $DIR
# NOT FINALIZED, but very close to our production chainparams # ALMOST! FINALIZED
NAME=HUSH NAME=HUSH
# this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn # this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn
SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac
@@ -18,7 +18,7 @@ FOUNDERS=1
REWARD=0,1125000000,562500000 REWARD=0,1125000000,562500000
PERC=11111111 PERC=11111111
HALVING=129,340000,840000 HALVING=129,340000,840000
# TODO: Re-verify our end block # NOTE: keep in sync with komodo_bitcoind.h
END=128,340000,5422111 END=128,340000,5422111
CLIENTNAME=GoldenSandtrout CLIENTNAME=GoldenSandtrout
SEEDNODE=188.165.212.101 SEEDNODE=188.165.212.101

2
src/hushd-testnet
View File

@@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR cd $DIR
# TESTING VALUES, DO NOT USE EXCEPT FOR DEVELOPMENT # TESTING VALUES, DO NOT USE EXCEPT FOR DEVELOPMENT
NAME=HUSHT7 NAME=HUSHT
# this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn # this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn
SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac

10
src/komodo_bitcoind.h
View File

@@ -1217,14 +1217,18 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height)
{ {
// prod values // prod values
// NOTE: ac_end specifies the first block with 0 reward, not the last block with a reward! // NOTE: ac_end specifies the first block with 0 reward, not the last block with a reward!
//int32_t starting_commission = 125000000, HALVING1 = 340000, INTERVAL = 840000, TRANSITION = 129, BR_END = 5422111; // TODO: BR_END will change slightly based on magicExtra UTXO, up to 10 blocks, and do
// to the fact that -ac_supply only takes integer arguments another max of 5 blocks,
// so could change by at most 15 blocks after mainnet launch
int32_t starting_commission = 125000000, HALVING1 = 340000, INTERVAL = 840000, TRANSITION = 129, BR_END = 5422111;
// testnet values // testnet values
int64_t starting_commission = 125000000, HALVING1 = 34, INTERVAL = 84, TRANSITION = 29; //int64_t starting_commission = 125000000, HALVING1 = 34, INTERVAL = 84, TRANSITION = 29;
nSubsidy = GetBlockSubsidy(height,Params().GetConsensus()); nSubsidy = GetBlockSubsidy(height,Params().GetConsensus());
commission = ((nSubsidy * ASSETCHAINS_COMMISSION) / COIN); commission = ((nSubsidy * ASSETCHAINS_COMMISSION) / COIN);
//fprintf(stderr,"ORIG ht.%d nSubsidy %.8f prod %llu\n",height,(double)nSubsidy/COIN,(long long)(nSubsidy * ASSETCHAINS_COMMISSION)); //fprintf(stderr,"ORIG ht.%d nSubsidy %.8f prod %llu\n",height,(double)nSubsidy/COIN,(long long)(nSubsidy * ASSETCHAINS_COMMISSION));
if ((strcmp(ASSETCHAINS_SYMBOL, "HUSH") != 0) || (strcmp(ASSETCHAINS_SYMBOL, "HUSHT7") != 0)) { if ((strcmp(ASSETCHAINS_SYMBOL, "HUSH") != 0) || (strcmp(ASSETCHAINS_SYMBOL, "HUSHT") != 0)) {
// HUSH supply curve cannot be exactly represented via KMD AC CLI args, so we do it ourselves. // HUSH supply curve cannot be exactly represented via KMD AC CLI args, so we do it ourselves.
// 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