diff --git a/database/win/windatabase.cpp b/database/win/windatabase.cpp index 8f69c4a37..64215fb8a 100644 --- a/database/win/windatabase.cpp +++ b/database/win/windatabase.cpp @@ -236,4 +236,11 @@ uint64 WinDatabase::getBigInt(int colIndex) int WinDatabase::getBinary(int colIndex,unsigned char* buf,int maxSize) { return(0); +} + +std::vector WinDatabase::getBinary(int colIndex) +{ + // TODO: + std::vector vucResult; + return vucResult; } \ No newline at end of file diff --git a/database/win/windatabase.h b/database/win/windatabase.h index ddbfaa98b..5ce079870 100644 --- a/database/win/windatabase.h +++ b/database/win/windatabase.h @@ -50,6 +50,7 @@ public: bool getBool(int colIndex); uint64 getBigInt(int colIndex); int getBinary(int colIndex,unsigned char* buf,int maxSize); + std::vector getBinary(int colIndex); bool getNull(int colIndex){ return(true); } void escape(const unsigned char* start,int size,std::string& retStr); diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 8580bf278..6d82588bf 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -161,7 +161,6 @@ - diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index fb793f90d..d9c41f387 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -260,9 +260,6 @@ Header Files - - Header Files - Header Files diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index b9ec129a0..b071c83c8 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -1501,7 +1501,7 @@ Json::Value RPCServer::doValidatorCreate(Json::Value& params) { Json::Value RPCServer::accounts(const uint256& uLedger, const NewcoinAddress& naMasterGenerator) { - Json::Value jsonAccounts(Json::objectValue); + Json::Value jsonAccounts(Json::arrayValue); // YYY Don't want to leak to thin server that these accounts are related. // YYY Would be best to alternate requests to servers and to cache results. @@ -1519,7 +1519,7 @@ Json::Value RPCServer::accounts(const uint256& uLedger, const NewcoinAddress& na as->addJson(jsonAccount); - jsonAccounts[naAccount.humanAccountID()] = jsonAccount; + jsonAccounts.append(jsonAccount); } else { diff --git a/src/rpc.cpp b/src/rpc.cpp index a3180ed02..b55ea1567 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -237,8 +237,8 @@ std::string JSONRPCReply(const Json::Value& result, const Json::Value& error, co { Json::Value reply(Json::objectValue); reply["result"]=result; - reply["error"]=error; - reply["id"]=id; + //reply["error"]=error; + //reply["id"]=id; Json::FastWriter writer; return writer.write(reply) + "\n"; }