Merge branch 'pay'

Conflicts:
	src/NetworkOPs.cpp

src/AccountState.h

@@ -2,7 +2,6 @@
 #define __ACCOUNTSTATE__
 
 // An account's state
-// Used to track information about a local account
 
 #include <vector>
 

src/Amount.cpp

@@ -96,7 +96,7 @@ bool STAmount::setValue(const std::string& sAmount, const std::string& sCurrency
 
 	uint64	uValue;
 	int		iOffset;
-	size_t	uDecimal	= sAmount.find_first_of(".,");
+	size_t	uDecimal	= sAmount.find_first_of("^");
 	bool	bInteger	= uDecimal == std::string::npos;
 
 	if (bInteger)

src/Ledger.cpp

@@ -197,7 +197,7 @@ uint256 Ledger::getHash()
 void Ledger::saveAcceptedLedger(Ledger::pointer ledger)
 {
 	std::string sql="INSERT INTO Ledgers "
-		"(LedgerHash,LedgerSeq,TotalCoins,ClosingTime,AccountSetHash,TransSetHash) VALUES ('";
+		"(LedgerHash,LedgerSeq,PrevHash,TotalCoins,ClosingTime,AccountSetHash,TransSetHash) VALUES ('";
 	sql.append(ledger->getHash().GetHex());
 	sql.append("','");
 	sql.append(boost::lexical_cast<std::string>(ledger->mLedgerSeq));

src/NetworkOPs.cpp

@@ -107,7 +107,7 @@ Transaction::pointer NetworkOPs::processTransaction(Transaction::pointer trans,
 #ifdef DEBUG
 	std::cerr << "Status other than success " << r << std::endl;
 #endif
-	
+
 	trans->setStatus(INVALID);
 	return trans;
 }
@@ -125,7 +125,7 @@ int NetworkOPs::findTransactionsBySource(std::list<Transaction::pointer>& txns,
 	if (minSeq > state->getSeq()) return 0;
 	if (maxSeq > state->getSeq()) maxSeq = state->getSeq();
 	if (maxSeq > minSeq) return 0;
-	
+
 	int count = 0;
 	for(int i = minSeq; i <= maxSeq; ++i)
 	{
@@ -439,4 +439,6 @@ void NetworkOPs::mapComplete(const uint256& hash, SHAMap::pointer map)
 {
 	if (mConsensus)
 		mConsensus->mapComplete(hash, map);
-}
+}
+
+// vim:ts=4

src/NetworkOPs.h

@@ -32,7 +32,7 @@ public:
 
 protected:
 	OperatingMode						mMode;
-	boost::asio::deadline_timer 		mNetTimer;
+	boost::asio::deadline_timer			mNetTimer;
 	boost::shared_ptr<LedgerConsensus>	mConsensus;
 
 public:
@@ -56,7 +56,13 @@ public:
 		uint32 startLedgerSeq, uint32 endLedgerSeq, int maxTransactions);
 
 	// account operations
-	AccountState::pointer getAccountState(const NewcoinAddress& accountID);
+	AccountState::pointer	getAccountState(const NewcoinAddress& accountID);
+
+	//
+	// Ripple functions
+	//
+	bool					getDirLineInfo(const NewcoinAddress& naAccount, uint64& uDirLineNodeFirst, uint64& uDirLineNodeLast) { return false; }
+	std::vector<uint256>	getDirLineNode(const uint64 uDirLineNode) { std::vector<uint256> empty; return empty; }
 
 	// raw object operations
 	bool findRawLedger(const uint256& ledgerHash, std::vector<unsigned char>& rawLedger);
@@ -84,7 +90,6 @@ public:
 	void switchLastClosedLedger(Ledger::pointer newLedger); // Used for the "jump" case
 	int beginConsensus(Ledger::pointer closingLedger, bool isEarly);
 	void setStateTimer(int seconds);
-
 };
 
 #endif

src/RPCDoor.cpp

@@ -1,4 +1,5 @@
 #include "RPCDoor.h"
+#include "Application.h"
 #include "Config.h"
 #include <boost/bind.hpp>
 //#include <boost/log/trivial.hpp>
@@ -16,7 +17,7 @@ RPCDoor::RPCDoor(boost::asio::io_service& io_service) :
 
 void RPCDoor::startListening()
 {
-	RPCServer::pointer new_connection = RPCServer::create(mAcceptor.get_io_service());
+	RPCServer::pointer new_connection = RPCServer::create(mAcceptor.get_io_service(), &theApp->getOPs());
 	mAcceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
 
 	mAcceptor.async_accept(new_connection->getSocket(),

src/RPCServer.cpp

@@ -29,8 +29,8 @@
 Just read from wire until the entire request is in.
 */
 
-RPCServer::RPCServer(boost::asio::io_service& io_service)
-	: mSocket(io_service)
+RPCServer::RPCServer(boost::asio::io_service& io_service , NetworkOPs* nopNetwork)
+	: mNetOps(nopNetwork), mSocket(io_service)
 {
 }
 
@@ -173,10 +173,10 @@ bool RPCServer::extractString(std::string& param, const Json::Value& params, int
 // Given a seed and a source account get the public and private key for authorizing transactions for the account.
 Json::Value RPCServer::authorize(const NewcoinAddress& naSeed, const NewcoinAddress& naSrcAccountID,
 	NewcoinAddress& naAccountPublic, NewcoinAddress& naAccountPrivate,
-	SerializedLedgerEntry::pointer& sleSrc)
+	SLE::pointer& sleSrc)
 {
-	Ledger::pointer					ledger			= theApp->getMasterLedger().getCurrentLedger();
-	LedgerStateParms				qry				= lepNONE;
+	Ledger::pointer		ledger			= theApp->getMasterLedger().getCurrentLedger();
+	LedgerStateParms	qry				= lepNONE;
 
 	sleSrc			= ledger->getAccountRoot(qry, naSrcAccountID);
 	if (!sleSrc)
@@ -189,16 +189,16 @@ Json::Value RPCServer::authorize(const NewcoinAddress& naSeed, const NewcoinAddr
 		return JSONRPCError(500, "source account has not been claimed");
 	}
 
-	NewcoinAddress	naGenerator;
-	NewcoinAddress	na0Public;		// To find the generator index.
-	NewcoinAddress	na0Private;		// To decrypt the master generator's cipher.
+	NewcoinAddress		naGenerator;
+	NewcoinAddress		na0Public;		// To find the generator index.
+	NewcoinAddress		na0Private;		// To decrypt the master generator's cipher.
 
 	naGenerator.setFamilyGenerator(naSeed);
 	na0Public.setAccountPublic(naGenerator, 0);
 	na0Private.setAccountPrivate(naGenerator, naSeed, 0);
 
-									qry				= lepNONE;
-	SerializedLedgerEntry::pointer	sleGen			= ledger->getGenerator(qry, na0Public.getAccountID());
+						qry				= lepNONE;
+	SLE::pointer		sleGen			= ledger->getGenerator(qry, na0Public.getAccountID());
 
 	if (!sleGen)
 	{
@@ -220,8 +220,8 @@ Json::Value RPCServer::authorize(const NewcoinAddress& naSeed, const NewcoinAddr
 	//
 	// Find the index of the account from the master generator, so we can generate the public and private keys.
 	//
-	NewcoinAddress	naMasterAccountPublic;
-	uint			iIndex = -1;	// Compensate for initial increment.
+	NewcoinAddress		naMasterAccountPublic;
+	uint				iIndex = -1;	// Compensate for initial increment.
 
 	// XXX Stop after Config.account_probe_max
 	// Don't look at ledger entries to determine if the account exists.  Don't want to leak to thin server that these accounts are
@@ -246,6 +246,65 @@ Json::Value RPCServer::authorize(const NewcoinAddress& naSeed, const NewcoinAddr
 	return Json::Value(Json::objectValue);
 }
 
+// <-- bIndex: true if iIndex > 0 and used the index.
+Json::Value RPCServer::accountFromString(NewcoinAddress& naAccount, bool& bIndex, const std::string& strIdent, const int iIndex)
+{
+	NewcoinAddress	naSeed;
+
+	if (naAccount.setAccountPublic(strIdent) || naAccount.setAccountID(strIdent))
+	{
+		// Got the account.
+		bIndex	= false;
+	}
+	// Must be a seed.
+	else if (!naSeed.setFamilySeedGeneric(strIdent))
+	{
+		return "disallowed seed";
+	}
+	else
+	{
+		// We allow the use of the seeds to access #0.
+		// This is poor practice and merely for debuging convenience.
+		NewcoinAddress		naGenerator;
+		NewcoinAddress		naRegular0Public;
+		NewcoinAddress		naRegular0Private;
+
+		naGenerator.setFamilyGenerator(naSeed);
+
+		naRegular0Public.setAccountPublic(naGenerator, 0);
+		naRegular0Private.setAccountPrivate(naGenerator, naSeed, 0);
+
+		uint160				uGeneratorID	= naRegular0Public.getAccountID();
+
+		Ledger::pointer		ledger			= theApp->getMasterLedger().getCurrentLedger();
+		LedgerStateParms	qry				= lepNONE;
+		SLE::pointer		sleGen			= ledger->getGenerator(qry, naRegular0Public.getAccountID());
+		if (!sleGen)
+		{
+			// Didn't find a generator map, assume it is a master generator.
+			nothing();
+		}
+		else
+		{
+			// Found master public key.
+			std::vector<unsigned char>	vucCipher				= sleGen->getIFieldVL(sfGenerator);
+			std::vector<unsigned char>	vucMasterGenerator		= naRegular0Private.accountPrivateDecrypt(naRegular0Public, vucCipher);
+			if (vucMasterGenerator.empty())
+			{
+				return "internal error: password failed to decrypt master public generator";
+			}
+
+			naGenerator.setFamilyGenerator(vucMasterGenerator);
+		}
+
+		bIndex	= !iIndex;
+
+		naAccount.setAccountPublic(naGenerator, iIndex);
+	}
+
+	return Json::Value(Json::objectValue);
+}
+
 // account_info <account>|<nickname>|<account_public_key>
 // account_info <seed>|<pass_phrase>|<key> [<index>]
 Json::Value RPCServer::doAccountInfo(Json::Value &params)
@@ -254,73 +313,27 @@ Json::Value RPCServer::doAccountInfo(Json::Value &params)
 	{
 		return "invalid params";
 	}
-	else if (!theApp->getOPs().available()) {
+	else if (!mNetOps->available()) {
 		return JSONRPCError(503, "network not available");
 	}
 	else
 	{
 		std::string		strIdent	= params[0u].asString();
-		bool			bIndex		= 2 == params.size();
-		int				iIndex		= bIndex ? boost::lexical_cast<int>(params[1u].asString()) : 0;
-
+		bool			bIndex;
+		int				iIndex		= 2 == params.size()? boost::lexical_cast<int>(params[1u].asString()) : 0;
 		NewcoinAddress	naAccount;
-		NewcoinAddress	naSeed;
 
-		if (!bIndex && (naAccount.setAccountPublic(strIdent) || naAccount.setAccountID(strIdent)))
-		{
-			// Got the account.
-			nothing();
-		}
-		// Must be a seed.
-		else if (!naSeed.setFamilySeedGeneric(strIdent))
-		{
-			return "disallowed seed";
-		}
-		else
-		{
-			// We allow the use of the seeds to access #0.
-			// This is poor practice and merely for debuging convenience.
-			NewcoinAddress	naGenerator;
-			NewcoinAddress	naRegular0Public;
-			NewcoinAddress	naRegular0Private;
+		Json::Value ret;
 
-			naGenerator.setFamilyGenerator(naSeed);
+		ret	= accountFromString(naAccount, bIndex, strIdent, iIndex);
 
-			naRegular0Public.setAccountPublic(naGenerator, 0);
-			naRegular0Private.setAccountPrivate(naGenerator, naSeed, 0);
-
-			uint160							uGeneratorID	= naRegular0Public.getAccountID();
-
-			Ledger::pointer					ledger			= theApp->getMasterLedger().getCurrentLedger();
-			LedgerStateParms				qry				= lepNONE;
-			SerializedLedgerEntry::pointer	sleGen			= ledger->getGenerator(qry, naRegular0Public.getAccountID());
-			if (!sleGen)
-			{
-				// Didn't find a generator map, assume it is a master generator.
-				nothing();
-			}
-			else
-			{
-				// Found master public key.
-				std::vector<unsigned char>	vucCipher				= sleGen->getIFieldVL(sfGenerator);
-				std::vector<unsigned char>	vucMasterGenerator		= naRegular0Private.accountPrivateDecrypt(naRegular0Public, vucCipher);
-				if (vucMasterGenerator.empty())
-				{
-					return "internal error: password failed to decrypt master public generator";
-				}
-
-				naGenerator.setFamilyGenerator(vucMasterGenerator);
-			}
-
-			bIndex	= true;
-
-			naAccount.setAccountPublic(naGenerator, iIndex);
-		}
+		if (!ret.empty())
+			return ret;
 
 		// Get info on account.
-		Json::Value ret(Json::objectValue);
+		ret	= Json::Value(Json::objectValue);
 
-		AccountState::pointer as=theApp->getMasterLedger().getCurrentLedger()->getAccountState(naAccount);
+		AccountState::pointer as=mNetOps->getAccountState(naAccount);
 		if (as)
 		{
 			as->addJson(ret);
@@ -329,7 +342,6 @@ Json::Value RPCServer::doAccountInfo(Json::Value &params)
 		{
 			ret["account"]	= naAccount.humanAccountID();
 			ret["status"]	= "NotFound";
-			ret["bIndex"]	= bIndex;
 			if (bIndex)
 				ret["index"]	= iIndex;
 		}
@@ -338,6 +350,100 @@ Json::Value RPCServer::doAccountInfo(Json::Value &params)
 	}
 }
 
+// account_lines <account>|<nickname>|<account_public_key> [<index>]
+Json::Value RPCServer::doAccountLines(Json::Value &params)
+{
+	if (params.size() < 1 || params.size() > 2)
+	{
+		return "invalid params";
+	}
+	else if (!mNetOps->available()) {
+		return JSONRPCError(503, "network not available");
+	}
+	else
+	{
+		std::string		strIdent	= params[0u].asString();
+		bool			bIndex;
+		int				iIndex		= 2 == params.size()? boost::lexical_cast<int>(params[1u].asString()) : 0;
+		NewcoinAddress	naAccount;
+
+		Json::Value ret;
+
+		ret	= accountFromString(naAccount, bIndex, strIdent, iIndex);
+
+		if (!ret.empty())
+			return ret;
+
+		// SHAMap::pointer	smAccounts	= theApp->getMasterLedger().getCurrentLedger()->peekAccountStateMap();
+
+		// Get info on account.
+		ret	= Json::Value(Json::objectValue);
+
+		ret["account"]	= naAccount.humanAccountID();
+		if (bIndex)
+			ret["index"]	= iIndex;
+
+		AccountState::pointer	as			= mNetOps->getAccountState(naAccount);
+		if (as)
+		{
+			ret["account"]	= naAccount.humanAccountID();
+
+			// We access a committed ledger and need not worry about changes.
+			uint64	uDirLineNodeFirst;
+			uint64	uDirLineNodeLast;
+
+			if (!mNetOps->getDirLineInfo(naAccount, uDirLineNodeFirst, uDirLineNodeLast))
+			{
+				ret["lines"]	= Json::Value(Json::objectValue);
+			}
+			else if (uDirLineNodeFirst)
+			{
+				Json::Value	jsonLines = Json::Value(Json::objectValue);
+
+				for (; uDirLineNodeFirst <= uDirLineNodeLast; uDirLineNodeFirst++)
+				{
+					std::vector<uint256>	vuRippleNodes	= mNetOps->getDirLineNode(uDirLineNodeFirst);
+
+					BOOST_FOREACH(uint256& uNode, vuRippleNodes)
+					{
+						NewcoinAddress	naAccountPeer;
+						uint64			uBalance	= 0;
+						// uint160			uCurrency;
+						STAmount		saLimit;
+						STAmount		saLimitPeer;
+#if 0
+						RippleState::pointer	rsLine	= mNetOps->getRippleState(uNode);
+
+						rsLine->setViewAccount(naAccount);
+						rsLine->getAccountPeer(naAccountPeer);
+						// ->getBalance(iBalance);
+						// ->getCurrency(uCurrency);
+						rsLine->getLimit(saLimit)
+						rsLine->getLimitPeer(saPeerLimit);
+#endif
+						Json::Value		jPeer = Json::Value(Json::objectValue);
+
+						jPeer["balance"]	= Json::Value::UInt(uBalance);	// XXX Raw number.
+						jPeer["limit"]		= Json::Value::UInt(saLimit.getValue());
+						jPeer["limit_peer"]	= Json::Value::UInt(saLimitPeer.getValue());
+
+						ret[naAccountPeer.humanAccountID()]	= jPeer;
+					}
+				}
+
+				ret["lines"]	= jsonLines;
+
+			}
+		}
+		else
+		{
+			ret["status"]	= "NotFound";
+		}
+
+		return ret;
+	}
+}
+
 Json::Value RPCServer::doConnect(Json::Value& params)
 {
 	// connect <ip> [port]
@@ -403,20 +509,20 @@ Json::Value RPCServer::doCreditSet(Json::Value& params)
 	{
 		return JSONRPCError(500, "bad src amount/currency");
 	}
-	else if (!theApp->getOPs().available()) {
+	else if (!mNetOps->available()) {
 		return JSONRPCError(503, "network not available");
 	}
 	else
 	{
-		NewcoinAddress					naAccountPublic;
-		NewcoinAddress					naAccountPrivate;
-	    SerializedLedgerEntry::pointer	sleSrc;
-		Json::Value						obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
+		NewcoinAddress	naAccountPublic;
+		NewcoinAddress	naAccountPrivate;
+	    SLE::pointer	sleSrc;
+		Json::Value		obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
 
 		if (!obj.empty())
 			return obj;
 
-		STAmount						saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
+		STAmount		saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
 
 		if (saSrcBalance < theConfig.FEE_DEFAULT)
 		{
@@ -434,7 +540,7 @@ Json::Value RPCServer::doCreditSet(Json::Value& params)
 				saLimitAmount,
 				uAcceptRate);
 
-			(void) theApp->getOPs().processTransaction(trans);
+			(void) mNetOps->processTransaction(trans);
 
 			obj["transaction"]		= trans->getSTransaction()->getJson(0);
 			obj["status"]			= trans->getStatus();
@@ -490,15 +596,15 @@ Json::Value RPCServer::doSend(Json::Value& params)
 	{
 		return JSONRPCError(500, "bad src amount/currency");
 	}
-	else if (!theApp->getOPs().available()) {
+	else if (!mNetOps->available()) {
 		return JSONRPCError(503, "network not available");
 	}
 	else
 	{
-		NewcoinAddress					naAccountPublic;
-		NewcoinAddress					naAccountPrivate;
-	    SerializedLedgerEntry::pointer	sleSrc;
-		Json::Value						obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
+		NewcoinAddress	naAccountPublic;
+		NewcoinAddress	naAccountPrivate;
+	    SLE::pointer	sleSrc;
+		Json::Value		obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
 
 		if (!obj.empty())
 		{
@@ -530,7 +636,7 @@ Json::Value RPCServer::doSend(Json::Value& params)
 				saSrcAmount,
 				spPaths);
 
-			(void) theApp->getOPs().processTransaction(trans);
+			(void) mNetOps->processTransaction(trans);
 
 			obj["transaction"]		= trans->getSTransaction()->getJson(0);
 			obj["status"]			= trans->getStatus();
@@ -580,22 +686,22 @@ Json::Value RPCServer::doTransitSet(Json::Value& params)
 	{
 		return JSONRPCError(500, "source account id needed");
 	}
-	else if (!theApp->getOPs().available()) {
+	else if (!mNetOps->available()) {
 		return JSONRPCError(503, "network not available");
 	}
 	else
 	{
-		NewcoinAddress					naAccountPublic;
-		NewcoinAddress					naAccountPrivate;
-	    SerializedLedgerEntry::pointer	sleSrc;
-		Json::Value						obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
+		NewcoinAddress	naAccountPublic;
+		NewcoinAddress	naAccountPrivate;
+	    SLE::pointer	sleSrc;
+		Json::Value		obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
 
 		if (!obj.empty())
 		{
 			return obj;
 		}
 
-		STAmount						saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
+		STAmount		saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
 
 		uTransitRate		= 0;
 		uTransitStart		= 0;
@@ -617,7 +723,7 @@ Json::Value RPCServer::doTransitSet(Json::Value& params)
 				uTransitStart,
 				uTransitExpire);
 
-			(void) theApp->getOPs().processTransaction(trans);
+			(void) mNetOps->processTransaction(trans);
 
 			obj["transaction"]		= trans->getSTransaction()->getJson(0);
 			obj["status"]			= trans->getStatus();
@@ -843,7 +949,7 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
 			naRegular0Public.getAccountPublic(),
 			vucGeneratorSig);
 
-		(void) theApp->getOPs().processTransaction(trns);
+		(void) mNetOps->processTransaction(trns);
 
 		Json::Value obj(Json::objectValue);
 
@@ -891,11 +997,11 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
 	{
 		return "create account id needed";
 	}
-	else if (!theApp->getOPs().available()) {
+	else if (!mNetOps->available()) {
 		// We require access to the paying account's sequence number and key information.
 		return JSONRPCError(503, "network not available");
 	}
-	else if (theApp->getMasterLedger().getCurrentLedger()->getAccountState(naDstAccountID))
+	else if (mNetOps->getAccountState(naDstAccountID))
 	{
 		return "account already exists";
 	}
@@ -904,13 +1010,13 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
 		// Trying to build:
 		//   peer_wallet_create <paying_account> <paying_signature> <account_id> [<initial_funds>] [<annotation>]
 
-		NewcoinAddress					naAccountPublic;
-		NewcoinAddress					naAccountPrivate;
-	    SerializedLedgerEntry::pointer	sleSrc;
-		Json::Value						obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
+		NewcoinAddress	naAccountPublic;
+		NewcoinAddress	naAccountPrivate;
+	    SLE::pointer	sleSrc;
+		Json::Value		obj				= authorize(naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, sleSrc);
 
-		STAmount						saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
-		STAmount						saInitialFunds	= (params.size() < 4) ? 0 : boost::lexical_cast<uint64>(params[3u].asString());
+		STAmount		saSrcBalance	= sleSrc->getIValueFieldAmount(sfBalance);
+		STAmount		saInitialFunds	= (params.size() < 4) ? 0 : boost::lexical_cast<uint64>(params[3u].asString());
 
 		if (!obj.empty())
 		{
@@ -931,7 +1037,7 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
 				naDstAccountID,
 				saInitialFunds);							// Initial funds in XNC.
 
-			(void) theApp->getOPs().processTransaction(trans);
+			(void) mNetOps->processTransaction(trans);
 
 			obj["transaction"]		= trans->getSTransaction()->getJson(0);
 			obj["status"]			= trans->getStatus();
@@ -1139,6 +1245,7 @@ Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params
 	std::cerr << "RPC:" << command << std::endl;
 
 	if (command == "account_info")			return doAccountInfo(params);
+	if (command == "account_lines")			return doAccountLines(params);
 	if (command == "connect")				return doConnect(params);
 	if (command == "credit_set")			return doCreditSet(params);
 	if (command == "peers")					return doPeers(params);

src/RPCServer.h

@@ -9,9 +9,13 @@
 #include "RequestParser.h"
 #include "NewcoinAddress.h"
 #include "SerializedLedger.h"
+#include "NetworkOPs.h"
 
 class RPCServer  : public boost::enable_shared_from_this<RPCServer>
 {
+private:
+	NetworkOPs*	mNetOps;
+
 	boost::asio::ip::tcp::socket mSocket;
 	boost::array<char, 8192> mReadBuffer;
 	std::string mReplyStr;
@@ -19,7 +23,7 @@ class RPCServer  : public boost::enable_shared_from_this<RPCServer>
 	HttpRequest mIncomingRequest;
 	HttpRequestParser mRequestParser;
 
-	RPCServer(boost::asio::io_service& io_service);
+	RPCServer(boost::asio::io_service& io_service, NetworkOPs* nopNetwork);
 
 	void handle_write(const boost::system::error_code& error);
 
@@ -36,7 +40,10 @@ class RPCServer  : public boost::enable_shared_from_this<RPCServer>
 	    NewcoinAddress& naAccountPublic, NewcoinAddress& naAccountPrivate,
 	    SerializedLedgerEntry::pointer& sleSrc);
 
+	Json::Value accountFromString(NewcoinAddress& naAccount, bool& bIndex, const std::string& strIdent, const int iIndex);
+
 	Json::Value doAccountInfo(Json::Value& params);
+	Json::Value doAccountLines(Json::Value &params);
 	Json::Value doConnect(Json::Value& params);
 	Json::Value doCreditSet(Json::Value& params);
 	Json::Value doLedger(Json::Value& params);
@@ -73,9 +80,9 @@ class RPCServer  : public boost::enable_shared_from_this<RPCServer>
 public:
 	typedef boost::shared_ptr<RPCServer> pointer;
 
-	static pointer create(boost::asio::io_service& io_service)
+	static pointer create(boost::asio::io_service& io_service, NetworkOPs* mNetOps)
 	{
-		return pointer(new RPCServer(io_service));
+		return pointer(new RPCServer(io_service, mNetOps));
 	}
 
 	boost::asio::ip::tcp::socket& getSocket()
@@ -85,3 +92,4 @@ public:
 
 	void connected();
 };
+// vim:ts=4

src/SerializedLedger.h

@@ -84,5 +84,7 @@ public:
 	void makeIFieldAbsent(SOE_Field field) { return mObject.makeFieldAbsent(field); }
 };
 
+typedef SerializedLedgerEntry SLE;
+
 #endif
 // vim:ts=4

src/main.cpp

@@ -39,6 +39,7 @@ void printHelp(const po::options_description& desc)
 	cout << "Commands: " << endl;
 	cout << "     account_info <account>|<nickname>" << endl;
 	cout << "     account_info <seed>|<pass_phrase>|<key> [<index>]" << endl;
+	cout << "     account_lines <account>|<nickname>" << endl;
 	cout << "     connect <ip> [<port>]" << endl;
 	cout << "     credit_set <seed> <paying_account> <destination_account> <limit_amount> <currency> [<account_rate>]" << endl;
 	cout << "     ledger" << endl;