highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-25 15:05:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallettool: Disallow creating new unnamed wallets

Browse Source
This commit is contained in:
Ava Chow
2026-01-06 15:43:29 -08:00
parent 5875a9c502
commit 75b704df9d
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/dump.cpp
View File

@@ -121,6 +121,11 @@ static void WalletToolReleaseWallet(CWallet* wallet)
bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::path& wallet_path, bilingual_str& error, std::vector<bilingual_str>& warnings)
{
if (name.empty()) {
tfm::format(std::cerr, "Wallet name cannot be empty\n");
return false;
}
// Get the dumpfile
std::string dump_filename = args.GetArg("-dumpfile", "");
if (dump_filename.empty()) {

6
src/wallet/wallettool.cpp
View File

@@ -111,7 +111,7 @@ bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command)
tfm::format(std::cerr, "The -dumpfile option can only be used with the \"dump\" and \"createfromdump\" commands.\n");
return false;
}
if (command == "create" && !args.IsArgSet("-wallet")) {
if ((command == "create" || command == "createfromdump") && !args.IsArgSet("-wallet")) {
tfm::format(std::cerr, "Wallet name must be provided when creating a new wallet.\n");
return false;
}
@@ -119,6 +119,10 @@ bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command)
const fs::path path = fsbridge::AbsPathJoin(GetWalletDir(), fs::PathFromString(name));
if (command == "create") {
if (name.empty()) {
tfm::format(std::cerr, "Wallet name cannot be empty\n");
return false;
}
DatabaseOptions options;
ReadDatabaseArgs(args, options);
options.require_create = true;