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

kwvg · kwvg · commit ea60d7998e24 · 2026-01-03T23:25:15.000+05:30
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -62,6 +62,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::Language: return "lang";
     //! Dash
     case OptionsModel::CoinJoinAmount: return "coinjoinamount";
+    case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     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));
@@ -356,7 +357,7 @@ bool OptionsModel::Init(bilingual_str& error)
     // 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, CoinJoinAmount,
-                            CoinJoinRounds, CoinJoinSessions}) {
+                            CoinJoinMultiSession, CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -384,11 +385,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("fCoinJoinMultiSession"))
-        settings.setValue("fCoinJoinMultiSession", DEFAULT_COINJOIN_MULTISESSION);
-    if (!gArgs.SoftSetBoolArg("-coinjoinmultisession", settings.value("fCoinJoinMultiSession").toBool()))
-        addOverriddenOption("-coinjoinmultisession");
-
     if (!settings.contains("nCoinJoinDenomsGoal"))
         settings.setValue("nCoinJoinDenomsGoal", DEFAULT_COINJOIN_DENOMS_GOAL);
     if (!gArgs.SoftSetArg("-coinjoindenomsgoal", settings.value("nCoinJoinDenomsGoal").toString().toStdString()))
@@ -652,7 +648,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinDenomsHardCap:
         return settings.value("nCoinJoinDenomsHardCap");
     case CoinJoinMultiSession:
-        return settings.value("fCoinJoinMultiSession");
+        return SettingToBool(setting(), DEFAULT_COINJOIN_MULTISESSION);
 #endif
     case DisplayUnit:
         return QVariant::fromValue(m_display_bitcoin_unit);
@@ -888,10 +884,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinMultiSession:
-        if (settings.value("fCoinJoinMultiSession") != value)
-        {
+        if (changed()) {
             node().coinJoinOptions().setMultiSessionEnabled(value.toBool());
-            settings.setValue("fCoinJoinMultiSession", node().coinJoinOptions().isMultiSessionEnabled());
+            update(value.toBool());
         }
         break;
 #endif
@@ -1136,6 +1131,7 @@ void OptionsModel::checkAndMigrate()
     //! Dash
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
+    migrate_setting(CoinJoinMultiSession, "fCoinJoinMultiSession");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
 #endif
