sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#22951: move amount.h into consensus

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-10-21 17:59:23 +00:00
parent a0ab06f5c0
commit 20d15056f1
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
70 changed files with 83 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -699,11 +699,11 @@ crypto_libbitcoin_crypto_arm_shani_a_SOURCES = crypto/sha256_arm_shani.cpp
libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_consensus_a_SOURCES = \ libbitcoin_consensus_a_SOURCES = \
amount.h \
arith_uint256.cpp \ arith_uint256.cpp \
arith_uint256.h \ arith_uint256.h \
bls/bls.cpp \ bls/bls.cpp \
bls/bls.h \ bls/bls.h \
consensus/amount.h \
consensus/merkle.cpp \ consensus/merkle.cpp \
consensus/merkle.h \ consensus/merkle.h \
consensus/params.h \ consensus/params.h \

2
src/addressindex.h
View File

@ -8,7 +8,7 @@
#ifndef BITCOIN_ADDRESSINDEX_H #ifndef BITCOIN_ADDRESSINDEX_H
#define BITCOIN_ADDRESSINDEX_H #define BITCOIN_ADDRESSINDEX_H
#include <amount.h> #include <consensus/amount.h>
#include <serialize.h> #include <serialize.h>
#include <uint256.h> #include <uint256.h>
#include <util/underlying.h> #include <util/underlying.h>

2
src/coinjoin/common.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_COINJOIN_COMMON_H #ifndef BITCOIN_COINJOIN_COMMON_H
#define BITCOIN_COINJOIN_COMMON_H #define BITCOIN_COINJOIN_COMMON_H
#include <amount.h> #include <consensus/amount.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <array> #include <array>

3
src/coinjoin/options.h
View File

@ -5,7 +5,8 @@
#ifndef BITCOIN_COINJOIN_OPTIONS_H #ifndef BITCOIN_COINJOIN_OPTIONS_H
#define BITCOIN_COINJOIN_OPTIONS_H #define BITCOIN_COINJOIN_OPTIONS_H
#include <amount.h> #include <consensus/amount.h>
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>

12
src/amount.h → src/consensus/amount.h
View File

@ -3,15 +3,15 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_AMOUNT_H #ifndef BITCOIN_CONSENSUS_AMOUNT_H
#define BITCOIN_AMOUNT_H #define BITCOIN_CONSENSUS_AMOUNT_H
#include <stdint.h> #include <cstdint>
/** Amount in satoshis (Can be negative) */ /** Amount in satoshis (Can be negative) */
typedef int64_t CAmount; typedef int64_t CAmount;
static const CAmount COIN = 100000000; static constexpr CAmount COIN = 100000000;
/** No amount larger than this (in satoshi) is valid. /** No amount larger than this (in satoshi) is valid.
* *
@ -22,7 +22,7 @@ static const CAmount COIN = 100000000;
* critical; in unusual circumstances like a(nother) overflow bug that allowed * critical; in unusual circumstances like a(nother) overflow bug that allowed
* for the creation of coins out of thin air modification could lead to a fork. * for the creation of coins out of thin air modification could lead to a fork.
* */ * */
static const CAmount MAX_MONEY = 21000000 * COIN; static constexpr CAmount MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
#endif // BITCOIN_AMOUNT_H #endif // BITCOIN_CONSENSUS_AMOUNT_H

1
src/consensus/tx_check.cpp
View File

@ -7,6 +7,7 @@
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/tx_check.h> #include <consensus/tx_check.h>
#include <consensus/amount.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <consensus/validation.h> #include <consensus/validation.h>

2
src/consensus/tx_verify.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CONSENSUS_TX_VERIFY_H #ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
#define BITCOIN_CONSENSUS_TX_VERIFY_H #define BITCOIN_CONSENSUS_TX_VERIFY_H
#include <amount.h> #include <consensus/amount.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>

2
src/core_io.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_CORE_IO_H #ifndef BITCOIN_CORE_IO_H
#define BITCOIN_CORE_IO_H #define BITCOIN_CORE_IO_H
#include <amount.h> #include <consensus/amount.h>
#include <attributes.h> #include <attributes.h>
#include <string> #include <string>

1
src/core_write.cpp
View File

@ -4,6 +4,7 @@
#include <core_io.h> #include <core_io.h>
#include <consensus/amount.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <key_io.h> #include <key_io.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>

2
src/evo/dmn_types.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_EVO_DMN_TYPES_H #ifndef BITCOIN_EVO_DMN_TYPES_H
#define BITCOIN_EVO_DMN_TYPES_H #define BITCOIN_EVO_DMN_TYPES_H
#include <amount.h> #include <consensus/amount.h>
#include <limits> #include <limits>
#include <string_view> #include <string_view>

2
src/governance/classes.h
View File

@ -4,7 +4,7 @@
#ifndef BITCOIN_GOVERNANCE_CLASSES_H #ifndef BITCOIN_GOVERNANCE_CLASSES_H
#define BITCOIN_GOVERNANCE_CLASSES_H #define BITCOIN_GOVERNANCE_CLASSES_H
#include <amount.h> #include <consensus/amount.h>
#include <governance/object.h> #include <governance/object.h>
#include <script/script.h> #include <script/script.h>
#include <script/standard.h> #include <script/standard.h>

2
src/init.cpp
View File

@ -11,13 +11,13 @@
#include <init.h> #include <init.h>
#include <addrman.h> #include <addrman.h>
#include <amount.h>
#include <banman.h> #include <banman.h>
#include <base58.h> #include <base58.h>
#include <blockfilter.h> #include <blockfilter.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <context.h> #include <context.h>
#include <consensus/amount.h>
#include <deploymentstatus.h> #include <deploymentstatus.h>
#include <node/coinstats.h> #include <node/coinstats.h>
#include <fs.h> #include <fs.h>

2
src/interfaces/node.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_INTERFACES_NODE_H #ifndef BITCOIN_INTERFACES_NODE_H
#define BITCOIN_INTERFACES_NODE_H #define BITCOIN_INTERFACES_NODE_H
#include <amount.h> // For CAmount #include <consensus/amount.h> // For CAmount
#include <net.h> // For NodeId #include <net.h> // For NodeId
#include <net_types.h> // For banmap_t #include <net_types.h> // For banmap_t
#include <netaddress.h> // For Network #include <netaddress.h> // For Network

2
src/interfaces/wallet.h
View File

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

2
src/masternode/payments.cpp
View File

@ -4,9 +4,9 @@
#include <masternode/payments.h> #include <masternode/payments.h>
#include <amount.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <deploymentstatus.h> #include <deploymentstatus.h>
#include <evo/deterministicmns.h> #include <evo/deterministicmns.h>
#include <governance/classes.h> #include <governance/classes.h>

2
src/masternode/payments.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_MASTERNODE_PAYMENTS_H #ifndef BITCOIN_MASTERNODE_PAYMENTS_H
#define BITCOIN_MASTERNODE_PAYMENTS_H #define BITCOIN_MASTERNODE_PAYMENTS_H
#include <amount.h> #include <consensus/amount.h>
#include <string> #include <string>
#include <vector> #include <vector>

2
src/miner.cpp
View File

@ -6,9 +6,9 @@
#include <miner.h> #include <miner.h>
#include <amount.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/merkle.h> #include <consensus/merkle.h>
#include <consensus/tx_verify.h> #include <consensus/tx_verify.h>

1
src/net.h
View File

@ -10,6 +10,7 @@
#include <bloom.h> #include <bloom.h>
#include <chainparams.h> #include <chainparams.h>
#include <compat.h> #include <compat.h>
#include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <crypto/siphash.h> #include <crypto/siphash.h>
#include <hash.h> #include <hash.h>

1
src/net_processing.cpp
View File

@ -10,6 +10,7 @@
#include <blockencodings.h> #include <blockencodings.h>
#include <blockfilter.h> #include <blockfilter.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <hash.h> #include <hash.h>
#include <index/blockfilterindex.h> #include <index/blockfilterindex.h>

2
src/node/coinstats.h
View File

@ -6,9 +6,9 @@
#ifndef BITCOIN_NODE_COINSTATS_H #ifndef BITCOIN_NODE_COINSTATS_H
#define BITCOIN_NODE_COINSTATS_H #define BITCOIN_NODE_COINSTATS_H
#include <amount.h>
#include <chain.h> #include <chain.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <streams.h> #include <streams.h>
#include <uint256.h> #include <uint256.h>

2
src/policy/feerate.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_POLICY_FEERATE_H #ifndef BITCOIN_POLICY_FEERATE_H
#define BITCOIN_POLICY_FEERATE_H #define BITCOIN_POLICY_FEERATE_H
#include <amount.h> #include <consensus/amount.h>
#include <serialize.h> #include <serialize.h>
#include <string> #include <string>

2
src/policy/fees.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_POLICY_FEES_H #ifndef BITCOIN_POLICY_FEES_H
#define BITCOIN_POLICY_FEES_H #define BITCOIN_POLICY_FEES_H
#include <amount.h> #include <consensus/amount.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <uint256.h> #include <uint256.h>
#include <random.h> #include <random.h>

1
src/primitives/transaction.cpp
View File

@ -5,6 +5,7 @@
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <consensus/amount.h>
#include <hash.h> #include <hash.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <util/strencodings.h> #include <util/strencodings.h>

2
src/primitives/transaction.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_PRIMITIVES_TRANSACTION_H #ifndef BITCOIN_PRIMITIVES_TRANSACTION_H
#define BITCOIN_PRIMITIVES_TRANSACTION_H #define BITCOIN_PRIMITIVES_TRANSACTION_H
#include <amount.h> #include <consensus/amount.h>
#include <script/script.h> #include <script/script.h>
#include <serialize.h> #include <serialize.h>
#include <uint256.h> #include <uint256.h>

2
src/qt/bitcoinamountfield.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_BITCOINAMOUNTFIELD_H #ifndef BITCOIN_QT_BITCOINAMOUNTFIELD_H
#define BITCOIN_QT_BITCOINAMOUNTFIELD_H #define BITCOIN_QT_BITCOINAMOUNTFIELD_H
#include <amount.h> #include <consensus/amount.h>
#include <QValidator> #include <QValidator>
#include <QWidget> #include <QWidget>

2
src/qt/bitcoingui.h
View File

@ -11,7 +11,7 @@
#include <qt/optionsdialog.h> #include <qt/optionsdialog.h>
#include <amount.h> #include <consensus/amount.h>
#include <QLabel> #include <QLabel>
#include <QMainWindow> #include <QMainWindow>

2
src/qt/bitcoinunits.cpp
View File

@ -6,6 +6,8 @@
#include <qt/bitcoinunits.h> #include <qt/bitcoinunits.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <QSettings> #include <QSettings>
#include <QStringList> #include <QStringList>

2
src/qt/bitcoinunits.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_QT_BITCOINUNITS_H #ifndef BITCOIN_QT_BITCOINUNITS_H
#define BITCOIN_QT_BITCOINUNITS_H #define BITCOIN_QT_BITCOINUNITS_H
#include <amount.h> #include <consensus/amount.h>
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QString> #include <QString>

2
src/qt/coincontroldialog.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_COINCONTROLDIALOG_H #ifndef BITCOIN_QT_COINCONTROLDIALOG_H
#define BITCOIN_QT_COINCONTROLDIALOG_H #define BITCOIN_QT_COINCONTROLDIALOG_H
#include <amount.h> #include <consensus/amount.h>
#include <QAbstractButton> #include <QAbstractButton>
#include <QAction> #include <QAction>

2
src/qt/guiutil.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_GUIUTIL_H #ifndef BITCOIN_QT_GUIUTIL_H
#define BITCOIN_QT_GUIUTIL_H #define BITCOIN_QT_GUIUTIL_H
#include <amount.h> #include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <qt/guiconstants.h> #include <qt/guiconstants.h>
#include <net.h> #include <net.h>

1
src/qt/optionsmodel.h
View File

@ -5,7 +5,6 @@
#ifndef BITCOIN_QT_OPTIONSMODEL_H #ifndef BITCOIN_QT_OPTIONSMODEL_H
#define BITCOIN_QT_OPTIONSMODEL_H #define BITCOIN_QT_OPTIONSMODEL_H
#include <amount.h>
#include <qt/guiconstants.h> #include <qt/guiconstants.h>
#include <cstdint> #include <cstdint>

2
src/qt/sendcoinsrecipient.h
View File

@ -9,7 +9,7 @@
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif #endif
#include <amount.h> #include <consensus/amount.h>
#include <serialize.h> #include <serialize.h>
#include <string> #include <string>

2
src/qt/transactionfilterproxy.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_TRANSACTIONFILTERPROXY_H #ifndef BITCOIN_QT_TRANSACTIONFILTERPROXY_H
#define BITCOIN_QT_TRANSACTIONFILTERPROXY_H #define BITCOIN_QT_TRANSACTIONFILTERPROXY_H
#include <amount.h> #include <consensus/amount.h>
#include <QDateTime> #include <QDateTime>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
src/qt/transactionrecord.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_TRANSACTIONRECORD_H #ifndef BITCOIN_QT_TRANSACTIONRECORD_H
#define BITCOIN_QT_TRANSACTIONRECORD_H #define BITCOIN_QT_TRANSACTIONRECORD_H
#include <amount.h> #include <consensus/amount.h>
#include <uint256.h> #include <uint256.h>
#include <key_io.h> #include <key_io.h>

2
src/qt/walletmodeltransaction.h
View File

@ -8,7 +8,7 @@
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <qt/sendcoinsrecipient.h> #include <qt/sendcoinsrecipient.h>
#include <amount.h> #include <consensus/amount.h>
#include <QObject> #include <QObject>

2
src/qt/walletview.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_WALLETVIEW_H #ifndef BITCOIN_QT_WALLETVIEW_H
#define BITCOIN_QT_WALLETVIEW_H #define BITCOIN_QT_WALLETVIEW_H
#include <amount.h> #include <consensus/amount.h>
#include <qt/governancelist.h> #include <qt/governancelist.h>
#include <qt/masternodelist.h> #include <qt/masternodelist.h>

2
src/rpc/blockchain.cpp
View File

@ -6,11 +6,11 @@
#include <rpc/blockchain.h> #include <rpc/blockchain.h>
#include <amount.h>
#include <blockfilter.h> #include <blockfilter.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <core_io.h> #include <core_io.h>
#include <consensus/params.h> #include <consensus/params.h>
#include <consensus/validation.h> #include <consensus/validation.h>

2
src/rpc/blockchain.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_RPC_BLOCKCHAIN_H #ifndef BITCOIN_RPC_BLOCKCHAIN_H
#define BITCOIN_RPC_BLOCKCHAIN_H #define BITCOIN_RPC_BLOCKCHAIN_H
#include <amount.h> #include <consensus/amount.h>
#include <core_io.h> #include <core_io.h>
#include <streams.h> #include <streams.h>
#include <sync.h> #include <sync.h>

8
src/rpc/index_util.h
View File

@ -6,15 +6,15 @@
#ifndef BITCOIN_RPC_INDEX_UTIL_H #ifndef BITCOIN_RPC_INDEX_UTIL_H
#define BITCOIN_RPC_INDEX_UTIL_H #define BITCOIN_RPC_INDEX_UTIL_H
#include <cstdint> #include <consensus/amount.h>
#include <vector>
#include <amount.h>
#include <addressindex.h> #include <addressindex.h>
#include <spentindex.h> #include <spentindex.h>
#include <sync.h> #include <sync.h>
#include <threadsafety.h> #include <threadsafety.h>
#include <cstdint>
#include <vector>
class CBlockTreeDB; class CBlockTreeDB;
class CTxMemPool; class CTxMemPool;
class uint160; class uint160;

2
src/rpc/mining.cpp
View File

@ -4,9 +4,9 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/params.h> #include <consensus/params.h>
#include <consensus/validation.h> #include <consensus/validation.h>

1
src/rpc/rawtransaction.cpp
View File

@ -7,6 +7,7 @@
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <consensus/tx_verify.h> #include <consensus/tx_verify.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <core_io.h> #include <core_io.h>

1
src/rpc/rawtransaction_util.cpp
View File

@ -6,6 +6,7 @@
#include <rpc/rawtransaction_util.h> #include <rpc/rawtransaction_util.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <core_io.h> #include <core_io.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>
#include <key_io.h> #include <key_io.h>

1
src/rpc/server.h
View File

@ -6,7 +6,6 @@
#ifndef BITCOIN_RPC_SERVER_H #ifndef BITCOIN_RPC_SERVER_H
#define BITCOIN_RPC_SERVER_H #define BITCOIN_RPC_SERVER_H
#include <amount.h>
#include <rpc/request.h> #include <rpc/request.h>
#include <rpc/util.h> #include <rpc/util.h>

1
src/rpc/util.cpp
View File

@ -3,6 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <consensus/amount.h>
#include <key_io.h> #include <key_io.h>
#include <outputtype.h> #include <outputtype.h>
#include <pubkey.h> #include <pubkey.h>

1
src/script/sign.cpp
View File

@ -5,6 +5,7 @@
#include <script/sign.h> #include <script/sign.h>
#include <consensus/amount.h>
#include <key.h> #include <key.h>
#include <policy/policy.h> #include <policy/policy.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>

2
src/spentindex.h
View File

@ -9,7 +9,7 @@
#define BITCOIN_SPENTINDEX_H #define BITCOIN_SPENTINDEX_H
#include <addressindex.h> #include <addressindex.h>
#include <amount.h> #include <consensus/amount.h>
#include <script/script.h> #include <script/script.h>
#include <serialize.h> #include <serialize.h>
#include <uint256.h> #include <uint256.h>

2
src/test/amount_tests.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h> #include <consensus/amount.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <limits> #include <limits>

2
src/test/evo_assetlocks_tests.cpp
View File

@ -4,7 +4,7 @@
#include <test/util/setup_common.h> #include <test/util/setup_common.h>
#include <amount.h> #include <consensus/amount.h>
#include <consensus/tx_check.h> #include <consensus/tx_check.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <evo/assetlocktx.h> #include <evo/assetlocktx.h>

2
src/test/fuzz/coins_view.cpp
View File

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h>
#include <chainparams.h> #include <chainparams.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <consensus/tx_check.h> #include <consensus/tx_check.h>
#include <consensus/tx_verify.h> #include <consensus/tx_verify.h>
#include <consensus/validation.h> #include <consensus/validation.h>

2
src/test/fuzz/fee_rate.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h> #include <consensus/amount.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>

2
src/test/fuzz/fees.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h> #include <consensus/amount.h>
#include <policy/fees.h> #include <policy/fees.h>
#include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>

1
src/test/fuzz/integer.cpp
View File

@ -5,6 +5,7 @@
#include <arith_uint256.h> #include <arith_uint256.h>
#include <chainparams.h> #include <chainparams.h>
#include <compressor.h> #include <compressor.h>
#include <consensus/amount.h>
#include <consensus/merkle.h> #include <consensus/merkle.h>
#include <core_io.h> #include <core_io.h>
#include <crypto/common.h> #include <crypto/common.h>

1
src/test/fuzz/script_flags.cpp
View File

@ -2,6 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <consensus/amount.h>
#include <pubkey.h> #include <pubkey.h>
#include <script/interpreter.h> #include <script/interpreter.h>
#include <streams.h> #include <streams.h>

2
src/test/fuzz/util.h
View File

@ -5,12 +5,12 @@
#ifndef BITCOIN_TEST_FUZZ_UTIL_H #ifndef BITCOIN_TEST_FUZZ_UTIL_H
#define BITCOIN_TEST_FUZZ_UTIL_H #define BITCOIN_TEST_FUZZ_UTIL_H
#include <amount.h>
#include <arith_uint256.h> #include <arith_uint256.h>
#include <attributes.h> #include <attributes.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <coins.h> #include <coins.h>
#include <compat.h> #include <compat.h>
#include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <key.h> #include <key.h>
#include <merkleblock.h> #include <merkleblock.h>

1
src/test/validation_tests.cpp
View File

@ -2,6 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <consensus/amount.h>
#include <net.h> #include <net.h>
#include <uint256.h> #include <uint256.h>
#include <validation.h> #include <validation.h>

8
src/txmempool.h
View File

@ -15,17 +15,17 @@
#include <vector> #include <vector>
#include <addressindex.h> #include <addressindex.h>
#include <spentindex.h>
#include <amount.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <gsl/pointers.h> #include <gsl/pointers.h>
#include <indirectmap.h> #include <indirectmap.h>
#include <netaddress.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <policy/packages.h> #include <policy/packages.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <random.h>
#include <netaddress.h>
#include <pubkey.h> #include <pubkey.h>
#include <random.h>
#include <spentindex.h>
#include <sync.h> #include <sync.h>
#include <util/epochguard.h> #include <util/epochguard.h>
#include <util/hasher.h> #include <util/hasher.h>

2
src/util/moneystr.cpp
View File

@ -5,7 +5,7 @@
#include <util/moneystr.h> #include <util/moneystr.h>
#include <amount.h> #include <consensus/amount.h>
#include <tinyformat.h> #include <tinyformat.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/string.h> #include <util/string.h>

2
src/util/moneystr.h
View File

@ -9,8 +9,8 @@
#ifndef BITCOIN_UTIL_MONEYSTR_H #ifndef BITCOIN_UTIL_MONEYSTR_H
#define BITCOIN_UTIL_MONEYSTR_H #define BITCOIN_UTIL_MONEYSTR_H
#include <amount.h>
#include <attributes.h> #include <attributes.h>
#include <consensus/amount.h>
#include <optional> #include <optional>
#include <string> #include <string>

2
src/util/system.h
View File

@ -18,12 +18,12 @@
#include <attributes.h> #include <attributes.h>
#include <compat.h> #include <compat.h>
#include <compat/assumptions.h> #include <compat/assumptions.h>
#include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <logging.h> #include <logging.h>
#include <sync.h> #include <sync.h>
#include <util/settings.h> #include <util/settings.h>
#include <util/time.h> #include <util/time.h>
#include <amount.h>
#include <exception> #include <exception>
#include <map> #include <map>

1
src/validation.cpp
View File

@ -10,6 +10,7 @@
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <checkqueue.h> #include <checkqueue.h>
#include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/merkle.h> #include <consensus/merkle.h>
#include <consensus/tx_check.h> #include <consensus/tx_check.h>

2
src/validation.h
View File

@ -11,10 +11,10 @@
#include <config/bitcoin-config.h> #include <config/bitcoin-config.h>
#endif #endif
#include <amount.h>
#include <arith_uint256.h> #include <arith_uint256.h>
#include <attributes.h> #include <attributes.h>
#include <chain.h> #include <chain.h>
#include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <policy/feerate.h> #include <policy/feerate.h>

2
src/wallet/coinselection.h
View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_WALLET_COINSELECTION_H #ifndef BITCOIN_WALLET_COINSELECTION_H
#define BITCOIN_WALLET_COINSELECTION_H #define BITCOIN_WALLET_COINSELECTION_H
#include <amount.h> #include <consensus/amount.h>
#include <policy/feerate.h> #include <policy/feerate.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <random.h> #include <random.h>

2
src/wallet/fees.h
View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_WALLET_FEES_H #ifndef BITCOIN_WALLET_FEES_H
#define BITCOIN_WALLET_FEES_H #define BITCOIN_WALLET_FEES_H
#include <amount.h> #include <consensus/amount.h>
class CCoinControl; class CCoinControl;
class CFeeRate; class CFeeRate;

2
src/wallet/interfaces.cpp
View File

@ -4,8 +4,8 @@
#include <interfaces/wallet.h> #include <interfaces/wallet.h>
#include <amount.h>
#include <coinjoin/client.h> #include <coinjoin/client.h>
#include <consensus/amount.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>
#include <interfaces/coinjoin.h> #include <interfaces/coinjoin.h>
#include <interfaces/handler.h> #include <interfaces/handler.h>

2
src/wallet/rpcwallet.cpp
View File

@ -4,8 +4,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <core_io.h> #include <core_io.h>
#include <httpserver.h> #include <httpserver.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>

2
src/wallet/test/coinjoin_tests.cpp
View File

@ -4,12 +4,12 @@
#include <test/util/setup_common.h> #include <test/util/setup_common.h>
#include <amount.h>
#include <coinjoin/client.h> #include <coinjoin/client.h>
#include <coinjoin/coinjoin.h> #include <coinjoin/coinjoin.h>
#include <coinjoin/context.h> #include <coinjoin/context.h>
#include <coinjoin/options.h> #include <coinjoin/options.h>
#include <coinjoin/util.h> #include <coinjoin/util.h>
#include <consensus/amount.h>
#include <node/context.h> #include <node/context.h>
#include <util/translation.h> #include <util/translation.h>
#include <validation.h> #include <validation.h>

7
src/wallet/test/coinselector_tests.cpp
View File

@ -2,13 +2,14 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <amount.h> #include <test/util/setup_common.h>
#include <consensus/amount.h>
#include <node/context.h> #include <node/context.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <random.h> #include <random.h>
#include <test/util/setup_common.h>
#include <validation.h>
#include <util/translation.h> #include <util/translation.h>
#include <validation.h>
#include <wallet/coincontrol.h> #include <wallet/coincontrol.h>
#include <wallet/coinselection.h> #include <wallet/coinselection.h>
#include <wallet/test/wallet_test_fixture.h> #include <wallet/test/wallet_test_fixture.h>

1
src/wallet/wallet.cpp
View File

@ -8,6 +8,7 @@
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <consensus/amount.h>
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <crypto/common.h> #include <crypto/common.h>

2
src/wallet/wallet.h
View File

@ -7,7 +7,7 @@
#ifndef BITCOIN_WALLET_WALLET_H #ifndef BITCOIN_WALLET_WALLET_H
#define BITCOIN_WALLET_WALLET_H #define BITCOIN_WALLET_WALLET_H
#include <amount.h> #include <consensus/amount.h>
#include <fs.h> #include <fs.h>
#include <governance/common.h> #include <governance/common.h>
#include <interfaces/chain.h> #include <interfaces/chain.h>

1
src/wallet/walletdb.h
View File

@ -6,7 +6,6 @@
#ifndef BITCOIN_WALLET_WALLETDB_H #ifndef BITCOIN_WALLET_WALLETDB_H
#define BITCOIN_WALLET_WALLETDB_H #define BITCOIN_WALLET_WALLETDB_H
#include <amount.h>
#include <script/sign.h> #include <script/sign.h>
#include <wallet/db.h> #include <wallet/db.h>
#include <wallet/walletutil.h> #include <wallet/walletutil.h>