ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-06-19 12:48:23 -07:00
parent c9d06c3fb2 d28852cc9e
commit aa964f645b
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
newcoin.vcxproj
View File

@@ -144,12 +144,14 @@
<ClCompile Include="src\SHAMapDiff.cpp" />
<ClCompile Include="src\SHAMapNodes.cpp" />
<ClCompile Include="src\SHAMapSync.cpp" />
<ClCompile Include="src\Suppression.cpp" />
<ClCompile Include="src\Transaction.cpp" />
<ClCompile Include="src\TransactionEngine.cpp" />
<ClCompile Include="src\TransactionFormats.cpp" />
<ClCompile Include="src\TransactionMaster.cpp" />
<ClCompile Include="src\UniqueNodeList.cpp" />
<ClCompile Include="src\utils.cpp" />
<ClCompile Include="src\ValidationCollection.cpp" />
<ClCompile Include="src\Wallet.cpp" />
</ItemGroup>
<ItemGroup>

6
newcoin.vcxproj.filters
View File

@@ -237,6 +237,12 @@
<ClCompile Include="src\CanonicalTXSet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ValidationCollection.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Suppression.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="KnownNodeList.h">

14
src/NetworkOPs.cpp
View File

@@ -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;
}

4
src/RPCServer.cpp
View File

@@ -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>