From 5ec7f56c22c4fbb0e165ff1a6f81e6387c7f96c6 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sun, 14 Apr 2019 06:33:43 -0700 Subject: [PATCH] Convert to HUSH3 asset name to prevent confusion about HUSH chainparams in iguana/etc --- src/hush-cli | 2 +- src/hush-cli-testnet | 2 +- src/hushd | 3 +-- src/hushd-testnet | 2 +- src/komodo_bitcoind.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hush-cli b/src/hush-cli index 8761fcb38..efa1840a6 100755 --- a/src/hush-cli +++ b/src/hush-cli @@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -NAME=HUSH +NAME=HUSH3 CLI=${KOMODOCLI:-./komodo-cli} $CLI -ac_name=$NAME "$@" diff --git a/src/hush-cli-testnet b/src/hush-cli-testnet index 035fe1924..daa16e35b 100755 --- a/src/hush-cli-testnet +++ b/src/hush-cli-testnet @@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -NAME=HUSHT +NAME=HUSHT3 CLI=${KOMODOCLI:-./komodo-cli} $CLI -ac_name=$NAME "$@" diff --git a/src/hushd b/src/hushd index 2c5470c27..f6f7d4519 100755 --- a/src/hushd +++ b/src/hushd @@ -5,8 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -# ALMOST! FINALIZED -NAME=HUSH +NAME=HUSH3 # this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac diff --git a/src/hushd-testnet b/src/hushd-testnet index 834bc4696..cfd189af7 100755 --- a/src/hushd-testnet +++ b/src/hushd-testnet @@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR # TESTING VALUES, DO NOT USE EXCEPT FOR DEVELOPMENT -NAME=HUSHT +NAME=HUSH3T # this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index f4309e996..e103df99d 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1228,7 +1228,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height) commission = ((nSubsidy * ASSETCHAINS_COMMISSION) / COIN); //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, "HUSHT") != 0)) { + if ((strcmp(ASSETCHAINS_SYMBOL, "HUSH3") != 0) || (strcmp(ASSETCHAINS_SYMBOL, "HUSH3T") != 0)) { // 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 // but to tell the AC params, I need to say "11% of 11.25" is 1.25