diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -319,12 +319,15 @@ threadinterrupt.cpp uint256.cpp util/bytevectorhash.cpp + util/error.cpp util/moneystr.cpp util/settings.cpp util/strencodings.cpp util/system.cpp util/threadnames.cpp util/time.cpp + util/url.cpp + util/validation.cpp # obj/build.h "${BUILD_HEADER}" diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -234,12 +234,15 @@ util/bitmanip.h \ util/bytevectorhash.h \ util/check.h \ + util/error.h \ util/macros.h \ util/moneystr.h \ util/system.h \ util/settings.h \ util/threadnames.h \ util/time.h \ + util/url.h \ + util/validation.h \ validation.h \ validationinterface.h \ versionbits.h \ @@ -525,12 +528,15 @@ threadinterrupt.cpp \ uint256.cpp \ uint256.h \ + util/error.cpp \ util/system.cpp \ util/moneystr.cpp \ util/settings.cpp \ util/strencodings.cpp \ util/threadnames.cpp \ util/time.cpp \ + util/url.cpp \ + util/validation.cpp \ util/bytevectorhash.cpp \ $(BITCOIN_CORE_H) diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include diff --git a/src/miner.cpp b/src/miner.cpp --- a/src/miner.cpp +++ b/src/miner.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/node/transaction.h b/src/node/transaction.h --- a/src/node/transaction.h +++ b/src/node/transaction.h @@ -6,30 +6,11 @@ #define BITCOIN_NODE_TRANSACTION_H #include +#include class Config; struct TxId; -enum class TransactionError { - OK = 0, - UNKNOWN_ERROR, - - MISSING_INPUTS, - ALREADY_IN_CHAIN, - P2P_DISABLED, - MEMPOOL_REJECTED, - MEMPOOL_ERROR, - INVALID_PSBT, - PSBT_MISMATCH, - SIGHASH_MISMATCH, - - ERROR_COUNT -}; - -#define TRANSACTION_ERR_LAST TransactionError::ERROR_COUNT - -const char *TransactionErrorString(const TransactionError error); - /** * Broadcast a transaction * diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp --- a/src/node/transaction.cpp +++ b/src/node/transaction.cpp @@ -10,39 +10,12 @@ #include #include #include +#include #include #include #include -const char *TransactionErrorString(const TransactionError err) { - switch (err) { - case TransactionError::OK: - return "No error"; - case TransactionError::MISSING_INPUTS: - return "Missing inputs"; - case TransactionError::ALREADY_IN_CHAIN: - return "Transaction already in block chain"; - case TransactionError::P2P_DISABLED: - return "Peer-to-peer functionality missing or disabled"; - case TransactionError::MEMPOOL_REJECTED: - return "Transaction rejected by AcceptToMemoryPool"; - case TransactionError::MEMPOOL_ERROR: - return "AcceptToMemoryPool failed"; - case TransactionError::INVALID_PSBT: - return "PSBT is not sane"; - case TransactionError::PSBT_MISMATCH: - return "PSBTs not compatible (different transactions)"; - case TransactionError::SIGHASH_MISMATCH: - return "Specified sighash value does not match existing value"; - - case TransactionError::UNKNOWN_ERROR: - default: - break; - } - return "Unknown error"; -} - bool BroadcastTransaction(const Config &config, const CTransactionRef tx, TxId &txid, TransactionError &error, std::string &err_string, const bool allowhighfees) { diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -6,14 +6,13 @@ // NOTE: This file is intended to be customised by the end user, and includes // only local node policy logic +#include #include - #include #include