From 00e8a930ff4636b4ab0b70341af2aa5531451906 Mon Sep 17 00:00:00 2001
From: jed <yep@>
Date: Tue, 19 Jun 2012 12:34:57 -0700
Subject: [PATCH] changed server_info RPC

---
 src/NetworkOPs.cpp | 14 +++++++-------
 src/RPCServer.cpp  |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index e96a0d4306..bf6c086b40 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -620,15 +620,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 d3b84fb753..46dcb53b2f 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 <seed> <paying_account> <transit_rate> <starts> <expires>