From de0675f9de5feae1f070840ad7218b1378fb880b Mon Sep 17 00:00:00 2001
From: marcofleon <marleo23@proton.me>
Date: Fri, 1 Aug 2025 13:29:27 +0100
Subject: [PATCH] refactor: Move `transaction_identifier.h` to primitives

Moves the file from `src/util` to `src/primitives`. Now that the
refactor is complete, Txid and Wtxid are fundamental types, so it
makes sense for them to reside in `src/primitives`.
---
 src/index/txindex.cpp                             | 2 +-
 src/interfaces/wallet.h                           | 2 +-
 src/merkleblock.h                                 | 2 +-
 src/primitives/transaction.cpp                    | 2 +-
 src/primitives/transaction.h                      | 2 +-
 src/{util => primitives}/transaction_identifier.h | 6 +++---
 src/qt/sendcoinsdialog.h                          | 2 +-
 src/qt/transactionrecord.h                        | 2 +-
 src/qt/transactionview.h                          | 2 +-
 src/qt/walletmodel.h                              | 2 +-
 src/test/fuzz/hex.cpp                             | 2 +-
 src/test/transaction_tests.cpp                    | 2 +-
 src/test/uint256_tests.cpp                        | 2 +-
 src/txmempool.h                                   | 2 +-
 src/wallet/receive.h                              | 2 +-
 src/wallet/rpc/transactions.cpp                   | 2 +-
 src/wallet/spend.cpp                              | 2 +-
 src/wallet/wallet.h                               | 2 +-
 src/wallet/walletdb.cpp                           | 2 +-
 src/wallet/walletdb.h                             | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)
 rename src/{util => primitives}/transaction_identifier.h (95%)

diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
index 2a7c0066b08..11dd856e1b6 100644
--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@@ -9,7 +9,7 @@
 #include <index/disktxpos.h>
 #include <logging.h>
 #include <node/blockstorage.h>
-#include <util/transaction_identifier.h>
+#include <primitives/transaction_identifier.h>
 #include <validation.h>
 
 constexpr uint8_t DB_TXINDEX{'t'};
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 94869aff5af..412cbb613e3 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -9,12 +9,12 @@
 #include <common/signmessage.h>
 #include <consensus/amount.h>
 #include <interfaces/chain.h>
+#include <primitives/transaction_identifier.h>
 #include <pubkey.h>
 #include <script/script.h>
 #include <support/allocators/secure.h>
 #include <util/fs.h>
 #include <util/result.h>
-#include <util/transaction_identifier.h>
 #include <util/ui_change_type.h>
 
 #include <cstdint>
diff --git a/src/merkleblock.h b/src/merkleblock.h
index 8f1d45a3d77..a7b37d3b1c5 100644
--- a/src/merkleblock.h
+++ b/src/merkleblock.h
@@ -8,9 +8,9 @@
 
 #include <common/bloom.h>
 #include <primitives/block.h>
+#include <primitives/transaction_identifier.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <util/transaction_identifier.h>
 
 #include <set>
 #include <vector>
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index fab5c407654..e80ab60fcd8 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -8,11 +8,11 @@
 #include <consensus/amount.h>
 #include <crypto/hex_base.h>
 #include <hash.h>
+#include <primitives/transaction_identifier.h>
 #include <script/script.h>
 #include <serialize.h>
 #include <tinyformat.h>
 #include <uint256.h>
-#include <util/transaction_identifier.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index c5d2759117a..295bce61b93 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -8,10 +8,10 @@
 
 #include <attributes.h>
 #include <consensus/amount.h>
+#include <primitives/transaction_identifier.h> // IWYU pragma: export
 #include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <util/transaction_identifier.h> // IWYU pragma: export
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/util/transaction_identifier.h b/src/primitives/transaction_identifier.h
similarity index 95%
rename from src/util/transaction_identifier.h
rename to src/primitives/transaction_identifier.h
index b59f2e77c3d..b753c1df39e 100644
--- a/src/util/transaction_identifier.h
+++ b/src/primitives/transaction_identifier.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/license/mit.
 
-#ifndef BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H
-#define BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H
+#ifndef BITCOIN_PRIMITIVES_TRANSACTION_IDENTIFIER_H
+#define BITCOIN_PRIMITIVES_TRANSACTION_IDENTIFIER_H
 
 #include <attributes.h>
 #include <uint256.h>
@@ -91,4 +91,4 @@ public:
     }
 };
 
-#endif // BITCOIN_UTIL_TRANSACTION_IDENTIFIER_H
+#endif // BITCOIN_PRIMITIVES_TRANSACTION_IDENTIFIER_H
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index adb8e7fc196..4d5adc4ff62 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -5,9 +5,9 @@
 #ifndef BITCOIN_QT_SENDCOINSDIALOG_H
 #define BITCOIN_QT_SENDCOINSDIALOG_H
 
+#include <primitives/transaction_identifier.h>
 #include <qt/clientmodel.h>
 #include <qt/walletmodel.h>
-#include <util/transaction_identifier.h>
 
 #include <QDialog>
 #include <QMessageBox>
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index fc28fc3ed33..2c5d834b5dc 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -6,8 +6,8 @@
 #define BITCOIN_QT_TRANSACTIONRECORD_H
 
 #include <consensus/amount.h>
+#include <primitives/transaction_identifier.h>
 #include <uint256.h>
-#include <util/transaction_identifier.h>
 
 #include <QList>
 #include <QString>
diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index bff1b198a46..d661d9b6401 100644
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -7,8 +7,8 @@
 
 #include <qt/guiutil.h>
 
+#include <primitives/transaction_identifier.h>
 #include <uint256.h>
-#include <util/transaction_identifier.h>
 
 #include <QWidget>
 #include <QKeyEvent>
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index bcdd6dbd5ee..ece797bfd9e 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -10,8 +10,8 @@
 #include <qt/walletmodeltransaction.h>
 
 #include <interfaces/wallet.h>
+#include <primitives/transaction_identifier.h>
 #include <support/allocators/secure.h>
-#include <util/transaction_identifier.h>
 
 #include <vector>
 
diff --git a/src/test/fuzz/hex.cpp b/src/test/fuzz/hex.cpp
index 64c753045fc..e2d08ac2a55 100644
--- a/src/test/fuzz/hex.cpp
+++ b/src/test/fuzz/hex.cpp
@@ -4,13 +4,13 @@
 
 #include <core_io.h>
 #include <primitives/block.h>
+#include <primitives/transaction_identifier.h>
 #include <pubkey.h>
 #include <rpc/util.h>
 #include <test/fuzz/fuzz.h>
 #include <uint256.h>
 #include <univalue.h>
 #include <util/strencodings.h>
-#include <util/transaction_identifier.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 5f03641e99e..cd178d26018 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -16,6 +16,7 @@
 #include <key.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
+#include <primitives/transaction_identifier.h>
 #include <script/script.h>
 #include <script/script_error.h>
 #include <script/sigcache.h>
@@ -29,7 +30,6 @@
 #include <test/util/transaction_utils.h>
 #include <util/strencodings.h>
 #include <util/string.h>
-#include <util/transaction_identifier.h>
 #include <validation.h>
 
 #include <functional>
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index de75c5c73a5..80e10104e6f 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <primitives/transaction_identifier.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
 #include <util/strencodings.h>
-#include <util/transaction_identifier.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/txmempool.h b/src/txmempool.h
index 5c81876a361..f471726cac1 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -17,12 +17,12 @@
 #include <policy/feerate.h>
 #include <policy/packages.h>
 #include <primitives/transaction.h>
+#include <primitives/transaction_identifier.h>
 #include <sync.h>
 #include <util/epochguard.h>
 #include <util/feefrac.h>
 #include <util/hasher.h>
 #include <util/result.h>
-#include <util/transaction_identifier.h>
 
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/identity.hpp>
diff --git a/src/wallet/receive.h b/src/wallet/receive.h
index b995e21c959..f129c195322 100644
--- a/src/wallet/receive.h
+++ b/src/wallet/receive.h
@@ -6,7 +6,7 @@
 #define BITCOIN_WALLET_RECEIVE_H
 
 #include <consensus/amount.h>
-#include <util/transaction_identifier.h>
+#include <primitives/transaction_identifier.h>
 #include <wallet/transaction.h>
 #include <wallet/types.h>
 #include <wallet/wallet.h>
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
index 69c5e01120b..b58d3dad516 100644
--- a/src/wallet/rpc/transactions.cpp
+++ b/src/wallet/rpc/transactions.cpp
@@ -5,9 +5,9 @@
 #include <core_io.h>
 #include <key_io.h>
 #include <policy/rbf.h>
+#include <primitives/transaction_identifier.h>
 #include <rpc/util.h>
 #include <rpc/blockchain.h>
-#include <util/transaction_identifier.h>
 #include <util/vector.h>
 #include <wallet/receive.h>
 #include <wallet/rpc/util.h>
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 4ae34d0bb4c..8ff896006b0 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -13,6 +13,7 @@
 #include <numeric>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
+#include <primitives/transaction_identifier.h>
 #include <script/script.h>
 #include <script/signingprovider.h>
 #include <script/solver.h>
@@ -21,7 +22,6 @@
 #include <util/rbf.h>
 #include <util/trace.h>
 #include <util/translation.h>
-#include <util/transaction_identifier.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
 #include <wallet/receive.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 95ed7af806a..f39df17458d 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -15,6 +15,7 @@
 #include <outputtype.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
+#include <primitives/transaction_identifier.h>
 #include <script/interpreter.h>
 #include <script/script.h>
 #include <support/allocators/secure.h>
@@ -26,7 +27,6 @@
 #include <util/result.h>
 #include <util/string.h>
 #include <util/time.h>
-#include <util/transaction_identifier.h>
 #include <util/ui_change_type.h>
 #include <wallet/crypter.h>
 #include <wallet/db.h>
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 2c0073f3568..773f65cac65 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -9,6 +9,7 @@
 
 #include <common/system.h>
 #include <key_io.h>
+#include <primitives/transaction_identifier.h>
 #include <protocol.h>
 #include <script/script.h>
 #include <serialize.h>
@@ -16,7 +17,6 @@
 #include <util/bip32.h>
 #include <util/check.h>
 #include <util/fs.h>
-#include <util/transaction_identifier.h>
 #include <util/time.h>
 #include <util/translation.h>
 #include <wallet/migrate.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 5327a2cf691..771d3a37f3b 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -7,8 +7,8 @@
 #define BITCOIN_WALLET_WALLETDB_H
 
 #include <key.h>
+#include <primitives/transaction_identifier.h>
 #include <script/sign.h>
-#include <util/transaction_identifier.h>
 #include <wallet/db.h>
 #include <wallet/walletutil.h>