Browse Source

Add friendly output to dumpwallet refs #9564

0.15
aideca 7 years ago
parent
commit
9f82134779
  1. 16
      src/wallet/rpcdump.cpp

16
src/wallet/rpcdump.cpp

@ -579,7 +579,11 @@ UniValue dumpwallet(const JSONRPCRequest& request) @@ -579,7 +579,11 @@ UniValue dumpwallet(const JSONRPCRequest& request)
"dumpwallet \"filename\"\n"
"\nDumps all wallet keys in a human-readable format.\n"
"\nArguments:\n"
"1. \"filename\" (string, required) The filename\n"
"1. \"filename\" (string, required) The filename with path (either absolute or relative to bitcoind)\n"
"\nResult:\n"
"{ (json object)\n"
" \"filename\" : { (string) The filename with full absolute path\n"
"}\n"
"\nExamples:\n"
+ HelpExampleCli("dumpwallet", "\"test\"")
+ HelpExampleRpc("dumpwallet", "\"test\"")
@ -590,7 +594,9 @@ UniValue dumpwallet(const JSONRPCRequest& request) @@ -590,7 +594,9 @@ UniValue dumpwallet(const JSONRPCRequest& request)
EnsureWalletIsUnlocked(pwallet);
std::ofstream file;
file.open(request.params[0].get_str().c_str());
boost::filesystem::path filepath = request.params[0].get_str();
filepath = boost::filesystem::absolute(filepath);
file.open(filepath.string().c_str());
if (!file.is_open())
throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
@ -655,7 +661,11 @@ UniValue dumpwallet(const JSONRPCRequest& request) @@ -655,7 +661,11 @@ UniValue dumpwallet(const JSONRPCRequest& request)
file << "\n";
file << "# End of dump\n";
file.close();
return NullUniValue;
UniValue reply(UniValue::VOBJ);
reply.push_back(Pair("filename", filepath.string()));
return reply;
}

Loading…
Cancel
Save