From 464447256be52a2e58253cdf7253d4c82d8304e4 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 26 Jul 2022 13:14:33 +0200
Subject: [PATCH] Merge bitcoin/bitcoin#25694: refactor: Make CTransaction
 constructor explicit

fa2247a9f9754d90ea60f254f6c0ed881c55772b refactor: Make CTransaction constructor explicit (MacroFake)

Pull request description:

  It involves calculating two hashes, so the performance impact should be
  made explicit.

  Also, add the module to iwyu.

ACKs for top commit:
  aureleoules:
    ACK fa2247a9f9754d90ea60f254f6c0ed881c55772b.
  hebasto:
    ACK fa2247a9f9754d90ea60f254f6c0ed881c55772b, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: e236c352a472c7edfd4f0319a5a16a59f627b0ab7eb8531b53c75d730a3fa3e990a939978dcd952cd73e647925fc79bfa6d9fd87624bbc3ef180f40f95acef19
---
 src/primitives/transaction.cpp    |  7 ++++++-
 src/primitives/transaction.h      | 14 ++++++++++++--
 src/test/evo_assetlocks_tests.cpp |  4 ++--
 src/test/script_tests.cpp         | 20 ++++++++++----------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 60d4a3152dcf..a56f8c3677f4 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -7,10 +7,15 @@
 
 #include <consensus/amount.h>
 #include <hash.h>
+#include <script/script.h>
+#include <serialize.h>
 #include <tinyformat.h>
+#include <uint256.h>
 #include <util/strencodings.h>
+#include <version.h>
 
-#include <assert.h>
+#include <cassert>
+#include <stdexcept>
 
 std::string COutPoint::ToString() const
 {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index bd944a417cd2..130141210bdd 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -7,10 +7,20 @@
 #define BITCOIN_PRIMITIVES_TRANSACTION_H
 
 #include <consensus/amount.h>
+#include <prevector.h>
 #include <script/script.h>
 #include <serialize.h>
 #include <uint256.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <ios>
+#include <limits>
+#include <memory>
+#include <string>
 #include <tuple>
+#include <utility>
+#include <vector>
 
 /** Transaction types */
 enum {
@@ -228,7 +238,7 @@ class CTransaction
 public:
     /** Convert a CMutableTransaction into a CTransaction. */
     explicit CTransaction(const CMutableTransaction& tx);
-    CTransaction(CMutableTransaction&& tx);
+    explicit CTransaction(CMutableTransaction&& tx);
 
     template <typename Stream>
     inline void Serialize(Stream& s) const {
@@ -305,7 +315,7 @@ struct CMutableTransaction
     uint32_t nLockTime;
     std::vector<uint8_t> vExtraPayload; // only available for special transaction types
 
-    CMutableTransaction();
+    explicit CMutableTransaction();
     explicit CMutableTransaction(const CTransaction& tx);
 
     SERIALIZE_METHODS(CMutableTransaction, obj)
diff --git a/src/test/evo_assetlocks_tests.cpp b/src/test/evo_assetlocks_tests.cpp
index a37305d73a28..02d2353d34a9 100644
--- a/src/test/evo_assetlocks_tests.cpp
+++ b/src/test/evo_assetlocks_tests.cpp
@@ -135,7 +135,7 @@ BOOST_FIXTURE_TEST_CASE(evo_assetlock, TestChain100Setup)
     CKey key;
     key.MakeNewKey(true);
 
-    const CTransaction tx = CreateAssetLockTx(keystore, coins, key);
+    const CTransaction tx{CreateAssetLockTx(keystore, coins, key)};
     std::string reason;
     BOOST_CHECK(IsStandardTx(CTransaction(tx), reason));
 
@@ -304,7 +304,7 @@ BOOST_FIXTURE_TEST_CASE(evo_assetunlock, TestChain100Setup)
     CKey key;
     key.MakeNewKey(true);
 
-    const CTransaction tx = CreateAssetUnlockTx(keystore, key);
+    const CTransaction tx{CreateAssetUnlockTx(keystore, key)};
     std::string reason;
     BOOST_CHECK(IsStandardTx(CTransaction(tx), reason));
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 5d79aac696f7..441c4b59d883 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -1410,8 +1410,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_returns_true)
     CScript scriptSig;
 
     scriptPubKey << OP_1;
-    CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
-    CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
+    CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
+    CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << spendTx;
@@ -1432,8 +1432,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_index_err)
     CScript scriptSig;
 
     scriptPubKey << OP_EQUAL;
-    CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
-    CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
+    CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
+    CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << spendTx;
@@ -1454,8 +1454,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_size)
     CScript scriptSig;
 
     scriptPubKey << OP_EQUAL;
-    CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
-    CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
+    CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
+    CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << spendTx;
@@ -1476,8 +1476,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_serialization)
     CScript scriptSig;
 
     scriptPubKey << OP_EQUAL;
-    CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
-    CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
+    CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
+    CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << 0xffffffff;
@@ -1498,8 +1498,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_invalid_flags)
     CScript scriptSig;
 
     scriptPubKey << OP_EQUAL;
-    CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
-    CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
+    CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
+    CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};
 
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
     stream << spendTx;