phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 06:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wallet: Disallow legacy wallet creation from the wallet tool

Browse source
This commit is contained in:
Ava Chow 2025-04-18 14:45:50 -07:00
parent 5e93b1fd6c
commit 6b247279b7
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/wallet/wallettool.cpp
View file

@ -115,13 +115,25 @@ 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"); tfm::format(std::cerr, "The -dumpfile option can only be used with the \"dump\" and \"createfromdump\" commands.\n");
return false; return false;
} }
if (args.IsArgSet("-descriptors") && command != "create") { if (args.IsArgSet("-descriptors")) {
tfm::format(std::cerr, "The -descriptors option can only be used with the 'create' command.\n"); if (command != "create") {
return false; tfm::format(std::cerr, "The -descriptors option can only be used with the 'create' command.\n");
return false;
}
if (!args.GetBoolArg("-descriptors", true)) {
tfm::format(std::cerr, "The -descriptors option must be set to \"true\"\n");
return false;
}
} }
if (args.IsArgSet("-legacy") && command != "create") { if (args.IsArgSet("-legacy")) {
tfm::format(std::cerr, "The -legacy option can only be used with the 'create' command.\n"); if (command != "create") {
return false; tfm::format(std::cerr, "The -legacy option can only be used with the 'create' command.\n");
return false;
}
if (args.GetBoolArg("-legacy", true)) {
tfm::format(std::cerr, "The -legacy option must be set to \"false\"");
return false;
}
} }
if (command == "create" && !args.IsArgSet("-wallet")) { if (command == "create" && !args.IsArgSet("-wallet")) {
tfm::format(std::cerr, "Wallet name must be provided when creating a new wallet.\n"); tfm::format(std::cerr, "Wallet name must be provided when creating a new wallet.\n");
@ -134,22 +146,8 @@ bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command)
DatabaseOptions options; DatabaseOptions options;
ReadDatabaseArgs(args, options); ReadDatabaseArgs(args, options);
options.require_create = true; options.require_create = true;
// If -legacy is set, use it. Otherwise default to false. options.create_flags |= WALLET_FLAG_DESCRIPTORS;
bool make_legacy = args.GetBoolArg("-legacy", false); options.require_format = DatabaseFormat::SQLITE;
// If neither -legacy nor -descriptors is set, default to true. If -descriptors is set, use its value.
bool make_descriptors = (!args.IsArgSet("-descriptors") && !args.IsArgSet("-legacy")) || (args.IsArgSet("-descriptors") && args.GetBoolArg("-descriptors", true));
if (make_legacy && make_descriptors) {
tfm::format(std::cerr, "Only one of -legacy or -descriptors can be set to true, not both\n");
return false;
}
if (!make_legacy && !make_descriptors) {
tfm::format(std::cerr, "One of -legacy or -descriptors must be set to true (or omitted)\n");
return false;
}
if (make_descriptors) {
options.create_flags |= WALLET_FLAG_DESCRIPTORS;
options.require_format = DatabaseFormat::SQLITE;
}
const std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, options); const std::shared_ptr<CWallet> wallet_instance = MakeWallet(name, path, options);
if (wallet_instance) { if (wallet_instance) {

9
test/functional/tool_wallet.py
View file

@ -452,6 +452,14 @@ class ToolWalletTest(BitcoinTestFramework):
else: else:
assert False, "Big transaction was not found in wallet dump" assert False, "Big transaction was not found in wallet dump"
def test_no_create_legacy(self):
self.log.info("Test that legacy wallets cannot be created")
self.assert_raises_tool_error("The -legacy option must be set to \"false\"", "-wallet=legacy", "-legacy", "create")
assert not (self.nodes[0].wallets_path / "legacy").exists()
self.assert_raises_tool_error("The -descriptors option must be set to \"true\"", "-wallet=legacy", "-descriptors=false", "create")
assert not (self.nodes[0].wallets_path / "legacy").exists()
def run_test(self): def run_test(self):
self.wallet_path = self.nodes[0].wallets_path / self.default_wallet_name / self.wallet_data_filename self.wallet_path = self.nodes[0].wallets_path / self.default_wallet_name / self.wallet_data_filename
self.test_invalid_tool_commands_and_args() self.test_invalid_tool_commands_and_args()
@ -463,6 +471,7 @@ class ToolWalletTest(BitcoinTestFramework):
self.test_dump_createfromdump() self.test_dump_createfromdump()
self.test_chainless_conflicts() self.test_chainless_conflicts()
self.test_dump_very_large_records() self.test_dump_very_large_records()
self.test_no_create_legacy()
if __name__ == '__main__': if __name__ == '__main__':