backport: Merge bitcoin#28966, gui#803, 27254

src/Makefile.am

@@ -244,7 +244,6 @@ BITCOIN_CORE_H = \
   gsl/pointers.h \
   flat-database.h \
   flatfile.h \
-  fs.h \
   httprpc.h \
   httpserver.h \
   i2p.h \
@@ -398,6 +397,8 @@ BITCOIN_CORE_H = \
   util/error.h \
   util/fastrange.h \
   util/fees.h \
+  util/fs.h \
+  util/fs_helpers.h \
   util/golombrice.h \
   util/hasher.h \
   util/hash_type.h \
@@ -978,7 +979,6 @@ libbitcoin_util_a_SOURCES = \
   support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
-  fs.cpp \
   interfaces/echo.cpp \
   interfaces/handler.cpp \
   interfaces/init.cpp \
@@ -996,6 +996,8 @@ libbitcoin_util_a_SOURCES = \
   util/edge.cpp \
   util/error.cpp \
   util/fees.cpp \
+  util/fs.cpp \
+  util/fs_helpers.cpp \
   util/hasher.cpp \
   util/getuniquepath.cpp \
   util/sock.cpp \

src/addrdb.cpp

@@ -8,7 +8,8 @@
 #include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
-#include <fs.h>
+#include <util/fs.h>
+#include <util/fs_helpers.h>
 #include <hash.h>
 #include <logging/timer.h>
 #include <netbase.h>

src/addrdb.h

@@ -6,9 +6,9 @@
 #ifndef BITCOIN_ADDRDB_H
 #define BITCOIN_ADDRDB_H
 
-#include <fs.h>
 #include <net_types.h> // For banmap_t
 #include <univalue.h>
+#include <util/fs.h>
 
 #include <memory>
 #include <optional>

src/banman.h

@@ -7,9 +7,9 @@
 
 #include <addrdb.h>
 #include <common/bloom.h>
-#include <fs.h>
 #include <net_types.h> // For banmap_t
 #include <sync.h>
+#include <util/fs.h>
 
 #include <chrono>
 #include <cstdint>

src/bench/bench.cpp

@@ -4,8 +4,8 @@
 
 #include <bench/bench.h>
 
-#include <fs.h>
 #include <test/util/setup_common.h>
+#include <util/fs.h>
 #include <util/string.h>
 
 #include <algorithm>

src/bench/bench.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_BENCH_BENCH_H
 #define BITCOIN_BENCH_BENCH_H
 
-#include <fs.h>
+#include <util/fs.h>
 #include <util/macros.h>
 
 #include <chrono>

src/bench/bench_bitcoin.cpp

@@ -8,7 +8,7 @@
 #include <clientversion.h>
 #include <crypto/sha256.h>
 #include <crypto/x11/dispatch.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 

src/bitcoin-tx.cpp

@@ -13,7 +13,7 @@
 #include <consensus/consensus.h>
 #include <core_io.h>
 #include <key_io.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>

src/coinjoin/client.cpp

@@ -19,6 +19,7 @@
 #include <netmessagemaker.h>
 #include <shutdown.h>
 #include <util/check.h>
+#include <util/fs_helpers.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/translation.h>
@@ -1782,4 +1783,3 @@ void CCoinJoinClientManager::GetJsonInfo(UniValue& obj) const
     }
     obj.pushKV("sessions", arrSessions);
 }
-

src/dbwrapper.cpp

@@ -4,7 +4,8 @@
 
 #include <dbwrapper.h>
 
-#include <fs.h>
+#include <util/fs.h>
+#include <util/fs_helpers.h>
 #include <logging.h>
 #include <random.h>
 #include <util/strencodings.h>

src/dbwrapper.h

@@ -7,11 +7,11 @@
 
 #include <assert.h>
 #include <clientversion.h>
-#include <fs.h>
 #include <logging.h>
 #include <serialize.h>
 #include <span.h>
 #include <streams.h>
+#include <util/fs.h>
 
 #include <sys/types.h>
 

src/flat-database.h

@@ -7,7 +7,7 @@
 
 #include <clientversion.h>
 #include <chainparams.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <hash.h>
 #include <streams.h>
 #include <util/system.h>

src/flatfile.cpp

@@ -8,7 +8,7 @@
 #include <flatfile.h>
 #include <logging.h>
 #include <tinyformat.h>
-#include <util/system.h>
+#include <util/fs_helpers.h>
 
 FlatFileSeq::FlatFileSeq(fs::path dir, const char* prefix, size_t chunk_size) :
     m_dir(std::move(dir)),

src/flatfile.h

@@ -8,8 +8,8 @@
 
 #include <string>
 
-#include <fs.h>
 #include <serialize.h>
+#include <util/fs.h>
 
 struct FlatFilePos
 {

src/i2p.cpp

@@ -6,14 +6,14 @@
 #include <compat/compat.h>
 #include <compat/endian.h>
 #include <crypto/sha256.h>
-#include <fs.h>
 #include <i2p.h>
 #include <logging.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <random.h>
 #include <sync.h>
 #include <tinyformat.h>
+#include <util/fs.h>
 #include <util/readwritefile.h>
 #include <util/sock.h>
 #include <util/spanparsing.h>

src/i2p.h

@@ -6,10 +6,10 @@
 #define BITCOIN_I2P_H
 
 #include <compat/compat.h>
-#include <fs.h>
 #include <netaddress.h>
 #include <netbase.h>
 #include <sync.h>
+#include <util/fs.h>
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
 

src/index/blockfilterindex.cpp

@@ -9,6 +9,7 @@
 #include <index/blockfilterindex.h>
 #include <node/blockstorage.h>
 #include <serialize.h>
+#include <util/fs_helpers.h>
 #include <util/system.h>
 
 using node::UndoReadFromDisk;

src/init.cpp

@@ -19,7 +19,8 @@
 #include <context.h>
 #include <consensus/amount.h>
 #include <deploymentstatus.h>
-#include <fs.h>
+#include <util/fs.h>
+#include <util/fs_helpers.h>
 #include <hash.h>
 #include <httpserver.h>
 #include <httprpc.h>

src/init/common.cpp

@@ -10,7 +10,7 @@
 #include <clientversion.h>
 #include <crypto/sha256.h>
 #include <crypto/x11/dispatch.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <key.h>
 #include <logging.h>
 #include <node/interface_ui.h>

src/interfaces/wallet.h

@@ -6,7 +6,7 @@
 #define BITCOIN_INTERFACES_WALLET_H
 
 #include <consensus/amount.h>          // For CAmount
-#include <fs.h>
+#include <util/fs.h>
 #include <governance/common.h>
 #include <interfaces/chain.h>          // For ChainClient
 #include <pubkey.h>                    // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)

src/ipc/interfaces.cpp

@@ -2,14 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <fs.h>
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
 #include <ipc/capnp/protocol.h>
 #include <ipc/process.h>
 #include <ipc/protocol.h>
 #include <logging.h>
 #include <tinyformat.h>
+#include <util/fs.h>
 #include <util/system.h>
 
 #include <cstdio>

src/ipc/process.cpp

@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <fs.h>
 #include <ipc/process.h>
 #include <ipc/protocol.h>
 #include <mp/util.h>
 #include <tinyformat.h>
+#include <util/fs.h>
 #include <util/strencodings.h>
 
 #include <cstdint>

src/ipc/process.h

@@ -5,6 +5,8 @@
 #ifndef BITCOIN_IPC_PROCESS_H
 #define BITCOIN_IPC_PROCESS_H
 
+#include <util/fs.h>
+
 #include <memory>
 #include <string>
 

src/logging.cpp

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <fs.h>
 #include <logging.h>
+#include <util/fs.h>
 #include <util/string.h>
 #include <util/threadnames.h>
 #include <util/time.h>

src/logging.h

@@ -6,9 +6,9 @@
 #ifndef BITCOIN_LOGGING_H
 #define BITCOIN_LOGGING_H
 
-#include <fs.h>
 #include <threadsafety.h>
 #include <tinyformat.h>
+#include <util/fs.h>
 #include <util/string.h>
 
 #include <atomic>

src/net.cpp

@@ -19,7 +19,7 @@
 #include <consensus/consensus.h>
 #include <crypto/sha256.h>
 #include <node/eviction.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <i2p.h>
 #include <key.h>
 #include <memusage.h>

src/net.h

@@ -12,7 +12,7 @@
 #include <compat/compat.h>
 #include <consensus/amount.h>
 #include <consensus/params.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <crypto/siphash.h>
 #include <hash.h>
 #include <i2p.h>

src/node/blockstorage.cpp

@@ -9,7 +9,7 @@
 #include <clientversion.h>
 #include <consensus/validation.h>
 #include <flatfile.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <hash.h>
 #include <pow.h>
 #include <shutdown.h>

src/node/blockstorage.h

@@ -8,7 +8,7 @@
 #include <attributes.h>
 #include <chain.h>
 #include <chainparams.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <kernel/blockmanager_opts.h>
 #include <protocol.h>
 #include <sync.h>

src/policy/fees.cpp

@@ -7,7 +7,7 @@
 
 #include <clientversion.h>
 #include <consensus/amount.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <logging.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>

src/policy/fees.h

@@ -11,6 +11,7 @@
 #include <sync.h>
 #include <threadsafety.h>
 #include <uint256.h>
+#include <util/fs.h>
 
 #include <array>
 #include <map>

src/qt/bitcoin.cpp

@@ -10,7 +10,7 @@
 #include <qt/bitcoin.h>
 
 #include <chainparams.h>
-#include <fs.h>
+#include <util/fs.h>
 #include <init.h>
 #include <interfaces/handler.h>
 #include <interfaces/init.h>

src/qt/guiutil.cpp

@@ -14,7 +14,8 @@
 
 #include <base58.h>
 #include <chainparams.h>
-#include <fs.h>
+#include <util/fs.h>
+#include <util/fs_helpers.h>
 #include <interfaces/node.h>
 #include <key_io.h>
 #include <policy/policy.h>

src/qt/guiutil.h

@@ -6,10 +6,10 @@
 #define BITCOIN_QT_GUIUTIL_H
 
 #include <consensus/amount.h>
-#include <fs.h>
 #include <net.h>
 #include <netaddress.h>
 #include <util/check.h>
+#include <util/fs.h>
 
 #include <qt/bitcoinunits.h>
 #include <qt/guiconstants.h>

src/qt/intro.cpp

@@ -8,15 +8,16 @@
 #endif
 
 #include <chainparams.h>
-#include <fs.h>
 #include <qt/intro.h>
 #include <qt/forms/ui_intro.h>
+#include <util/fs.h>
 
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 
 #include <interfaces/node.h>
+#include <util/fs_helpers.h>
 #include <util/system.h>
 #include <validation.h>