upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main_gui.cpp16
-rw-r--r--src/walletcmd.h6
2 files changed, 11 insertions, 11 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 55ca8c6..943799f 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -182,7 +182,7 @@ static void PrintUsage()
182 printf(" /walletstoragecheck (fail closed on inconsistent or unsafe\n"); 182 printf(" /walletstoragecheck (fail closed on inconsistent or unsafe\n");
183 printf(" wallet.dat storage state)\n"); 183 printf(" wallet.dat storage state)\n");
184 printf(" /walletsqliteexport=FILE (copy raw wallet.dat records into an\n"); 184 printf(" /walletsqliteexport=FILE (copy raw wallet.dat records into an\n");
185 printf(" experimental SQLite store, then exit)\n"); 185 printf(" SQLite store, then exit)\n");
186 printf(" /walletsqliteverify=FILE (compare wallet.dat with a SQLite export,\n"); 186 printf(" /walletsqliteverify=FILE (compare wallet.dat with a SQLite export,\n");
187 printf(" printing counts only, then exit)\n"); 187 printf(" printing counts only, then exit)\n");
188 printf(" /walletsqliterestore=FILE (rebuild wallet.dat from a SQLite export in\n"); 188 printf(" /walletsqliterestore=FILE (rebuild wallet.dat from a SQLite export in\n");
@@ -680,17 +680,17 @@ int main(int argc, char* argv[])
680 AttachTerminal(); 680 AttachTerminal();
681 FatalStartupError(fHeadlessStartup, 681 FatalStartupError(fHeadlessStartup,
682 strprintf("Unknown wallet backend '%s'.", strWalletBackend.c_str()), 682 strprintf("Unknown wallet backend '%s'.", strWalletBackend.c_str()),
683 "Use -walletbackend=sqlite for the experimental SQLite backend, " 683 "Use -walletbackend=sqlite for the SQLite backend, or "
684 "or omit -walletbackend (or -walletbackend=bdb) to use the " 684 "-walletbackend=bdb for the Berkeley DB wallet.dat.");
685 "default Berkeley DB wallet.dat.");
686 return 1; 685 return 1;
687 } 686 }
688 687
689 if (strWalletBackend == "sqlite") 688 if (strWalletBackend == "sqlite")
690 { 689 {
691 // Opt-in, experimental. The node runs on <datadir>/wallet.sqlite and 690 // Explicit opt-in via the flag. The node runs on
692 // never opens wallet.dat, but the user has to have exported one 691 // <datadir>/wallet.sqlite and never opens wallet.dat, but the user
693 // first -- there is no silent migration, and wallet.dat is left 692 // has to have exported one first -- there is no silent migration,
693 // and wallet.dat is left
694 // exactly where it is so a plain restart goes back to it. 694 // exactly where it is so a plain restart goes back to it.
695 AttachTerminal(); 695 AttachTerminal();
696 string strSQLitePath = GetAppDir() + "/wallet.sqlite"; 696 string strSQLitePath = GetAppDir() + "/wallet.sqlite";
@@ -724,7 +724,7 @@ int main(int argc, char* argv[])
724 } 724 }
725 725
726 fprintf(stderr, 726 fprintf(stderr,
727 "Wallet backend: SQLite (experimental)\n" 727 "Wallet backend: SQLite\n"
728 " %s\n" 728 " %s\n"
729 "Your Berkeley DB wallet.dat is left untouched. Restart without\n" 729 "Your Berkeley DB wallet.dat is left untouched. Restart without\n"
730 "-walletbackend=sqlite to go back to it.\n", 730 "-walletbackend=sqlite to go back to it.\n",
diff --git a/src/walletcmd.h b/src/walletcmd.h
index 38cbfdb..7013d44 100644
--- a/src/walletcmd.h
+++ b/src/walletcmd.h
@@ -70,9 +70,9 @@ int CmdWalletStorageAudit(const std::string& strJsonOut = "");
70// or migration-unsafe mix of storage records. 70// or migration-unsafe mix of storage records.
71int CmdWalletStorageCheck(); 71int CmdWalletStorageCheck();
72 72
73// Diagnostic/migration staging: copy every raw wallet.dat record into an 73// Copy every raw wallet.dat record into a SQLite key/value store, preserving
74// experimental SQLite key/value store, preserving serialized bytes. This does 74// serialized bytes. A migration/scripting tool; it does not change which backend
75// not change which backend the runtime wallet opens. 75// the runtime wallet opens.
76int CmdWalletSQLiteExport(const std::string& strDest); 76int CmdWalletSQLiteExport(const std::string& strDest);
77 77
78// Export the currently-loaded wallet to a SQLite file (shared by the command 78// Export the currently-loaded wallet to a SQLite file (shared by the command