changed return of wallet_accounts

database/win/windatabase.cpp

@@ -237,3 +237,10 @@ int WinDatabase::getBinary(int colIndex,unsigned char* buf,int maxSize)
 {
 	return(0);
 }
+
+std::vector<unsigned char> WinDatabase::getBinary(int colIndex)
+{
+	// TODO:
+	std::vector<unsigned char>	vucResult;
+	return vucResult;
+}

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<unsigned char> getBinary(int colIndex);
 	bool getNull(int colIndex){ return(true); }
 
 	void escape(const unsigned char* start,int size,std::string& retStr);

newcoin.vcxproj

@@ -161,7 +161,6 @@
     <ClInclude Include="bignum.h" />
     <ClInclude Include="bitcoinUtil.h" />
     <ClInclude Include="CallRPC.h" />
-    <ClInclude Include="Config.h" />
     <ClInclude Include="ConnectionPool.h" />
     <ClInclude Include="Conversion.h" />
     <ClInclude Include="cryptopp\config.h" />

newcoin.vcxproj.filters

@@ -260,9 +260,6 @@
     <ClInclude Include="KnownNodeList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Ledger.h">
       <Filter>Header Files</Filter>
     </ClInclude>

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
 		{

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";
 }