wip

src/dummywallet.cpp

@@ -10,6 +10,7 @@ class ArgsManager;
 
 namespace interfaces {
 class Chain;
+class Settings;
 class Handler;
 class Wallet;
 class WalletLoader;
@@ -61,7 +62,7 @@ const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();
 
 namespace interfaces {
 
-std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args)
+std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args, Settings& settings)
 {
     throw std::logic_error("Wallet function called in non-wallet build.");
 }

src/init.cpp

@@ -28,6 +28,7 @@
 #include <index/txindex.h>
 #include <init/common.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/init.h>
 #include <interfaces/mining.h>
 #include <interfaces/node.h>
@@ -1132,6 +1133,7 @@ bool AppInitInterfaces(NodeContext& node)
 {
     node.chain = node.init->makeChain();
     node.mining = node.init->makeMining();
+    node.settings = node.init->makeSettings();
     return true;
 }
 

src/init/bitcoin-gui.cpp

@@ -4,6 +4,7 @@
 
 #include <init.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/echo.h>
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
@@ -28,9 +29,10 @@ class BitcoinGuiInit : public interfaces::Init
     }
     std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
     std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
-    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
+    std::unique_ptr<interfaces::Settings> makeSettings() override { return interfaces::MakeSettings(m_node); }
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::Settings& settings) override
     {
-        return MakeWalletLoader(chain, *Assert(m_node.args));
+        return MakeWalletLoader(chain, *Assert(m_node.args), settings);
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
     interfaces::Ipc* ipc() override { return m_ipc.get(); }

src/init/bitcoin-node.cpp

@@ -4,6 +4,7 @@
 
 #include <init.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/echo.h>
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
@@ -30,10 +31,11 @@ class BitcoinNodeInit : public interfaces::Init
     }
     std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
     std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
+    std::unique_ptr<interfaces::Settings> makeSettings() override { return interfaces::MakeSettings(m_node); }
     std::unique_ptr<interfaces::Mining> makeMining() override { return interfaces::MakeMining(m_node); }
-    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::Settings& settings) override
     {
-        return MakeWalletLoader(chain, *Assert(m_node.args));
+        return MakeWalletLoader(chain, *Assert(m_node.args), settings);
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
     interfaces::Ipc* ipc() override { return m_ipc.get(); }

src/init/bitcoin-qt.cpp

@@ -4,6 +4,7 @@
 
 #include <init.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/echo.h>
 #include <interfaces/init.h>
 #include <interfaces/mining.h>
@@ -26,10 +27,11 @@ class BitcoinQtInit : public interfaces::Init
     }
     std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
     std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
+    std::unique_ptr<interfaces::Settings> makeSettings() override { return interfaces::MakeSettings(m_node); }
     std::unique_ptr<interfaces::Mining> makeMining() override { return interfaces::MakeMining(m_node); }
-    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::Settings& settings) override
     {
-        return MakeWalletLoader(chain, *Assert(m_node.args));
+        return MakeWalletLoader(chain, *Assert(m_node.args), settings);
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
     node::NodeContext m_node;

src/init/bitcoind.cpp

@@ -4,6 +4,7 @@
 
 #include <init.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/echo.h>
 #include <interfaces/init.h>
 #include <interfaces/mining.h>
@@ -29,9 +30,9 @@ class BitcoindInit : public interfaces::Init
     std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
     std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
     std::unique_ptr<interfaces::Mining> makeMining() override { return interfaces::MakeMining(m_node); }
-    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
+    std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain, interfaces::Settings& settings) override
     {
-        return MakeWalletLoader(chain, *Assert(m_node.args));
+        return MakeWalletLoader(chain, *Assert(m_node.args), settings);
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
     NodeContext& m_node;

src/interfaces/chain.h

@@ -96,17 +96,6 @@ struct BlockInfo {
     BlockInfo(const uint256& hash LIFETIMEBOUND) : hash(hash) {}
 };
 
-//! The action to be taken after updating a settings value.
-//! WRITE indicates that the updated value must be written to disk,
-//! while SKIP_WRITE indicates that the change will be kept in memory-only
-//! without persisting it.
-enum class SettingsAction {
-    WRITE,
-    SKIP_WRITE
-};
-
-using SettingsUpdate = std::function<std::optional<interfaces::SettingsAction>(common::SettingsValue&)>;
-
 //! Interface giving clients (wallet processes, maybe other analysis tools in
 //! the future) ability to access to the chain state, receive notifications,
 //! estimate fees, and submit transactions.
@@ -346,26 +335,6 @@ class Chain
     //! Run function after given number of seconds. Cancel any previous calls with same name.
     virtual void rpcRunLater(const std::string& name, std::function<void()> fn, int64_t seconds) = 0;
 
-    //! Get settings value.
-    virtual common::SettingsValue getSetting(const std::string& arg) = 0;
-
-    //! Get list of settings values.
-    virtual std::vector<common::SettingsValue> getSettingsList(const std::string& arg) = 0;
-
-    //! Return <datadir>/settings.json setting value.
-    virtual common::SettingsValue getRwSetting(const std::string& name) = 0;
-
-    //! Updates a setting in <datadir>/settings.json.
-    //! Depending on the action returned by the update function, this will either
-    //! update the setting in memory or write the updated settings to disk.
-    virtual bool updateRwSetting(const std::string& name, const SettingsUpdate& update_function) = 0;
-
-    //! Replace a setting in <datadir>/settings.json with a new value.
-    virtual bool overwriteRwSetting(const std::string& name, common::SettingsValue& value, bool write = true) = 0;
-
-    //! Delete a given setting in <datadir>/settings.json.
-    virtual bool deleteRwSettings(const std::string& name, bool write = true) = 0;
-
     //! Synchronously send transactionAddedToMempool notifications about all
     //! current mempool transactions to the specified handler and return after
     //! the last one is sent. These notifications aren't coordinated with async

src/interfaces/init.h

@@ -9,6 +9,7 @@
 #include <interfaces/echo.h>
 #include <interfaces/mining.h>
 #include <interfaces/node.h>
+#include <interfaces/settings.h>
 #include <interfaces/wallet.h>
 
 #include <memory>
@@ -33,8 +34,9 @@ class Init
     virtual ~Init() = default;
     virtual std::unique_ptr<Node> makeNode() { return nullptr; }
     virtual std::unique_ptr<Chain> makeChain() { return nullptr; }
+    virtual std::unique_ptr<Settings> makeSettings() { return nullptr; }
     virtual std::unique_ptr<Mining> makeMining() { return nullptr; }
-    virtual std::unique_ptr<WalletLoader> makeWalletLoader(Chain& chain) { return nullptr; }
+    virtual std::unique_ptr<WalletLoader> makeWalletLoader(Chain& chain, Settings& settings) { return nullptr; }
     virtual std::unique_ptr<Echo> makeEcho() { return nullptr; }
     virtual Ipc* ipc() { return nullptr; }
 };

src/interfaces/node.h

@@ -101,24 +101,6 @@ class Node
     //! Return whether shutdown was requested.
     virtual bool shutdownRequested() = 0;
 
-    //! Return whether a particular setting in <datadir>/settings.json is or
-    //! would be ignored because it is also specified in the command line.
-    virtual bool isSettingIgnored(const std::string& name) = 0;
-
-    //! Return setting value from <datadir>/settings.json or bitcoin.conf.
-    virtual common::SettingsValue getPersistentSetting(const std::string& name) = 0;
-
-    //! Update a setting in <datadir>/settings.json.
-    virtual void updateRwSetting(const std::string& name, const common::SettingsValue& value) = 0;
-
-    //! Force a setting value to be applied, overriding any other configuration
-    //! source, but not being persisted.
-    virtual void forceSetting(const std::string& name, const common::SettingsValue& value) = 0;
-
-    //! Clear all settings in <datadir>/settings.json and store a backup of
-    //! previous settings in <datadir>/settings.json.bak.
-    virtual void resetSettings() = 0;
-
     //! Map port.
     virtual void mapPort(bool use_upnp, bool use_natpmp) = 0;
 

src/interfaces/settings.h

@@ -0,0 +1,77 @@
+// Copyright (c) 2024 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_INTERFACES_SETTINGS_H
+#define BITCOIN_INTERFACES_SETTINGS_H
+
+#include <common/settings.h>
+
+#include <memory>
+#include <string>
+
+namespace node {
+struct  NodeContext;
+} // namespacce node
+namespace interfaces {
+
+//! The action to be taken after updating a settings value.
+//! WRITE indicates that the updated value must be written to disk,
+//! while SKIP_WRITE indicates that the change will be kept in memory-only
+//! without persisting it.
+enum class SettingsAction {
+    WRITE,
+    SKIP_WRITE
+};
+
+class Settings {
+public:
+    virtual ~Settings() = default;
+
+    //! Get settings value.
+    virtual common::SettingsValue getSetting(const std::string& arg) = 0;
+
+    //! Get list of settings values.
+    virtual std::vector<common::SettingsValue> getSettingsList(const std::string& arg) = 0;
+
+    //! Return <datadir>/settings.json setting value.
+    virtual common::SettingsValue getRwSetting(const std::string& name) = 0;
+
+    //! Updates a setting in <datadir>/settings.json.
+    //! Depending on the action returned by the update function, this will either
+    //! update the setting in memory or write the updated settings to disk.
+    using SettingsUpdateFn = 
+        std::function<std::optional<interfaces::SettingsAction>(common::SettingsValue&)>;
+    virtual bool updateRwSetting(const std::string& name, const SettingsUpdateFn& update_function) = 0;
+
+    //! Replace a setting in <datadir>/settings.json with a new value.
+    virtual bool overwriteRwSetting(const std::string& name, common::SettingsValue& value, bool write = true) = 0;
+
+    //! Delete a given setting in <datadir>/settings.json.
+    virtual bool deleteRwSettings(const std::string& name, bool write = true) = 0;
+
+    //! Clear all settings in <datadir>/settings.json and store a backup of
+    //! previous settings in <datadir>/settings.json.bak.
+    virtual void resetSettings() = 0;
+
+    //! Force a setting value to be applied, overriding any other configuration
+    //! source, but not being persisted.
+    virtual void forceSetting(const std::string& name, const common::SettingsValue& value) = 0;
+
+     //! Return whether a particular setting in <datadir>/settings.json is or
+    //! would be ignored because it is also specified in the command line.
+    virtual bool isSettingIgnored(const std::string& name) = 0;
+
+    //! Return setting value from <datadir>/settings.json or bitcoin.conf.
+    virtual common::SettingsValue getPersistentSetting(const std::string& name) = 0;
+
+    //! Update a setting in <datadir>/settings.json.
+    virtual void updateRwSetting(const std::string& name, const common::SettingsValue& value) = 0;
+};
+
+//! Return an implementation of Settings interface.
+std::unique_ptr<Settings> MakeSettings(node::NodeContext& node);
+
+} // namespace interfaces
+
+#endif // BITCOIN_INTERFACES_SETTINGS_H

src/interfaces/wallet.h

@@ -9,6 +9,7 @@
 #include <common/signmessage.h>
 #include <consensus/amount.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <pubkey.h>
 #include <script/script.h>
 #include <support/allocators/secure.h>
@@ -452,7 +453,7 @@ std::unique_ptr<Wallet> MakeWallet(wallet::WalletContext& context, const std::sh
 
 //! Return implementation of ChainClient interface for a wallet loader. This
 //! function will be undefined in builds where ENABLE_WALLET is false.
-std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args);
+std::unique_ptr<WalletLoader> MakeWalletLoader(Chain& chain, ArgsManager& args, Settings& settings);
 
 } // namespace interfaces
 

src/node/context.cpp

@@ -7,6 +7,7 @@
 #include <addrman.h>
 #include <banman.h>
 #include <interfaces/chain.h>
+#include <interfaces/settings.h>
 #include <interfaces/mining.h>
 #include <kernel/context.h>
 #include <key.h>

src/node/context.h

@@ -26,6 +26,7 @@ class NetGroupManager;
 class PeerManager;
 namespace interfaces {
 class Chain;
+class Settings;
 class ChainClient;
 class Mining;
 class Init;
@@ -71,6 +72,7 @@ struct NodeContext {
     ArgsManager* args{nullptr}; // Currently a raw pointer because the memory is not managed by this struct
     std::vector<BaseIndex*> indexes; // raw pointers because memory is not managed by this struct
     std::unique_ptr<interfaces::Chain> chain;
+    std::unique_ptr<interfaces::Settings> settings;
     //! List of all chain clients (wallet processes or other client) connected to node.
     std::vector<std::unique_ptr<interfaces::ChainClient>> chain_clients;
     //! Reference to chain client that should used to load or create wallets