diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 830dc5098c..975e16da8e 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -144,12 +144,14 @@ + + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 41af172d3c..0d25cfe28b 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -237,6 +237,12 @@ Source Files + + Source Files + + + Source Files + diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index e5387e68b4..b749a76bc0 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -611,15 +611,15 @@ Json::Value NetworkOPs::getServerInfo() switch (mMode) { - case omDISCONNECTED: info["network_state"] = "disconected"; break; - case omCONNECTED: info["network_state"] = "connected"; break; - case omTRACKING: info["network_state"] = "tracking"; break; - case omFULL: info["network_state"] = "validating"; break; - default: info["network_state"] = "unknown"; + case omDISCONNECTED: info["serverState"] = "disconnected"; break; + case omCONNECTED: info["serverState"] = "connected"; break; + case omTRACKING: info["serverState"] = "tracking"; break; + case omFULL: info["serverState"] = "validating"; break; + default: info["serverState"] = "unknown"; } - if (!theConfig.VALIDATION_SEED.isValid()) info["validation_seed"] = "none"; - else info["validation_seed"] = NewcoinAddress::createNodePublic(theConfig.VALIDATION_SEED).humanNodePublic(); + if (!theConfig.VALIDATION_SEED.isValid()) info["serverState"] = "none"; + else info["validationPKey"] = NewcoinAddress::createNodePublic(theConfig.VALIDATION_SEED).humanNodePublic(); return info; } diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index eedb3b6882..c215d10f3e 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -1233,7 +1233,9 @@ Json::Value RPCServer::doSend(Json::Value& params) Json::Value RPCServer::doServerInfo(Json::Value& params) { - return theApp->getOPs().getServerInfo(); + Json::Value ret(Json::objectValue); + ret["info"]=theApp->getOPs().getServerInfo(); + return ret; } // transit_set