From 0e78e379c785b7a855a6de1a86d5743e1b1c39a4 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sun, 18 Mar 2012 19:25:06 -0700 Subject: [PATCH] Return AccountPublic in JSON. --- src/RPCServer.cpp | 4 ++-- src/Wallet.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index 29e5399a61..05a66215aa 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -278,7 +278,7 @@ Json::Value RPCServer::doLock(Json::Value ¶ms) } Json::Value RPCServer::doUnlock(Json::Value ¶ms) -{ // unlock FXXXX +{ // unlock sXXXX // unlock "" std::string param; @@ -291,7 +291,7 @@ Json::Value RPCServer::doUnlock(Json::Value ¶ms) NewcoinAddress familySeed; if(familySeed.setFamilySeed(param)) - // FXXX + // sXXX family=theApp->getWallet().addFamily(familySeed, false); else // pass phrase diff --git a/src/Wallet.cpp b/src/Wallet.cpp index 0df0c807b7..60bfd65e6d 100644 --- a/src/Wallet.cpp +++ b/src/Wallet.cpp @@ -274,6 +274,7 @@ Json::Value LocalAccount::getJson() const Json::Value ret(Json::objectValue); ret["Family"]=getFamilyName(); ret["AccountID"]=getAddress().humanAccountID(); + ret["AccountPublic"]=getAddress().humanAccountPublic(); ret["FullName"]=getFullName(); ret["Issued"]=Json::Value(isIssued()); ret["IsLocked"]=mFamily->isLocked();