[Build] add util/validation build unit

>>> coming from bitcoin/bitcoin@91a25d1

Author: random-zebra

CMakeLists.txt

@@ -432,6 +432,7 @@ set(UTIL_SOURCES
         ./src/util/threadnames.cpp
         ./src/util/blockstatecatcher.h
         ./src/util/system.cpp
+        ./src/util/validation.cpp
         ./src/utilstrencodings.cpp
         ./src/utilmoneystr.cpp
         ./src/utiltime.cpp

src/Makefile.am

@@ -297,6 +297,7 @@ BITCOIN_CORE_H = \
   util/macros.h \
   util/string.h \
   util/threadnames.h \
+  util/validation.h \
   utilstrencodings.h \
   utilmoneystr.h \
   utiltime.h \
@@ -569,6 +570,7 @@ libbitcoin_util_a_SOURCES = \
   util/threadnames.cpp \
   utilstrencodings.cpp \
   util/string.cpp \
+  util/validation.cpp \
   utiltime.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBSAPLING_H)

src/blockassembler.cpp

@@ -21,7 +21,7 @@
 #include "spork.h"
 #include "timedata.h"
 #include "util/system.h"
-#include "validation.h"
+#include "util/validation.h"
 #include "validationinterface.h"
 
 #ifdef ENABLE_WALLET

src/budget/budgetmanager.cpp

@@ -11,6 +11,7 @@
 #include "masternodeman.h"
 #include "net_processing.h"
 #include "netmessagemaker.h"
+#include "util/validation.h"
 #include "validation.h"   // GetTransaction, cs_main
 
 

src/budget/budgetvote.h

@@ -7,6 +7,7 @@
 #define BUDGET_VOTE_H
 
 #include "messagesigner.h"
+#include "primitives/transaction.h"
 
 #include <univalue.h>
 

src/budget/finalizedbudgetvote.h

@@ -7,6 +7,7 @@
 #define FINALIZED_BUDGET_VOTE_H
 
 #include "messagesigner.h"
+#include "primitives/transaction.h"
 
 #include <univalue.h>
 

src/evo/deterministicmns.cpp

@@ -16,7 +16,6 @@
 #include "script/standard.h"
 #include "spork.h"
 #include "sync.h"
-#include "validation.h"
 #include "validationinterface.h"
 
 #include <univalue.h>

src/masternode.h

@@ -10,6 +10,7 @@
 #include "key.h"
 #include "messagesigner.h"
 #include "net.h"
+#include "primitives/transaction.h"
 #include "serialize.h"
 #include "sync.h"
 #include "timedata.h"

src/messagesigner.cpp

@@ -8,9 +8,9 @@
 #include "messagesigner.h"
 #include "tinyformat.h"
 #include "util/system.h"
+#include "util/validation.h"
 #include "utilstrencodings.h"
 
-const std::string strMessageMagic = "DarkNet Signed Message:\n";
 
 bool CMessageSigner::GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CPubKey& pubkeyRet)
 {

src/messagesigner.h

@@ -7,9 +7,6 @@
 #define MESSAGESIGNER_H
 
 #include "key.h"
-#include "primitives/transaction.h" // for CTxIn
-
-extern const std::string strMessageMagic;
 
 enum MessageVersion {
         MESS_VER_STRMESS    = 0, // old format

src/net_processing.cpp

@@ -19,6 +19,7 @@
 #include "primitives/transaction.h"
 #include "sporkdb.h"
 #include "streams.h"
+#include "util/validation.h"
 
 int64_t nTimeBestReceived = 0;  // Used only to inform the wallet of when we last received a block
 

src/qt/pivx/settings/settingssignmessagewidgets.cpp

@@ -3,16 +3,17 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "qt/pivx/settings/settingssignmessagewidgets.h"
-#include "qt/pivx/settings/forms/ui_settingssignmessagewidgets.h"
-#include "qt/pivx/qtutils.h"
-#include "guiutil.h"
-#include "walletmodel.h"
 
-#include "key_io.h"
 #include "init.h"
+#include "key_io.h"
+#include "qt/askpassphrasedialog.h"
+#include "qt/addressbookpage.h"
+#include "qt/guiutil.h"
+#include "qt/pivx/settings/forms/ui_settingssignmessagewidgets.h"
+#include "qt/pivx/qtutils.h"
+#include "qt/walletmodel.h"
+#include "util/validation.h"
 #include "wallet/wallet.h"
-#include "askpassphrasedialog.h"
-#include "addressbookpage.h"
 
 #include <string>
 #include <vector>

src/rpc/budget.cpp

@@ -16,6 +16,7 @@
 #include "masternodeman.h"
 #include "messagesigner.h"
 #include "rpc/server.h"
+#include "util/validation.h"
 #include "utilmoneystr.h"
 #ifdef ENABLE_WALLET
 #include "wallet/rpcwallet.h"

src/rpc/misc.cpp

@@ -17,6 +17,7 @@
 #include "spork.h"
 #include "timedata.h"
 #include "util/system.h"
+#include "util/validation.h"
 #ifdef ENABLE_WALLET
 #include "wallet/rpcwallet.h"
 #include "wallet/wallet.h"

src/rpc/rpcevo.cpp

@@ -17,8 +17,8 @@
 #include "pubkey.h" // COMPACT_SIGNATURE_SIZE
 #include "rpc/server.h"
 #include "script/sign.h"
+#include "util/validation.h"
 #include "utilmoneystr.h"
-#include "validation.h"
 
 #ifdef ENABLE_WALLET
 #include "coincontrol.h"

src/util/blockstatecatcher.h

@@ -5,7 +5,7 @@
 #ifndef PIVX_BLOCKSTATECATCHER_H
 #define PIVX_BLOCKSTATECATCHER_H
 
-#include "validation.h"
+#include "consensus/validation.h"
 #include "validationinterface.h"
 
 /**

src/util/validation.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2019 The Bitcoin Core developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "util/validation.h"
+
+#include "consensus/validation.h"
+#include "tinyformat.h"
+
+/** Convert CValidationState to a human-readable message for logging */
+std::string FormatStateMessage(const CValidationState& state)
+{
+    return strprintf("%s%s (code %i)",
+        state.GetRejectReason(),
+        state.GetDebugMessage().empty() ? "" : ", "+state.GetDebugMessage(),
+        state.GetRejectCode());
+}
+
+const std::string strMessageMagic = "DarkNet Signed Message:\n";

src/util/validation.h

@@ -0,0 +1,19 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2019 The Bitcoin Core developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef PIVX_UTIL_VALIDATION_H
+#define PIVX_UTIL_VALIDATION_H
+
+#include <string>
+
+class CValidationState;
+
+/** Convert CValidationState to a human-readable message for logging */
+std::string FormatStateMessage(const CValidationState& state);
+
+extern const std::string strMessageMagic;
+
+#endif // PIVX_UTIL_VALIDATION_H

src/validation.cpp

@@ -43,6 +43,7 @@
 #include "txdb.h"
 #include "undo.h"
 #include "util/system.h"
+#include "util/validation.h"
 #include "utilmoneystr.h"
 #include "validationinterface.h"
 #include "warnings.h"
@@ -312,15 +313,6 @@ CAmount GetShieldedTxMinFee(const CTransaction& tx)
     return nMinFee;
 }
 
-/** Convert CValidationState to a human-readable message for logging */
-std::string FormatStateMessage(const CValidationState &state)
-{
-    return strprintf("%s%s (code %i)",
-        state.GetRejectReason(),
-        (state.GetDebugMessage().empty() ? "" : ", " + state.GetDebugMessage()),
-        state.GetRejectCode());
-}
-
 /* Make mempool consistent after a reorg, by re-adding or recursively erasing
  * disconnected block transactions from the mempool, and also removing any
  * other transactions from the mempool that are no longer valid given the new

src/validation.h

@@ -223,9 +223,6 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const
                                 bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit = false,
                                 bool fRejectInsaneFee = false, bool ignoreFees = false);
 
-/** Convert CValidationState to a human-readable message for logging */
-std::string FormatStateMessage(const CValidationState &state);
-
 CAmount GetMinRelayFee(const CTransaction& tx, const CTxMemPool& pool, unsigned int nBytes);
 CAmount GetMinRelayFee(unsigned int nBytes);
 /**

src/wallet/rpcwallet.cpp

@@ -23,6 +23,7 @@
 #include "spork.h"
 #include "timedata.h"
 #include "utilmoneystr.h"
+#include "util/validation.h"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 #include "wallet/walletutil.h"

src/wallet/wallet.cpp

@@ -21,6 +21,7 @@
 #include "script/sign.h"
 #include "scheduler.h"
 #include "spork.h"
+#include "util/validation.h"
 #include "utilmoneystr.h"
 #include "wallet/fees.h"
 #include "zpivchain.h"