Move KOMODO_VERSION and VERUS_VERSION to version.h

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 0586481476488a6ab21ade013b74d280cda86cc4..2f34d9c0dcf2519666bd27a02f171bcfe700118d 100644 (file)
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -9,6 +9,7 @@
 #include "rpc/protocol.h"
 #include "util.h"
 #include "utilstrencodings.h"
+#include "version.h"
 
 #include <boost/filesystem/operations.hpp>
 #include <stdio.h>
@@ -100,7 +101,7 @@ static int AppInitRPC(int argc, char* argv[])
     ParseParameters(argc, argv);
     komodo_args(argv[0]);
     if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
-        std::string strUsage = _("Verus RPC client version 0.6.0-301-PBaaS-Cross-chain-Technology-Preview") + " " + "\n" + PrivacyInfo();
+        std::string strUsage = _("Verus RPC client version") + " v" + _(VERUS_VERSION) + "\n" + PrivacyInfo();
         if (!mapArgs.count("-version")) {      strUsage += "\n" + _("Usage:") + "\n" +
                   "  verus [options] <command> [params]  " + _("Send command to Komodo") + "\n" +
                   "  verus [options] help                " + _("List commands") + "\n" +

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 1a036156c4168a18cbd8f35c106322ebf0eb8ddf..549dc4f2101aaee3a3f2d6e00db514ac42167880 100644 (file)
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -12,6 +12,7 @@
 #include "util.h"
 #include "httpserver.h"
 #include "httprpc.h"
+#include "version.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
@@ -99,7 +100,7 @@ bool AppInit(int argc, char* argv[])
     // Process help and version before taking care about datadir
     if (mapArgs.count("-?") || mapArgs.count("-h") ||  mapArgs.count("-help") || mapArgs.count("-version"))
     {
-        std::string strUsage = _("Verus Daemon") + " " + _("version") + " " + _("0.6.0-30-PBaaS-Cross-chain-Technology-Preview") + "\n" + PrivacyInfo();
+        std::string strUsage = _("Verus Daemon") + " " + _("version") + " v" + _(VERUS_VERSION) + "\n" + PrivacyInfo();
         if (mapArgs.count("-version"))
         {
             strUsage += LicenseInfo();

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 60eaef4360a7e19fc1635aacfb2013547bfd0f3d..5b76642637e27d53e09f8e3fe393d470b7c382a3 100644 (file)
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -13,6 +13,7 @@
 #include "timedata.h"
 #include "txmempool.h"
 #include "util.h"
+#include "../version.h"
 #include "pbaas/crosschainrpc.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
@@ -57,8 +58,7 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint32_t komodo_segid32(char *coinaddr);
 int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
-#define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.6.0-30-PBaaS-Cross-chain-Technology-Preview"
+
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
 extern uint32_t ASSETCHAINS_CC;
 extern uint32_t ASSETCHAINS_MAGIC;

diff --git a/src/version.h b/src/version.h
index 8e47b82b2a181dff213426b460a8f85190dd3d80..ebce3e199eacc499dd1cbcbde95224bc23e7598e 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -34,4 +34,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
 //! "filter*" commands are disabled without NODE_BLOOM after and including this version
 static const int NO_BLOOM_VERSION = 170004;
 
+#define KOMODO_VERSION "0.2.1"
+#define VERUS_VERSION "0.6.0-30-PBaaS-Cross-chain-Technology-Preview"
+
 #endif // BITCOIN_VERSION_H