diff --git a/AUTHORS b/AUTHORS index d2d49e2e0..20bd581e2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Duke Leto https://git.hush.is/duke https://github.com/leto Miodrag https://github.com/miodragpop +jahway603 https://git.hush.is/jahway603 https://github.com/jahway603 # The SuperNET Developers diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 2933d7393..5d01384fb 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers -// Copyright (c) 2016-2021 The Hush developers +// Copyright (c) 2016-2022 The Hush developers // Distributed under the GPLv3 software license, see the accompanying // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /****************************************************************************** @@ -295,7 +295,7 @@ UniValue getinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC())); obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); obj.push_back(Pair("errors", GetWarnings("statusbar"))); - if ( NOTARY_PUBKEY33[0] != 0 ) { + if ( NOTARY_PUBKEY33[0] != 0 ) { char pubkeystr[65]; int32_t notaryid; std::string notaryname; if( (notaryid= hush_whoami(pubkeystr,(int32_t)chainActive.LastTip()->GetHeight(),hush_chainactive_timestamp())) >= 0 ) { obj.push_back(Pair("notaryid", notaryid)); @@ -347,8 +347,17 @@ UniValue getinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) if ( ASSETCHAINS_COMMISSION != 0 ) obj.push_back(Pair("commission", ASSETCHAINS_COMMISSION)); - if ( ASSETCHAINS_ALGO != ASSETCHAINS_EQUIHASH ) - obj.push_back(Pair("algo",ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO])); + if ( ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH ) + { + obj.push_back(Pair("algo", ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO])); + if ( ASSETCHAINS_NK[0] == 0 ) // display default for Hush + obj.push_back(Pair("equihash N", 200)); + else obj.push_back(Pair("equihash N", ASSETCHAINS_NK[0])); + if ( ASSETCHAINS_NK[1] == 0 ) // display default for Hush + obj.push_back(Pair("equihash K", 9)); + else obj.push_back(Pair("equihash K", ASSETCHAINS_NK[1])); + } + else obj.push_back(Pair("algo", ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO])); } return obj; }