wallet: Create named SQLite wallet files instead of wallet directories

src/wallet/bdb.cpp

@@ -62,7 +62,7 @@ bool WalletDatabaseFileId::operator==(const WalletDatabaseFileId& rhs) const
 std::shared_ptr<BerkeleyEnvironment> GetWalletEnv(const fs::path& wallet_path, std::string& database_filename)
 {
     fs::path env_directory;
-    SplitWalletPath(wallet_path, env_directory, database_filename);
+    SplitWalletPath(wallet_path, env_directory, database_filename, "wallet.dat");
     LOCK(cs_db);
     auto inserted = g_dbenvs.emplace(env_directory.string(), std::weak_ptr<BerkeleyEnvironment>());
     if (inserted.second) {
@@ -812,7 +812,7 @@ bool ExistsBerkeleyDatabase(const fs::path& path)
 {
     fs::path env_directory;
     std::string data_filename;
-    SplitWalletPath(path, env_directory, data_filename);
+    SplitWalletPath(path, env_directory, data_filename, "wallet.dat");
     return IsBDBFile(env_directory / data_filename);
 }
 

src/wallet/db.cpp

@@ -8,10 +8,11 @@
 
 #include <string>
 
-void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::string& database_filename)
+void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::string& database_filename, const std::string& default_filename, bool default_dir)
 {
-    if (fs::is_regular_file(wallet_path)) {
-        // Special case for backwards compatibility: if wallet path points to an
+    if (fs::is_regular_file(wallet_path) || (!fs::exists(wallet_path) && !default_dir)) {
+        // For newly created SQLite wallets (!exists && !default_dir): Always make a file at wallet_path
+        // For BDB Special case for backwards compatibility: if wallet path points to an
         // existing file, treat it as the path to a BDB data file in a parent
         // directory that also contains BDB log files.
         env_directory = wallet_path.parent_path();
@@ -20,6 +21,6 @@ void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::
         // Normal case: Interpret wallet path as a directory path containing
         // data and log files.
         env_directory = wallet_path;
-        database_filename = "wallet.dat";
+        database_filename = default_filename;
     }
 }

src/wallet/db.h

@@ -19,7 +19,7 @@
 
 struct bilingual_str;
 
-void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::string& database_filename);
+void SplitWalletPath(const fs::path& wallet_path, fs::path& env_directory, std::string& database_filename, const std::string& default_filename, bool default_dir=true);
 
 /** RAII class that provides access to a WalletDatabase */
 class DatabaseBatch

src/wallet/sqlite.cpp

@@ -568,15 +568,21 @@ bool SQLiteBatch::TxnAbort()
 
 bool ExistsSQLiteDatabase(const fs::path& path)
 {
-    const fs::path file = path / DATABASE_FILENAME;
+    fs::path dir;
+    std::string filename;
+    SplitWalletPath(path, dir, filename, DATABASE_FILENAME, false);
+    const fs::path file = dir / filename;
     return fs::symlink_status(file).type() == fs::regular_file && IsSQLiteFile(file);
 }
 
 std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const DatabaseOptions& options, DatabaseStatus& status, bilingual_str& error)
 {
-    const fs::path file = path / DATABASE_FILENAME;
+    fs::path dir;
+    std::string filename;
+    SplitWalletPath(path, dir, filename, DATABASE_FILENAME, false);
+    const fs::path file = dir / filename;
     try {
-        auto db = MakeUnique<SQLiteDatabase>(path, file);
+        auto db = MakeUnique<SQLiteDatabase>(dir, file);
         if (options.verify && !db->Verify(error)) {
             status = DatabaseStatus::FAILED_VERIFY;
             return nullptr;

src/wallet/wallet.cpp

@@ -32,6 +32,7 @@
 #include <util/translation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
+#include <wallet/sqlite.h>
 
 #include <univalue.h>
 
@@ -3795,7 +3796,8 @@ std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, cons
     fs::file_type path_type = fs::symlink_status(wallet_path).type();
     if (!(path_type == fs::file_not_found || path_type == fs::directory_file ||
           (path_type == fs::symlink_file && fs::is_directory(wallet_path)) ||
-          (path_type == fs::regular_file && fs::path(name).filename() == name))) {
+          (path_type == fs::regular_file && fs::path(name).filename() == name) ||
+          (path_type == fs::regular_file && ExistsSQLiteDatabase(wallet_path)))) {
         error_string = Untranslated(strprintf(
               "Invalid -wallet path '%s'. -wallet path should point to a directory where wallet.dat and "
               "database/log.?????????? files can be stored, a location where such a directory could be created, "

src/wallet/walletutil.cpp

@@ -10,6 +10,11 @@
 bool ExistsBerkeleyDatabase(const fs::path& path);
 bool ExistsSQLiteDatabase(const fs::path& path);
 
+static bool ExistsDatabase(const fs::path& path)
+{
+    return ExistsBerkeleyDatabase(path) || ExistsSQLiteDatabase(path);
+}
+
 fs::path GetWalletDir()
 {
     fs::path path;
@@ -49,11 +54,10 @@ std::vector<fs::path> ListWalletDir()
         // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
         const fs::path path = it->path().string().substr(offset);
 
-        if (it->status().type() == fs::directory_file &&
-            (ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) {
+        if (it->status().type() == fs::directory_file && ExistsDatabase(it->path())) {
             // Found a directory which contains wallet.dat btree file, add it as a wallet.
             paths.emplace_back(path);
-        } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
+        } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsDatabase(it->path())) {
             if (it->path().filename() == "wallet.dat") {
                 // Found top-level wallet.dat btree file, add top level directory ""
                 // as a wallet.
@@ -65,6 +69,13 @@ std::vector<fs::path> ListWalletDir()
                 // Add it to the list of available wallets.
                 paths.emplace_back(path);
             }
+        } else if (it->symlink_status().type() == fs::regular_file && ExistsSQLiteDatabase(it->path())) {
+            // Only SQLite wallets will be created nested inside of directories
+            if (it->path().filename() == "wallet.dat") {
+                // SQLite wallets can also be in the traditional wallet dir structure, so if see one that is like that, ignore it here
+                continue;
+            }
+            paths.emplace_back(path);
         }
     }