diff --git a/configure.ac b/configure.ac index 64e184bcab..9214c251bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 9) define(_CLIENT_VERSION_REVISION, 7) -define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) AC_INIT([Bitmark Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitmark.org],[bitmark]) diff --git a/src/clientversion.h b/src/clientversion.h index e9201819c3..2f62104010 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -12,7 +12,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_REVISION 7 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_BUILD 2 // Set to true for release, false for prerelease (rc: release candidate) or test build #define CLIENT_VERSION_IS_RELEASE false diff --git a/src/equihash.cpp b/src/equihash.cpp index cb5c521442..3f5192e43d 100644 --- a/src/equihash.cpp +++ b/src/equihash.cpp @@ -705,7 +705,7 @@ bool Equihash::IsValidSolution(const eh_HashState& base_state, std::vector< return false; } - LogPrintf("good solution size\n"); + //LogPrintf("good solution size\n"); std::vector> X; X.reserve(1 << K); diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 908a3af219..870c47af04 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -73,6 +73,11 @@ Value getinfo(const Array& params, bool fHelp) proxyType proxy; GetProxy(NET_IPV4, proxy); + if (!confAlgoIsSet) { + miningAlgo = GetArg("-miningalgo", miningAlgo); + confAlgoIsSet = true; + } + Object obj; obj.push_back(Pair("version", (int)CLIENT_VERSION)); obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); diff --git a/src/util.cpp b/src/util.cpp index 5bca5db562..0f7a275cf0 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -472,6 +472,7 @@ void ParseParameters(int argc, const char* const argv[]) strValue = str.substr(is_index+1); str = str.substr(0, is_index); } + if (fDebug) LogPrintf("str = %s\n",str.c_str()); #ifdef WIN32 boost::to_lower(str); if (boost::algorithm::starts_with(str, "/")) @@ -479,7 +480,12 @@ void ParseParameters(int argc, const char* const argv[]) #endif if (str[0] != '-') break; - + + if (!str.compare(std::string("-algo"))) { + if (fDebug) LogPrintf("set algo to miningalgo"); + str = std::string("-miningalgo"); + } + mapArgs[str] = strValue; mapMultiArgs[str].push_back(strValue); } @@ -1033,9 +1039,13 @@ void ReadConfigFile(map& mapSettingsRet, string strKey = string("-") + it->string_key; if (mapSettingsRet.count(strKey) == 0) { - mapSettingsRet[strKey] = it->value[0]; - // interpret nofoo=1 as foo=0 (and nofoo=0 as foo=1) as long as foo not set) - InterpretNegativeSetting(strKey, mapSettingsRet); + if (!strKey.compare(string("-algo"))) { + if (fDebug) LogPrintf("set algo to miningalgo"); + strKey = string("-miningalgo"); + } + mapSettingsRet[strKey] = it->value[0]; + // interpret nofoo=1 as foo=0 (and nofoo=0 as foo=1) as long as foo not set) + InterpretNegativeSetting(strKey, mapSettingsRet); } mapMultiSettingsRet[strKey].push_back(it->value[0]); }