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

This commit is contained in:
Jonathan "Duke" Leto
2019-04-12 09:00:49 -07:00
2 changed files with 2 additions and 2 deletions

View File

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

View File

@@ -1227,7 +1227,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height)
// Transition period of 128 blocks has no FR
if (height < 129) {
commission = 0;
else if (height < HALVING1) {
} else if (height < HALVING1) {
commission = starting_commission;
} else if (height < HALVING1+1*INTERVAL) {
commission = starting_commission / 2;