ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-05 08:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

WS: Add support ledger_entry to return a ripple_state.

Browse Source
This commit is contained in:
Arthur Britto
2012-09-27 13:36:04 -07:00
parent ff245609ac
commit 22c22bd734
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Amount.cpp
View File

@@ -12,6 +12,7 @@
uint64 STAmount::uRateOne = STAmount::getRate(STAmount(1), STAmount(1)); uint64 STAmount::uRateOne = STAmount::getRate(STAmount(1), STAmount(1));
// --> sCurrency: "", "XNS", or three letter ISO code.
bool STAmount::currencyFromString(uint160& uDstCurrency, const std::string& sCurrency) bool STAmount::currencyFromString(uint160& uDstCurrency, const std::string& sCurrency)
{ {
bool bSuccess = true; bool bSuccess = true;

58
src/WSDoor.cpp
View File

@@ -608,33 +608,23 @@ void WSConnection::doLedgerEntry(Json::Value& jvResult, const Json::Value& jvReq
jvResult["ledger_index"] = uLedgerIndex; jvResult["ledger_index"] = uLedgerIndex;
uint256 uNodeIndex;
if (jvRequest.isMember("index")) if (jvRequest.isMember("index"))
{ {
jvResult["error"] = "notImplemented"; jvResult["error"] = "notImplemented";
} }
else if (jvRequest.isMember("account_root")) else if (jvRequest.isMember("account_root"))
{ {
NewcoinAddress naAccount = NewcoinAddress::createAccountID(jvRequest["account_root"].asString()); NewcoinAddress naAccount;
if (!naAccount.isValid()) if (!naAccount.setAccountID(jvRequest["account_root"].asString()))
{ {
jvResult["error"] = "malformedAddress"; jvResult["error"] = "malformedAddress";
return;
}
uint256 accountRootIndex = Ledger::getAccountRootIndex(naAccount.getAccountID());
SLE::pointer sleNode = noNetwork.getSLE(lpLedger, accountRootIndex);
if (!sleNode)
{
// Not found.
// XXX We should also provide proof.
jvResult["error"] = "entryNotFound";
} }
else else
{ {
jvResult["node"] = sleNode->getJson(0); uNodeIndex = Ledger::getAccountRootIndex(naAccount.getAccountID());
} }
} }
else if (jvRequest.isMember("directory")) else if (jvRequest.isMember("directory"))
@@ -651,12 +641,48 @@ void WSConnection::doLedgerEntry(Json::Value& jvResult, const Json::Value& jvReq
} }
else if (jvRequest.isMember("ripple_state")) else if (jvRequest.isMember("ripple_state"))
{ {
jvResult["error"] = "notImplemented"; NewcoinAddress naA;
NewcoinAddress naB;
uint160 uCurrency;
if (!jvRequest.isMember("accounts")
|| !jvRequest.isMember("currency")
|| !jvRequest["accounts"].isArray()
|| 2 != jvRequest["accounts"].size()) {
jvResult["error"] = "malformedRequest";
}
else if (!naA.setAccountID(jvRequest["accounts"][0u].asString())
|| !naB.setAccountID(jvRequest["accounts"][1u].asString())) {
jvResult["error"] = "malformedAddress";
}
else if (!STAmount::currencyFromString(uCurrency, jvRequest["currency"].asString())) {
jvResult["error"] = "malformedCurrency";
}
else
{
uNodeIndex = Ledger::getRippleStateIndex(naA, naB, uCurrency);
}
} }
else else
{ {
jvResult["error"] = "unknownOption"; jvResult["error"] = "unknownOption";
} }
if (!!uNodeIndex)
{
SLE::pointer sleNode = noNetwork.getSLE(lpLedger, uNodeIndex);
if (!sleNode)
{
// Not found.
// XXX We should also provide proof.
jvResult["error"] = "entryNotFound";
}
else
{
jvResult["node"] = sleNode->getJson(0);
}
}
} }
void WSConnection::doTransactionSubcribe(Json::Value& jvResult, const Json::Value& jvRequest) void WSConnection::doTransactionSubcribe(Json::Value& jvResult, const Json::Value& jvRequest)