Merge bitcoin/bitcoin#33116: refactor: Convert uint256 to Txid

de0675f9de refactor: Move `transaction_identifier.h` to primitives (marcofleon)
6f068f65de Remove implicit uint256 conversion and comparison (marcofleon)
9c24cda72e refactor: Convert remaining instances from uint256 to Txid (marcofleon)
d2ecd6815d policy, refactor: Convert uint256 to Txid (marcofleon)
f6c0d1d231 mempool, refactor: Convert uint256 to Txid (marcofleon)
aeb0f78330 refactor: Convert `mini_miner` from uint256 to Txid (marcofleon)
326f244724 refactor: Convert RPCs and `merkleblock` from uint256 to Txid (marcofleon)
49b3d3a92a Clean up `FindTxForGetData` (marcofleon)

Pull request description:

  This is the final leg of the [type safety refactor](https://github.com/bitcoin/bitcoin/pull/32189).

  All of these changes are straightforward `uint256` --> `Txid` along with any necessary explicit conversions. Also, `transaction_identifier.h` is moved to primitives in the last commit, as `Txid` and `Wtxid` become fundamental types after this PR.

ACKs for top commit:
  stickies-v:
    re-ACK de0675f9de, no changes since a20724d926d5844168c6a13fa8293df8c8927efe except address review nits.
  janb84:
    re ACK de0675f9de
  dergoegge:
    re-ACK de0675f9de
  theStack:
    Code-review ACK de0675f9de

Tree-SHA512: 2413160fca7ab146a8d79d18ce3afcf7384cacc73c513d41928904aa453b4dd7a350064cee71e9c5d015da5904c7c81ac17603e50a47441ebc5b0c653235dd08
This commit is contained in:
merge-script committed 2025-08-13 14:50:51 -04:00
commit 9b1a7c3e8d
75 files changed
+323 -305

No files matched your search

+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>