ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renumber special ledger_indexes and move RPC ledger to new format.

Browse Source
This commit is contained in:
Arthur Britto
2013-03-09 18:28:08 -08:00
parent 56d44b928f
commit dc69a41979
3 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/cpp/ripple/RPCHandler.cpp
View File

@@ -25,7 +25,7 @@
SETUP_LOG();
static const int rpcCOST_DEFAULT = 10;
static const int rpcCOST_DEFAULT = 10;
static const int rpcCOST_EXCEPTION = 20;
static const int rpcCOST_EXPENSIVE = 50;
@@ -1617,7 +1617,7 @@ Json::Value RPCHandler::doLedgerCurrent(Json::Value, int& cost)
// }
Json::Value RPCHandler::doLedger(Json::Value jvRequest, int& cost)
{
if (!jvRequest.isMember("ledger"))
if (!jvRequest.isMember("ledger") && !jvRequest.isMember("ledger_hash") && !jvRequest.isMember("ledger_index"))
{
Json::Value ret(Json::objectValue), current(Json::objectValue), closed(Json::objectValue);
@@ -1630,27 +1630,18 @@ Json::Value RPCHandler::doLedger(Json::Value jvRequest, int& cost)
return ret;
}
std::string strLedger = jvRequest["ledger"].asString();
Ledger::pointer ledger;
Ledger::pointer lpLedger;
Json::Value jvResult = lookupLedger(jvRequest, lpLedger);
if (strLedger == "current")
ledger = theApp->getLedgerMaster().getCurrentLedger();
else if (strLedger == "closed")
ledger = theApp->getLedgerMaster().getClosedLedger();
else if (strLedger.size() > 12)
ledger = theApp->getLedgerMaster().getLedgerByHash(uint256(strLedger));
else
ledger = theApp->getOPs().getLedgerBySeq(jvRequest["ledger"].asUInt());
if (!ledger)
return rpcError(rpcLGR_NOT_FOUND);
if (!lpLedger)
return jvResult;
bool full = jvRequest.isMember("full") && jvRequest["full"].asBool();
Json::Value ret(Json::objectValue);
ScopedUnlock(theApp->getMasterLock());
ledger->addJson(ret, full ? LEDGER_JSON_FULL : 0);
lpLedger->addJson(ret, full ? LEDGER_JSON_FULL : 0);
return ret;
}
@@ -2260,8 +2251,44 @@ Json::Value RPCHandler::lookupLedger(Json::Value jvRequest, Ledger::pointer& lpL
{
Json::Value jvResult;
uint256 uLedger = jvRequest.isMember("ledger_hash") ? uint256(jvRequest["ledger_hash"].asString()) : 0;
int32 iLedgerIndex = jvRequest.isMember("ledger_index") && jvRequest["ledger_index"].isNumeric() ? jvRequest["ledger_index"].asInt() : -2;
uint256 uLedger = jvRequest.isMember("ledger_hash") ? uint256(jvRequest["ledger_hash"].asString()) : 0;
int32 iLedgerIndex = jvRequest.isMember("ledger_index") && jvRequest["ledger_index"].isNumeric() ? jvRequest["ledger_index"].asInt() : LEDGER_CURRENT;
std::string strLedger;
if (jvRequest.isMember("ledger_index") && !jvRequest["ledger_index"].isNumeric())
strLedger = jvRequest["ledger_index"].asString();
// Support for DEPRECATED "ledger".
if (!jvRequest.isMember("ledger"))
{
nothing();
}
else if (jvRequest["ledger"].size() > 12)
{
uLedger = uint256(jvRequest["ledger"].asString());
}
else if (jvRequest["ledger"].isNumeric())
{
iLedgerIndex = jvRequest["ledger"].asInt();
}
else
{
strLedger = jvRequest["ledger"].asString();
}
if (strLedger == "current")
{
iLedgerIndex = LEDGER_CURRENT;
}
else if (strLedger == "closed")
{
iLedgerIndex = LEDGER_CLOSED;
}
else if (strLedger == "validated")
{
iLedgerIndex = LEDGER_VALIDATED;
}
if (!!uLedger)
{
@@ -2277,21 +2304,22 @@ Json::Value RPCHandler::lookupLedger(Json::Value jvRequest, Ledger::pointer& lpL
iLedgerIndex = lpLedger->getLedgerSeq(); // Set the current index, override if needed.
}
if (-1 == iLedgerIndex)
{
lpLedger = theApp->getLedgerMaster().getClosedLedger();
iLedgerIndex = lpLedger->getLedgerSeq();
}
if (-2 == iLedgerIndex)
{
// Default to current ledger.
switch (iLedgerIndex) {
case LEDGER_CURRENT:
lpLedger = mNetOps->getCurrentLedger();
iLedgerIndex = lpLedger->getLedgerSeq();
}
if (-3 == iLedgerIndex)
{ // Last fully-validated ledger
break;
case LEDGER_CLOSED:
lpLedger = theApp->getLedgerMaster().getClosedLedger();
iLedgerIndex = lpLedger->getLedgerSeq();
break;
case LEDGER_VALIDATED:
lpLedger = mNetOps->getValidatedLedger();
iLedgerIndex = lpLedger->getLedgerSeq();
iLedgerIndex = lpLedger->getLedgerSeq();
break;
}
if (iLedgerIndex <= 0)

4
src/cpp/ripple/RPCHandler.h
View File

@@ -9,6 +9,10 @@
#include "SerializedTypes.h"
#include "Ledger.h"
#define LEDGER_CURRENT -1
#define LEDGER_CLOSED -2
#define LEDGER_VALIDATED -3
// used by the RPCServer or WSDoor to carry out these RPC commands
class NetworkOPs;
class InfoSub;