qt: migrate -coinjoinamount setting from QSettings to settings.json

kwvg · kwvg · commit fb97375d87ce · 2026-01-03T23:25:15.000+05:30
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -61,6 +61,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::ProxyUseTor: return "onion";
     case OptionsModel::Language: return "lang";
     //! Dash
+    case OptionsModel::CoinJoinAmount: return "coinjoinamount";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
@@ -70,6 +71,7 @@ static const char* SettingName(OptionsModel::OptionID option)
 static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 {
     switch (option) {
+    case OptionsModel::CoinJoinAmount:
     case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
@@ -353,8 +355,8 @@ bool OptionsModel::Init(bilingual_str& error)
     // These are shared with the core or have a command-line parameter
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, ExternalSignerPath, MapPortUPnP,
-                            MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language, CoinJoinRounds,
-                            CoinJoinSessions}) {
+                            MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language, CoinJoinAmount,
+                            CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -382,11 +384,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("nCoinJoinAmount"))
-        settings.setValue("nCoinJoinAmount", DEFAULT_COINJOIN_AMOUNT);
-    if (!gArgs.SoftSetArg("-coinjoinamount", settings.value("nCoinJoinAmount").toString().toStdString()))
-        addOverriddenOption("-coinjoinamount");
-
     if (!settings.contains("fCoinJoinMultiSession"))
         settings.setValue("fCoinJoinMultiSession", DEFAULT_COINJOIN_MULTISESSION);
     if (!gArgs.SoftSetBoolArg("-coinjoinmultisession", settings.value("fCoinJoinMultiSession").toBool()))
@@ -649,7 +646,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinRounds:
         return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_ROUNDS));
     case CoinJoinAmount:
-        return settings.value("nCoinJoinAmount");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_AMOUNT));
     case CoinJoinDenomsGoal:
         return settings.value("nCoinJoinDenomsGoal");
     case CoinJoinDenomsHardCap:
@@ -872,10 +869,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinAmount:
-        if (settings.value("nCoinJoinAmount") != value)
-        {
+        if (changed()) {
             node().coinJoinOptions().setAmount(value.toInt());
-            settings.setValue("nCoinJoinAmount", node().coinJoinOptions().getAmount());
+            update(value.toInt());
             Q_EMIT coinJoinAmountChanged();
         }
         break;
@@ -1139,6 +1135,7 @@ void OptionsModel::checkAndMigrate()
 
     //! Dash
 #ifdef ENABLE_WALLET
+    migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
 #endif
