diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 8ad3a331c..683cb2a33 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -502,7 +502,7 @@ void hush_changeblocktime() { pCurrentParams->consensus.nMaxFutureBlockTime = 7 * ASSETCHAINS_BLOCKTIME; pCurrentParams->consensus.nPowTargetSpacing = ASSETCHAINS_BLOCKTIME; - fprintf(stderr,"HUSH blocktime changing to %d seconds\n",ASSETCHAINS_BLOCKTIME); + fprintf(stderr,"DragonX blocktime changing to %d seconds\n",ASSETCHAINS_BLOCKTIME); } void hush_setactivation(int32_t height) diff --git a/src/hush_utils.h b/src/hush_utils.h index d629f18e5..91a51e05a 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1466,7 +1466,7 @@ uint32_t hush_smartmagic(char *symbol,uint64_t supply,uint8_t *extraptr,int32_t { vcalc_sha256(0,hash.bytes,extraptr,extralen); crc0 = hash.uints[0]; - fprintf(stderr,"HUSH raw magic="); + fprintf(stderr,"DragonX raw magic="); int32_t i; for (i=0; i 0 ) { - ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL))); + ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL))); ret.push_back(Pair("currentheight", (int64_t)chainActive.LastTip()->GetHeight())); ret.push_back(Pair("key",params[0].get_str())); ret.push_back(Pair("keylen",keylen)); diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp index ee4afcf17..ef6d06db4 100644 --- a/src/rpc/crosschain.cpp +++ b/src/rpc/crosschain.cpp @@ -104,7 +104,7 @@ UniValue height_MoM(const UniValue& params, bool fHelp, const CPubKey& mypk) } //fprintf(stderr,"height_MoM height.%d\n",height); depth = hush_MoM(¬arized_height,&MoM,&hushtxid,height,&MoMoM,&MoMoMoffset,&MoMoMdepth,&hushstarti,&hushendi); - ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL))); + ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL))); ret.push_back(Pair("height",height)); ret.push_back(Pair("timestamp",(uint64_t)timestamp)); if ( depth > 0 ) @@ -165,7 +165,7 @@ UniValue calc_MoM(const UniValue& params, bool fHelp, const CPubKey& mypk) throw runtime_error("calc_MoM illegal height or MoMdepth\n"); //fprintf(stderr,"height_MoM height.%d\n",height); MoM = hush_calcMoM(height,MoMdepth); - ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL))); + ret.push_back(Pair("coin",(char *)(SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL))); ret.push_back(Pair("height",height)); ret.push_back(Pair("MoMdepth",MoMdepth)); ret.push_back(Pair("MoM",MoM.GetHex())); @@ -235,7 +235,7 @@ UniValue getNotarizationsForBlock(const UniValue& params, bool fHelp, const CPub item.push_back(make_pair("notaries",notaryarr)); hush.push_back(item); } - out.push_back(make_pair("HUSH", hush)); + out.push_back(make_pair("DRAGONX", hush)); return out; } diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index c0c2022e8..36fd5a473 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -387,7 +387,7 @@ UniValue genminingCSV(const UniValue& params, bool fHelp, const CPubKey& mypk) if (fHelp || params.size() != 0 ) throw runtime_error("genminingCSV\n"); LOCK(cs_main); - sprintf(fname,"%s_mining.csv",SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL); + sprintf(fname,"%s_mining.csv",SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL); if ( (fp= fopen(fname,"wb")) != 0 ) { fprintf(fp,"height,nTime,nBits,bnTarget,bnTargetB,diff,solvetime\n"); @@ -1019,8 +1019,8 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp, const CPubKey& mypk "1. height (numeric, optional) The block height. If not provided, defaults to the current height of the chain.\n" "\nResult:\n" "{\n" - " \"miner\" : x.xxx (numeric) The mining reward amount in HUSH.\n" - " \"ac_pubkey\" : x.xxx (numeric) The mining reward amount in HUSH.\n" + " \"miner\" : x.xxx (numeric) The mining reward amount in DRAGONX.\n" + " \"ac_pubkey\" : x.xxx (numeric) The mining reward amount in DRAGONX.\n" "}\n" "\nExamples:\n" + HelpExampleCli("getblocksubsidy", "1000") diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 0cf02813d..9f334dffa 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -307,7 +307,7 @@ UniValue getinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) } if ( ASSETCHAINS_CC != 0 ) obj.push_back(Pair("CCid", (int)ASSETCHAINS_CC)); - obj.push_back(Pair("name", SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL)); + obj.push_back(Pair("name", SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL)); obj.push_back(Pair("p2pport", ASSETCHAINS_P2PPORT)); obj.push_back(Pair("rpcport", ASSETCHAINS_RPCPORT)); @@ -445,7 +445,7 @@ UniValue coinsupply(const UniValue& params, bool fHelp, const CPubKey& mypk) if ( (supply= hush_coinsupply(&zfunds,height)) > 0 ) { result.push_back(Pair("result", "success")); - result.push_back(Pair("coin", SMART_CHAIN_SYMBOL[0] == 0 ? "HUSH" : SMART_CHAIN_SYMBOL)); + result.push_back(Pair("coin", SMART_CHAIN_SYMBOL[0] == 0 ? "DRAGONX" : SMART_CHAIN_SYMBOL)); result.push_back(Pair("height", (int)height)); result.push_back(Pair("supply", ValueFromAmount(supply))); result.push_back(Pair("zfunds", ValueFromAmount(zfunds))); diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 4c9de7c95..dd3ae5695 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -628,7 +628,7 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp, const CPubKey& " ]\n" "2. \"outputs\" (object, required) a json object with outputs\n" " {\n" - " \"address\": x.xxx, (numeric or string, required) The key is the HUSH address or script (in hex), the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n" + " \"address\": x.xxx, (numeric or string, required) The key is the DragonX address or script (in hex), the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n" " \"data\": \"hex\" (string, optional) The key is \"data\", the value is hex encoded OP_RETURN data\n" " ,...\n" " }\n" @@ -804,7 +804,7 @@ UniValue decoderawtransaction(const UniValue& params, bool fHelp, const CPubKey& " \"reqSigs\" : n, (numeric) The required sigs\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"addresses\" : [ (json array of string)\n" - " \"RTZMZHDFSTFQst8XmX2dR4DaH87cEUs3gC\" (string) HUSH address\n" + " \"RTZMZHDFSTFQst8XmX2dR4DaH87cEUs3gC\" (string) DragonX address\n" " ,...\n" " ]\n" " }\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index deb7f3217..ddc40484b 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -4049,7 +4049,7 @@ UniValue z_getbalances(const UniValue& params, bool fHelp, const CPubKey& mypk) throw runtime_error( "z_getbalances\n" "\nReturns array of addresses with their unspent shielded balances.\n" - "Optionally filter to only include addresses with at least minbal HUSH.\n" + "Optionally filter to only include addresses with at least minbal DRAGONX.\n" "Results are an array of Objects, each of which has:\n" "{address, balance}\n" "\nArguments:\n"