From a7083d1423a8833c54a94e827b933c6911540f0d Mon Sep 17 00:00:00 2001 From: jed Date: Fri, 8 Mar 2013 16:50:29 -0800 Subject: [PATCH] book subscribe --- src/cpp/ripple/RPCHandler.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index 76d135017a..5a1f8edf85 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -2717,16 +2717,20 @@ Json::Value RPCHandler::doSubscribe(Json::Value jvRequest, int& cost) for (Json::Value::iterator it = jvRequest["books"].begin(); it != jvRequest["books"].end(); it++) { uint160 currencyOut; - STAmount::issuerFromString(currencyOut,(*it)["CurrencyOut"].asString()); - uint160 issuerOut = RippleAddress::createNodePublic( (*it)["IssuerOut"].asString() ).getAccountID(); + STAmount::currencyFromString(currencyOut,(*it)["CurrencyOut"].asString()); + uint160 issuerOut,issuerIn; + if(currencyOut.isNonZero()) + STAmount::issuerFromString(issuerOut,(*it)["IssuerOut"].asString()); uint160 currencyIn; - STAmount::issuerFromString(currencyOut,(*it)["CurrencyIn"].asString()); - uint160 issuerIn = RippleAddress::createNodePublic( (*it)["IssuerIn"].asString() ).getAccountID(); + STAmount::currencyFromString(currencyIn,(*it)["CurrencyIn"].asString()); + if(currencyIn.isNonZero()) + STAmount::issuerFromString(issuerIn,(*it)["IssuerIn"].asString()); mNetOps->subBook(ispSub, currencyIn, currencyOut, issuerIn, issuerOut); if((*it)["StateNow"].asBool()) { - + //lpLedger = theApp->getLedgerMaster().getClosedLedger(); + //mNetOps->getBookPage(lpLedger, uTakerPaysCurrencyID, uTakerPaysIssuerID, uTakerGetsCurrencyID, uTakerGetsIssuerID, raTakerID.getAccountID(), false, iLimit, jvMarker, jvResult); } } }