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

src/hush-cli-testnet

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

src/hushd

@@ -30,7 +30,6 @@ HEIR=234
 CHANNEL=235
 ORACLE=236
 GATEWAY=241
-DILITHIUM=
 CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY
 
 #NOTE: This is not compatible with upstream KMD komodod,

src/hushd-testnet

@@ -2,7 +2,7 @@
 # Copyright (c) 2019 Hush developers
 
 # set working directory to the location of this script
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )" && pwd )"
 cd $DIR
 
 # TESTING VALUES, DO NOT USE EXCEPT FOR DEVELOPMENT
@@ -12,15 +12,16 @@ SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac
 
 # Chain parameters
 ERAS=3
-BLOCKTIME=10
-SUPPLY=6250000
+BLOCKTIME=150
+# 6250000 - (sprout pool at block 500,000)
+SUPPLY=6178674
 FOUNDERS=1
 REWARD=0,1125000000,562500000
-HALVING=29,34,84
-END=28,34,501
 PERC=11111111
+HALVING=129,340000,840000
+# NOTE: keep in sync with komodo_bitcoind.h
+END=128,340000,5422111
 CLIENTNAME=GoldenSandtrout
-PERC=11111111
 SEEDNODE=188.165.212.101
 CCLIB=hush3
 
@@ -32,6 +33,9 @@ ORACLE=236
 GATEWAY=241
 CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY
 
+#NOTE: This is not compatible with upstream KMD komodod,
+# but you can reuse one hush3 komodod binary in various
+# directories/repos on one server, to save disk space
 KMD=${KOMODOD:-./komodod}
 $KMD -ac_name=$NAME -ac_sapling=1                \
      -ac_reward=$REWARD                          \
@@ -39,7 +43,6 @@ $KMD -ac_name=$NAME -ac_sapling=1                \
      -ac_end=$END                                \
      -ac_eras=$ERAS                              \
      -ac_blocktime=$BLOCKTIME                    \
-     -ac_perc=$PERC                              \
      -ac_cc=2 -ac_ccenable=$CCENABLE             \
      -ac_founders=$FOUNDERS -ac_supply=$SUPPLY   \
      -ac_perc=$PERC                              \