dashpay · UdjinM6 · Jun 27, 2021 · Jun 27, 2021 · Jun 16, 2021 · Oct 10, 2019
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -260,13 +260,21 @@ BITCOIN_CORE_H = \
   ui_interface.h \
   undo.h \
   unordered_lru_cache.h \
-  util.h \
-  utilasmap.h \
-  utilmemory.h \
-  utilmoneystr.h \
-  utilstring.h \
-  utiltime.h \
-  utilthreadnames.h \
+  util/bytevectorhash.h \
+  util/error.h \
+  util/fees.h \
+  util/system.h \
+  util/asmap.h \
+  util/macros.h \
+  util/memory.h \
+  util/moneystr.h \
+  util/serfloat.h \
+  util/string.h \
+  util/time.h \
+  util/threadnames.h \
+  util/vector.h \
+  util/url.h \
+  util/validation.h \
   validation.h \
   validationinterface.h \
   versionbits.h \
@@ -444,7 +452,9 @@ crypto_libdash_crypto_base_a_SOURCES = \
   crypto/sha3.cpp \
   crypto/sha3.h \
   crypto/sha512.cpp \
-  crypto/sha512.h
+  crypto/sha512.h \
+  crypto/siphash.cpp \
+  crypto/siphash.h
 
 if USE_ASM
 crypto_libdash_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp
@@ -529,8 +539,8 @@ libdash_consensus_a_SOURCES = \
   tinyformat.h \
   uint256.cpp \
   uint256.h \
-  utilstrencodings.cpp \
-  utilstrencodings.h \
+  util/strencodings.cpp \
+  util/strencodings.h \
   version.h
 
 # common: shared between dashd, and dash-qt and non-server tools
@@ -588,13 +598,19 @@ libdash_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   threadinterrupt.cpp \
-  util.cpp \
-  utilasmap.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
-  utilstring.cpp \
-  utilthreadnames.cpp \
+  util/bytevectorhash.cpp \
+  util/error.cpp \
+  util/fees.cpp \
+  util/system.cpp \
+  util/asmap.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
+  util/serfloat.cpp \
+  util/string.cpp \
+  util/threadnames.cpp \
+  util/url.cpp \
+  util/validation.cpp \
   $(BITCOIN_CORE_H)
 
 if GLIBC_BACK_COMPAT

diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -12,7 +12,7 @@
 #include <random.h>
 #include <streams.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 namespace {
 

diff --git a/src/addrman.h b/src/addrman.h
@@ -13,7 +13,7 @@
 #include <sync.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <fs.h>
 #include <hash.h>

diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
@@ -6,7 +6,7 @@
 #include <arith_uint256.h>
 
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <crypto/common.h>
 
 #include <stdio.h>

diff --git a/src/attributes.h b/src/attributes.h
@@ -6,19 +6,6 @@
 #ifndef BITCOIN_ATTRIBUTES_H
 #define BITCOIN_ATTRIBUTES_H
 
-#if defined(__has_cpp_attribute)
-#  if __has_cpp_attribute(nodiscard)
-#    define NODISCARD [[nodiscard]]
-#  endif
-#endif
-#ifndef NODISCARD
-#  if defined(_MSC_VER) && _MSC_VER >= 1700
-#    define NODISCARD _Check_return_
-#  else
-#    define NODISCARD __attribute__((warn_unused_result))
-#  endif
-#endif
-
 #if defined(__clang__)
 #  if __has_attribute(lifetimebound)
 #    define LIFETIMEBOUND [[clang::lifetimebound]]

diff --git a/src/base58.cpp b/src/base58.cpp
@@ -6,8 +6,8 @@
 
 #include <hash.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
-#include <utilstring.h>
+#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <assert.h>
 #include <stdint.h>

diff --git a/src/base58.h b/src/base58.h
@@ -35,13 +35,13 @@ std::string EncodeBase58(const std::vector<unsigned char>& vch);
  * return true if decoding is successful.
  * psz cannot be nullptr.
  */
-NODISCARD bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet);
+[[nodiscard]] bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet);
 
 /**
  * Decode a base58-encoded string (str) into a byte vector (vchRet).
  * return true if decoding is successful.
  */
-NODISCARD bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet);
+[[nodiscard]] bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet);
 
 /**
  * Encode a byte vector into a base58-encoded string, including checksum
@@ -52,12 +52,12 @@ std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn);
  * Decode a base58-encoded string (psz) that includes a checksum into a byte
  * vector (vchRet), return true if decoding is successful
  */
-NODISCARD bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet);
+[[nodiscard]] bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet);
 
 /**
  * Decode a base58-encoded string (str) that includes a checksum into a byte
  * vector (vchRet), return true if decoding is successful
  */
-NODISCARD bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet);
+[[nodiscard]] bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet);
 
 #endif // BITCOIN_BASE58_H
diff --git a/src/batchedlogger.cpp b/src/batchedlogger.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <batchedlogger.h>
-#include <util.h>
+#include <util/system.h>
 
 CBatchedLogger::CBatchedLogger(BCLog::LogFlags _category, const std::string& _header) :
     accept(LogAcceptCategory(_category)), header(_header)

diff --git a/src/bech32.cpp b/src/bech32.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bech32.h>
+#include <util/vector.h>
 
 namespace
 {
@@ -24,13 +25,6 @@ const int8_t CHARSET_REV[128] = {
      1,  0,  3, 16, 11, 28, 12, 14,  6,  4,  2, -1, -1, -1, -1, -1
 };
 
-/** Concatenate two byte arrays. */
-data Cat(data x, const data& y)
-{
-    x.insert(x.end(), y.begin(), y.end());
-    return x;
-}
-
 /** This function will compute what 6 5-bit values to XOR into the last 6 input values, in order to
  *  make the checksum 0. These 6 values are packed together in a single 30-bit integer. The higher
  *  bits correspond to earlier values. */

diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
@@ -8,7 +8,7 @@
 #include <key.h>
 #include <stacktraces.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 #include <random.h>
 
 #include <boost/lexical_cast.hpp>

diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
@@ -5,7 +5,7 @@
 #include <bench/bench.h>
 #include <random.h>
 #include <bls/bls_worker.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 #include <iostream>
 

diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <checkqueue.h>
 #include <prevector.h>

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
@@ -10,12 +10,13 @@
 #include <hash.h>
 #include <random.h>
 #include <uint256.h>
-#include <utiltime.h>
+#include <util/time.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>
 #include <crypto/sha3.h>
 #include <crypto/sha512.h>
+#include <crypto/siphash.h>
 
 /* Number of bytes to hash per iteration */
 static const uint64_t BUFFER_SIZE = 1000*1000;

diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <validation.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.

diff --git a/src/bench/string_cast.cpp b/src/bench/string_cast.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/lexical_cast.hpp>
 #include <string>

diff --git a/src/bench/util_time.cpp b/src/bench/util_time.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 
-#include <utiltime.h>
+#include <util/time.h>
 
 static void BenchTimeDeprecated(benchmark::State& state)
 {

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
@@ -6,12 +6,13 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <chainparams.h>
-#include <hash.h>
+#include <crypto/sha256.h>
+#include <crypto/siphash.h>
 #include <random.h>
 #include <streams.h>
 #include <txmempool.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <unordered_map>
 

diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <blockfilter.h>
+#include <crypto/siphash.h>
 #include <hash.h>
 #include <primitives/transaction.h>
 #include <script/script.h>

diff --git a/src/blockfilter.h b/src/blockfilter.h
@@ -5,14 +5,15 @@
 #ifndef BITCOIN_BLOCKFILTER_H
 #define BITCOIN_BLOCKFILTER_H
 
-#include <set>
 #include <stdint.h>
+#include <unordered_set>
 #include <vector>
 
 #include <primitives/block.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <undo.h>
+#include <util/bytevectorhash.h>
 
 /**
  * This implements a Golomb-coded set as defined in BIP 158. It is a
@@ -22,7 +23,7 @@ class GCSFilter
 {
 public:
     typedef std::vector<unsigned char> Element;
-    typedef std::set<Element> ElementSet;
+    typedef std::unordered_set<Element, ByteVectorHash> ElementSet;
 
 private:
     uint64_t m_siphash_k0;

diff --git a/src/bls/bls.h b/src/bls/bls.h
@@ -8,7 +8,7 @@
 #include <hash.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 // bls-dash uses relic, which may define DEBUG and ERROR, which leads to many warnings in some build setups
 #undef ERROR

diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
@@ -6,7 +6,7 @@
 #include <hash.h>
 #include <serialize.h>
 
-#include <util.h>
+#include <util/system.h>
 
 #include <memory>
 #include <utility>

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -8,8 +8,8 @@
 #include <consensus/merkle.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <arith_uint256.h>
 

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -6,8 +6,8 @@
 #include <chainparamsbase.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilmemory.h>
+#include <util/system.h>
+#include <util/memory.h>
 
 #include <assert.h>
 

diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -7,7 +7,7 @@
 
 #include <sync.h>
 #include <tinyformat.h>
-#include <utilthreadnames.h>
+#include <util/threadnames.h>
 
 #include <algorithm>
 #include <vector>

diff --git a/src/coinjoin/coinjoin-client-options.cpp b/src/coinjoin/coinjoin-client-options.cpp
@@ -4,7 +4,7 @@
 
 #include <coinjoin/coinjoin-client-options.h>
 
-#include <util.h>
+#include <util/system.h>
 #include <univalue.h>
 
 #include <cassert>

diff --git a/src/coinjoin/coinjoin-client.cpp b/src/coinjoin/coinjoin-client.cpp
@@ -15,8 +15,8 @@
 #include <net_processing.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>
 #include <wallet/coincontrol.h>

diff --git a/src/coinjoin/coinjoin-server.cpp b/src/coinjoin/coinjoin-server.cpp
@@ -15,8 +15,8 @@
 #include <netmessagemaker.h>
 #include <script/interpreter.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>