From 9edf27ec053597178bcf178624c9a296a754f34d Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 Apr 2018 16:05:56 +0300 Subject: [PATCH] +print --- src/deprecation.cpp | 2 +- src/komodo_utils.h | 3 ++- src/policy/fees.cpp | 2 +- src/pow.cpp | 2 +- src/qt/transactiondesc.cpp | 2 +- src/rpcmisc.cpp | 5 +++-- src/rpcserver.cpp | 2 +- src/txmempool.cpp | 2 +- src/util.h | 3 +++ 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/deprecation.cpp b/src/deprecation.cpp index 8898e049a..73ff8046d 100644 --- a/src/deprecation.cpp +++ b/src/deprecation.cpp @@ -11,7 +11,7 @@ #include "chainparams.h" static const std::string CLIENT_VERSION_STR = FormatVersion(CLIENT_VERSION); -extern char ASSETCHAINS_SYMBOL[]; +extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; void EnforceNodeDeprecation(int nHeight, bool forceLogging) { diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 80983cfa8..e6dcd2889 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1663,7 +1663,8 @@ void komodo_args(char *argv0) } } BITCOIND_PORT = GetArg("-rpcport", BaseParams().RPCPort()); - //fprintf(stderr,"%s chain params initialized\n",ASSETCHAINS_SYMBOL); + if ( ASSETCHAINS_SYMBOL[0] != 0 ) + fprintf(stderr,"(%s) port.%u chain params initialized\n",ASSETCHAINS_SYMBOL,BITCOIND_PORT); } void komodo_nameset(char *symbol,char *dest,char *source) diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 014b97cc3..e4ff99246 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -53,7 +53,7 @@ void TxConfirmStats::ClearCurrent(unsigned int nBlockHeight) unsigned int TxConfirmStats::FindBucketIndex(double val) { - extern char ASSETCHAINS_SYMBOL[]; + extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; auto it = bucketMap.lower_bound(val); if ( it != bucketMap.end() ) { diff --git a/src/pow.cpp b/src/pow.cpp index 310e9721b..bd2410616 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -123,7 +123,7 @@ CBlockIndex *komodo_chainactive(int32_t height); void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height); extern int32_t KOMODO_CHOSEN_ONE; extern uint64_t ASSETCHAINS_STAKED; -extern char ASSETCHAINS_SYMBOL[]; +extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; #define KOMODO_ELECTION_GAP 2000 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,uint32_t blocktimes[66],int32_t *nonzpkeysp,int32_t height); diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index d8a0a184b..170e45d59 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -264,7 +264,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco if (wtx.IsCoinBase()) { - extern char ASSETCHAINS_SYMBOL[]; + extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; if ( ASSETCHAINS_SYMBOL[0] == 0 ) COINBASE_MATURITY = _COINBASE_MATURITY; quint32 numBlocksToMaturity = COINBASE_MATURITY + 1; diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index cab292571..39ca817e5 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -50,7 +50,7 @@ int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp); uint32_t komodo_chainactive_timestamp(); int32_t komodo_whoami(char *pubkeystr,int32_t height,uint32_t timestamp); extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE; -extern char ASSETCHAINS_SYMBOL[]; +extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp); #define KOMODO_VERSION "0.1.1" extern uint16_t ASSETCHAINS_PORT; @@ -155,9 +155,10 @@ UniValue getinfo(const UniValue& params, bool fHelp) } if ( ASSETCHAINS_CC != 0 ) obj.push_back(Pair("CCid", (int)ASSETCHAINS_CC)); + obj.push_back(Pair("name", ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL)); if ( ASSETCHAINS_SYMBOL[0] != 0 ) { - obj.push_back(Pair("name", ASSETCHAINS_SYMBOL)); + //obj.push_back(Pair("name", ASSETCHAINS_SYMBOL)); obj.push_back(Pair("port", ASSETCHAINS_PORT)); obj.push_back(Pair("magic", (int)ASSETCHAINS_MAGIC)); if ( ASSETCHAINS_SUPPLY != 0 ) diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 55dcabbb5..d3e08a935 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -238,7 +238,7 @@ UniValue help(const UniValue& params, bool fHelp) return tableRPC.help(strCommand); } -extern char ASSETCHAINS_SYMBOL[]; +extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; UniValue stop(const UniValue& params, bool fHelp) { diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 164d5bb47..d14de08b9 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -315,7 +315,7 @@ void CTxMemPool::remove(const CTransaction &origTx, std::list& rem void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags) { // Remove transactions spending a coinbase which are now immature - extern char ASSETCHAINS_SYMBOL[]; + extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; if ( ASSETCHAINS_SYMBOL[0] == 0 ) COINBASE_MATURITY = _COINBASE_MATURITY; // Remove transactions spending a coinbase which are now immature and no-longer-final transactions diff --git a/src/util.h b/src/util.h index faf741409..a9f5ba1f8 100644 --- a/src/util.h +++ b/src/util.h @@ -257,4 +257,7 @@ template void TraceThread(const char* name, Callable func) } } +#define KOMODO_ASSETCHAIN_MAXLEN 65 + + #endif // BITCOIN_UTIL_H