From 7e8d7d55398178cd88239b7fea349c74f781d2f4 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 13 Apr 2019 02:55:07 -0700 Subject: [PATCH] Going back to simpler things that work --- src/hushd-testnet | 10 ++++++++++ src/komodo_bitcoind.h | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/hushd-testnet b/src/hushd-testnet index 954001363..2214dea99 100755 --- a/src/hushd-testnet +++ b/src/hushd-testnet @@ -11,9 +11,14 @@ NAME=HUSHT5 SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac # Chain parameters +ERAS=3 BLOCKTIME=10 SUPPLY=6250000 FOUNDERS=1 +REWARD=0,1125000000,562500000 +HALVING=29,34,84 +END=28,34,500 +PERC=11111111 CLIENTNAME=GoldenSandtrout # CryptoConditions/Custom Consensus params @@ -27,6 +32,11 @@ CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY KMD=${KOMODOD:-./komodod} $KMD -ac_name=$NAME -ac_sapling=1 \ + -ac_halving=$HALVING \ + -ac_eras=$ERAS \ + -ac_perc=$PERC \ + -ac_end=$END \ + -ac_reward=$REWARD \ -ac_blocktime=$BLOCKTIME \ -ac_cc=2 -ac_ccenable=$CCENABLE \ -ac_founders=$FOUNDERS -ac_supply=$SUPPLY \ diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 5bde4a773..ef0450f16 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1224,7 +1224,6 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height) // HUSH supply curve cannot be exactly represented via KMD AC CLI args, so we do it manually // 10% of 12.5 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 - // Transition period of 128 blocks has BR=FR=0 if (height < TRANSITION) { commission = 0;