merge bitcoin#22951: move amount.h into consensus

dashpay · Oct 25, 2024 · 20d1505 · 20d1505
1 parent a0ab06f
commit 20d1505
Show file tree

Hide file tree

Showing 70 changed files with 83 additions and 68 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -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_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_consensus_a_SOURCES = \
-  amount.h \
   arith_uint256.cpp \
   arith_uint256.h \
   bls/bls.cpp \
   bls/bls.h \
+  consensus/amount.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
   consensus/params.h \

diff --git a/src/addressindex.h b/src/addressindex.h
@@ -8,7 +8,7 @@
 #ifndef BITCOIN_ADDRESSINDEX_H
 #define BITCOIN_ADDRESSINDEX_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <util/underlying.h>

diff --git a/src/coinjoin/common.h b/src/coinjoin/common.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_COINJOIN_COMMON_H
 #define BITCOIN_COINJOIN_COMMON_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <primitives/transaction.h>
 
 #include <array>

diff --git a/src/coinjoin/options.h b/src/coinjoin/options.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_COINJOIN_OPTIONS_H
 #define BITCOIN_COINJOIN_OPTIONS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
+
 #include <atomic>
 #include <mutex>
 

diff --git a/src/amount.h → src/consensus/amount.h b/src/amount.h → src/consensus/amount.h
@@ -3,15 +3,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_AMOUNT_H
-#define BITCOIN_AMOUNT_H
+#ifndef BITCOIN_CONSENSUS_AMOUNT_H
+#define BITCOIN_CONSENSUS_AMOUNT_H
 
-#include <stdint.h>
+#include <cstdint>
 
 /** Amount in satoshis (Can be negative) */
 typedef int64_t CAmount;
 
-static const CAmount COIN = 100000000;
+static constexpr CAmount COIN = 100000000;
 
 /** 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
  * 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); }
 
-#endif //  BITCOIN_AMOUNT_H
+#endif //  BITCOIN_CONSENSUS_AMOUNT_H
diff --git a/src/consensus/tx_check.cpp b/src/consensus/tx_check.cpp
@@ -7,6 +7,7 @@
 #include <consensus/consensus.h>
 #include <consensus/tx_check.h>
 
+#include <consensus/amount.h>
 #include <primitives/transaction.h>
 #include <consensus/validation.h>
 

diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
 #define BITCOIN_CONSENSUS_TX_VERIFY_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <stdint.h>
 #include <vector>

diff --git a/src/core_io.h b/src/core_io.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CORE_IO_H
 #define BITCOIN_CORE_IO_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <attributes.h>
 
 #include <string>

diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -4,6 +4,7 @@
 
 #include <core_io.h>
 
+#include <consensus/amount.h>
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <primitives/transaction.h>

diff --git a/src/evo/dmn_types.h b/src/evo/dmn_types.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_EVO_DMN_TYPES_H
 #define BITCOIN_EVO_DMN_TYPES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <limits>
 #include <string_view>

diff --git a/src/governance/classes.h b/src/governance/classes.h
@@ -4,7 +4,7 @@
 #ifndef BITCOIN_GOVERNANCE_CLASSES_H
 #define BITCOIN_GOVERNANCE_CLASSES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <governance/object.h>
 #include <script/script.h>
 #include <script/standard.h>

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

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
@@ -5,7 +5,7 @@
 #ifndef 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_types.h>  // For banmap_t
 #include <netaddress.h> // For Network

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

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

diff --git a/src/masternode/payments.h b/src/masternode/payments.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_MASTERNODE_PAYMENTS_H
 #define BITCOIN_MASTERNODE_PAYMENTS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <string>
 #include <vector>

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -6,9 +6,9 @@
 
 #include <miner.h>
 
-#include <amount.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>

diff --git a/src/net.h b/src/net.h
@@ -10,6 +10,7 @@
 #include <bloom.h>
 #include <chainparams.h>
 #include <compat.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <crypto/siphash.h>
 #include <hash.h>

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -10,6 +10,7 @@
 #include <blockencodings.h>
 #include <blockfilter.h>
 #include <chainparams.h>
+#include <consensus/amount.h>
 #include <consensus/validation.h>
 #include <hash.h>
 #include <index/blockfilterindex.h>

diff --git a/src/node/coinstats.h b/src/node/coinstats.h
@@ -6,9 +6,9 @@
 #ifndef BITCOIN_NODE_COINSTATS_H
 #define BITCOIN_NODE_COINSTATS_H
 
-#include <amount.h>
 #include <chain.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <streams.h>
 #include <uint256.h>
 

diff --git a/src/policy/feerate.h b/src/policy/feerate.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_POLICY_FEERATE_H
 #define BITCOIN_POLICY_FEERATE_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 
 #include <string>

diff --git a/src/policy/fees.h b/src/policy/fees.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_POLICY_FEES_H
 #define BITCOIN_POLICY_FEES_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <policy/feerate.h>
 #include <uint256.h>
 #include <random.h>

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -5,6 +5,7 @@
 
 #include <primitives/transaction.h>
 
+#include <consensus/amount.h>
 #include <hash.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_PRIMITIVES_TRANSACTION_H
 #define BITCOIN_PRIMITIVES_TRANSACTION_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>

diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_BITCOINAMOUNTFIELD_H
 #define BITCOIN_QT_BITCOINAMOUNTFIELD_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QValidator>
 #include <QWidget>

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -11,7 +11,7 @@
 
 #include <qt/optionsdialog.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QLabel>
 #include <QMainWindow>

diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
@@ -6,6 +6,8 @@
 #include <qt/bitcoinunits.h>
 #include <chainparams.h>
 
+#include <consensus/amount.h>
+
 #include <QSettings>
 #include <QStringList>
 

diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_QT_BITCOINUNITS_H
 #define BITCOIN_QT_BITCOINUNITS_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QAbstractListModel>
 #include <QString>

diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_COINCONTROLDIALOG_H
 #define BITCOIN_QT_COINCONTROLDIALOG_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QAbstractButton>
 #include <QAction>

diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_GUIUTIL_H
 #define BITCOIN_QT_GUIUTIL_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <fs.h>
 #include <qt/guiconstants.h>
 #include <net.h>

diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_QT_OPTIONSMODEL_H
 #define BITCOIN_QT_OPTIONSMODEL_H
 
-#include <amount.h>
 #include <qt/guiconstants.h>
 
 #include <cstdint>

diff --git a/src/qt/sendcoinsrecipient.h b/src/qt/sendcoinsrecipient.h
@@ -9,7 +9,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <serialize.h>
 
 #include <string>

diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_TRANSACTIONFILTERPROXY_H
 #define BITCOIN_QT_TRANSACTIONFILTERPROXY_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QDateTime>
 #include <QSortFilterProxyModel>

diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_TRANSACTIONRECORD_H
 #define BITCOIN_QT_TRANSACTIONRECORD_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <uint256.h>
 #include <key_io.h>
 

diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
@@ -8,7 +8,7 @@
 #include <primitives/transaction.h>
 #include <qt/sendcoinsrecipient.h>
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <QObject>
 

diff --git a/src/qt/walletview.h b/src/qt/walletview.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_WALLETVIEW_H
 #define BITCOIN_QT_WALLETVIEW_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <qt/governancelist.h>
 #include <qt/masternodelist.h>
 

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

diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_RPC_BLOCKCHAIN_H
 #define BITCOIN_RPC_BLOCKCHAIN_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <core_io.h>
 #include <streams.h>
 #include <sync.h>

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