Revise account_info for new model.

src/RPCServer.cpp

@@ -172,6 +172,7 @@ NewcoinAddress RPCServer::parseFamily(const std::string& fParam)
 	return family;
 }
 
+#if 0
 Json::Value RPCServer::doCreateFamily(Json::Value& params)
 {
 	// createfamily FXXXX
@@ -216,37 +217,83 @@ Json::Value RPCServer::doCreateFamily(Json::Value& params)
 
 	return ret;
 }
+#endif
 
+// account_info <account>|<nickname>|<account_public_key>
+// account_info <seed>|<pass_phrase>|<key> [<index>]
 Json::Value RPCServer::doAccountInfo(Json::Value &params)
-{   // accountinfo <family>:<number>
+{
-	// accountinfo <account>
+	if (params.size() < 1 || params.size() > 2)
-	std::string acct;
+	{
-	if (!extractString(acct, params, 0))
+		return "invalid params";
-		return JSONRPCError(500, "Invalid account identifier");
+	}
-
-	LocalAccount::pointer account = theApp->getWallet().parseAccount(acct);
-	if (account) return account->getJson();
-
-	NewcoinAddress acctid;
-	if (!acctid.setAccountID(acct))
-		return JSONRPCError(500, "Unable to parse account");
-
-	LocalAccount::pointer lac(theApp->getWallet().getLocalAccount(acctid));
-	if (!!lac) return lac->getJson();
-
-	AccountState::pointer as=theApp->getMasterLedger().getCurrentLedger()->getAccountState(acctid);
-	Json::Value ret(Json::objectValue);
-	if (as)
-		as->addJson(ret);
 	else
 	{
-		NewcoinAddress ad;
+		std::string		strIdent	= params[0u].asString();
-		ad.setAccountID(acct);
+		bool			bIndex		= 2 == params.size();
-		ret[ad.humanAccountID()]="NotFound";
+		int				iIndex		= bIndex ? boost::lexical_cast<int>(params[1u].asString()) : 0;
+
+		NewcoinAddress	naAccount;
+		NewcoinAddress	naSeed;
+
+		if (!bIndex && (naAccount.setAccountPublic(strIdent) || naAccount.setAccountID(strIdent)))
+		{
+			// Got the account.
+			nothing();
+		}
+		else
+		{
+			// Must be a seed.
+			naSeed.setFamilySeedGeneric(strIdent);
+
+			NewcoinAddress	naGenerator;
+			NewcoinAddress	naRegularReservedPublic;
+
+			naGenerator.setFamilyGenerator(naSeed);
+
+			naRegularReservedPublic.setAccountPublic(naGenerator, -1);
+
+			uint160						uGeneratorID		= naRegularReservedPublic.getAccountID();
+
+			// if (probe (uGeneratorID))
+			if (false)
+			{
+				// Found master public key.
+
+			}
+			else
+			{
+				// Didn't find a generator map, assume it is a master generator.
+				nothing();
+			}
+
+			bIndex	= true;
+
+			naAccount.setAccountPublic(naGenerator, iIndex);
+		}
+
+		// Get info on account.
+		Json::Value ret(Json::objectValue);
+
+		AccountState::pointer as=theApp->getMasterLedger().getCurrentLedger()->getAccountState(naAccount);
+		if (as)
+		{
+			as->addJson(ret);
+		}
+		else
+		{
+			ret["account"]	= naAccount.humanAccountID();
+			ret["status"]	= "NotFound";
+			ret["bIndex"]	= bIndex;
+			if (bIndex)
+				ret["index"]	= iIndex;
+		}
+
+		return ret;
 	}
-	return ret;
 }
 
+#if 0
 Json::Value RPCServer::doNewAccount(Json::Value &params)
 {   // newaccount <family> [<name>]
 	std::string fParam;
@@ -262,6 +309,7 @@ Json::Value RPCServer::doNewAccount(Json::Value &params)
 
 	return account->getJson();
 }
+#endif
 
 Json::Value RPCServer::doLock(Json::Value &params)
 {   // lock <family>
@@ -811,38 +859,47 @@ Json::Value RPCServer::doUnlScore(Json::Value& params) {
 	else return "invalid params";
 }
 
-Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params)
+Json::Value RPCServer::doStop(Json::Value& params) {
-{
+	if (!params.size())
-	std::cerr << "RPC:" << command << std::endl;
-
-	if (command== "stop")
 	{
 		theApp->stop();
 
 		return SYSTEM_NAME " server stopping";
 	}
+	else return "invalid params";
+}
 
-	if (command=="unl_add") return doUnlAdd(params);
+Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params)
-	if (command=="unl_default") return doUnlDefault(params);
+{
-	if (command=="unl_delete") return doUnlDelete(params);
+	std::cerr << "RPC:" << command << std::endl;
-	if (command=="unl_list") return doUnlList(params);
-	if (command=="unl_reset") return doUnlReset(params);
-	if (command=="unl_score") return doUnlScore(params);
 
-	if (command=="validation_create") return doValidatorCreate(params);
+	if (command == "account_info")		return doAccountInfo(params);
+	if (command == "connect")			return doConnect(params);
+	if (command == "peers")				return doPeers(params);
+	if (command == "stop")				return doStop(params);
 
-	if (command=="wallet_claim") return doWalletClaim(params);
+	if (command == "unl_add")			return doUnlAdd(params);
-	if (command=="wallet_propose") return doWalletPropose(params);
+	if (command == "unl_default")		return doUnlDefault(params);
+	if (command == "unl_delete")		return doUnlDelete(params);
+	if (command == "unl_list")			return doUnlList(params);
+	if (command == "unl_reset")			return doUnlReset(params);
+	if (command == "unl_score")			return doUnlScore(params);
 
-	if (command=="createfamily") return doCreateFamily(params);
+	if (command == "validation_create")	return doValidatorCreate(params);
+
+	if (command == "wallet_claim")		return doWalletClaim(params);
+	if (command == "wallet_propose")	return doWalletPropose(params);
+
+	//
+	// Obsolete or need rewrite:
+	//
+
+//	if (command=="createfamily") return doCreateFamily(params);
 	if (command=="familyinfo") return doFamilyInfo(params);
-	if (command=="accountinfo") return doAccountInfo(params);
+//	if (command=="newaccount") return doNewAccount(params);
-	if (command=="newaccount") return doNewAccount(params);
 	if (command=="lock") return doLock(params);
 	if (command=="unlock") return doUnlock(params);
 	if (command=="sendto") return doSendTo(params);
-	if (command=="connect") return doConnect(params);
-	if (command=="peers") return doPeers(params);
 	if (command=="tx") return doTx(params);
 	if (command=="ledger") return doLedger(params);
 

src/RPCServer.h

@@ -45,6 +45,7 @@ class RPCServer  : public boost::enable_shared_from_this<RPCServer>
 	Json::Value doTx(Json::Value& params);
 	Json::Value doLedger(Json::Value& params);
 	Json::Value doAccount(Json::Value& params);
+	Json::Value doStop(Json::Value& params);
 
 	Json::Value doUnlAdd(Json::Value& params);
 	Json::Value doUnlDefault(Json::Value& params);

src/main.cpp

@@ -36,13 +36,12 @@ void printHelp(const po::options_description& desc)
 	cout << desc << endl;
 
 	cout << "Commands: " << endl;
-	cout << "     accountinfo <family>:<key>" << endl;
+	cout << "     account_info <account>|<nickname>" << endl;
+	cout << "     account_info <seed>|<pass_phrase>|<key> [<index>]" << endl;
 	cout << "     connect <ip> [<port>]" << endl;
-	cout << "     createfamily [<key>]" << endl;
 	cout << "     familyinfo" << endl;
 	cout << "     ledger" << endl;
 	cout << "     lock <family>" << endl;
-	cout << "     newaccount <family> [<name>]" << endl;
 	cout << "     peers" << endl;
 	cout << "     sendto <destination> <amount> [<tag>]" << endl;
 	cout << "     stop" << endl;