ci: use 24.04 instead of lunar for tidy and fuzz ci

.cirrus.yml

@@ -82,13 +82,13 @@ task:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
 
 task:
-  name: 'tidy [lunar]'
+  name: 'tidy [24.04]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
     cpu: 2
     memory: 5G
     docker_arguments:
-      CI_IMAGE_NAME_TAG: ubuntu:lunar
+      CI_IMAGE_NAME_TAG: ubuntu:24.04
       FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
   # For faster CI feedback, immediately schedule the linters
   << : *CREDITS_TEMPLATE
@@ -253,11 +253,11 @@ task:
     MAKEJOBS: "-j2"  # Avoid excessive memory use due to MSan
 
 task:
-  name: '[MSan, depends] [lunar]'
+  name: '[MSan, depends] [24.04]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
     docker_arguments:
-      CI_IMAGE_NAME_TAG: ubuntu:lunar
+      CI_IMAGE_NAME_TAG: ubuntu:24.04
       FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
@@ -281,13 +281,13 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
 
 task:
-  name: '[fuzzer,address,undefined,integer, no depends] [lunar]'
+  name: '[fuzzer,address,undefined,integer, no depends] [24.04]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
     cpu: 8  # Increase CPU and memory to avoid timeout
     memory: 16G
     docker_arguments:
-      CI_IMAGE_NAME_TAG: ubuntu:jammy
+      CI_IMAGE_NAME_TAG: ubuntu:24.04
       FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

ci/test/00_setup_env_native_fuzz.sh

@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="ubuntu:23.04" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
+export CI_IMAGE_NAME_TAG="ubuntu:24.04"
 export CONTAINER_NAME=ci_native_fuzz
 export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev python3 libevent-dev bsdmainutils libboost-dev libsqlite3-dev"
 export NO_DEPENDS=1

ci/test/00_setup_env_native_tidy.sh

@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-export CI_IMAGE_NAME_TAG="ubuntu:lunar" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
+export CI_IMAGE_NAME_TAG="ubuntu:24.04"
 export CONTAINER_NAME=ci_native_tidy
 export PACKAGES="clang-16 libclang-16-dev llvm-16-dev libomp-16-dev clang-tidy-16 bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
 export NO_DEPENDS=1

src/.bear-tidy-config

@@ -4,7 +4,8 @@
       "include_only_existing_source": true,
       "paths_to_include": [],
       "paths_to_exclude": [
-        "src/leveldb"
+        "src/leveldb",
+        "src/secp256k1"
       ]
     },
     "format": {

src/assetsdir.cpp

@@ -74,7 +74,7 @@ std::string CAssetsDir::GetLabel(const CAsset& asset) const
 
 std::string CAssetsDir::GetIdentifier(const CAsset& asset) const
 {
-    const std::string label = GetMetadata(asset).GetLabel();
+    std::string label = GetMetadata(asset).GetLabel();
     if (!label.empty()) return label;
     return asset.GetHex();
 }

src/assetsdir.h

@@ -10,7 +10,7 @@ class AssetMetadata
 {
     std::string label;
 public:
-    AssetMetadata() : label("") {};
+    AssetMetadata() : label() {};
     AssetMetadata(std::string _label) : label(_label) {};
 
     const std::string& GetLabel() const

src/confidential_validation.h

@@ -28,10 +28,10 @@ CAmountMap GetFeeMap(const CTransaction& tx);
 class CCheck
  {
  protected:
-     ScriptError error;
+     ScriptError error{SCRIPT_ERR_UNKNOWN_ERROR};
 
  public:
-     CCheck() : error(SCRIPT_ERR_UNKNOWN_ERROR) {}
+     CCheck() {}
      virtual ~CCheck() {}
 
      virtual bool operator()() = 0;

src/primitives/confidential.h

@@ -10,8 +10,6 @@
 #include <uint256.h>
 #include <util/strencodings.h>
 
-extern bool g_con_elementsmode;
-
 /**
  * Confidential assets, values, and nonces all share enough code in common
  * that it makes sense to define a common abstract base class. */

src/primitives/transaction.cpp

@@ -17,8 +17,6 @@
 #include <cassert>
 #include <stdexcept>
 
-bool g_con_elementsmode = false;
-
 const int32_t CTransaction::CURRENT_VERSION = 2;
 
 std::string COutPoint::ToString() const

src/primitives/transaction.h

@@ -33,10 +33,6 @@
  */
 static const int SERIALIZE_TRANSACTION_NO_WITNESS = 0x40000000;
 
-// ELEMENTS:
-// Globals to avoid circular dependencies.
-extern bool g_con_elementsmode;
-
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class COutPoint
 {

src/qt/bitcoinamountfield.h

@@ -29,10 +29,10 @@ class BitcoinAmountField: public QWidget
     Q_PROPERTY(qint64 value READ value WRITE setValue NOTIFY valueChanged USER true)
 
 public:
-    explicit BitcoinAmountField(std::set<CAsset> allowed_assets, QWidget *parent = 0);
+    explicit BitcoinAmountField(std::set<CAsset> allowed_assets, QWidget *parent = nullptr);
     explicit BitcoinAmountField(QWidget *parent = nullptr);
 
-    std::pair<CAsset, CAmount> fullValue(bool *valid=0) const;
+    std::pair<CAsset, CAmount> fullValue(bool *valid = nullptr) const;
     void setFullValue(const CAsset& asset, const CAmount& value);
 
     CAmount value(bool *value=nullptr) const;

src/qt/bitcoinunits.cpp

@@ -32,7 +32,7 @@ QList<BitcoinUnit> BitcoinUnits::availableUnits()
 // ELEMENTS
 std::string peggedAssetWithUnit(BitcoinUnits::Unit unit)
 {
-    const std::string default_asset_name = gArgs.GetArg("-defaultpeggedassetname", "");
+    std::string default_asset_name = gArgs.GetArg("-defaultpeggedassetname", "");
     if (default_asset_name != "") {
         switch(unit)
         {

src/rpc/mining.cpp

@@ -1495,9 +1495,9 @@ static RPCHelpMan finalizecompactblock()
     PartiallyDownloadedBlock partialBlock(&dummy_pool);
 
     // "Extra" list is really our combined list that will be put into place using InitData
-    std::vector<std::pair<uint256, CTransactionRef>> extra_txn;
+    std::vector<std::pair<uint256, CTransactionRef>> extra_txn(found.size());
     for (const auto& found_tx : found) {
-        extra_txn.push_back(std::make_pair(found_tx->GetWitnessHash(), found_tx));
+        extra_txn.emplace_back(found_tx->GetWitnessHash(), found_tx);
     }
     std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
     if (partialBlock.InitData(cmpctblock, extra_txn) != READ_STATUS_OK) {

src/rpc/rawtransaction.cpp

@@ -1759,10 +1759,10 @@ static RPCHelpMan combinepsbt()
     // Find if (and which) psbt has all the output blinding stuff set
     unsigned int base_psbt_index = 0;
     bool has_fully_blinded = false;
+    int unblinded_count = 0;
     for (unsigned int i = 0; i < psbtxs.size(); ++i) {
         const auto& psbt = psbtxs[i];
         bool is_fully_blinded = true;
-        int unblinded_count = 0;
         for (const auto& psbt_out : psbt.outputs) {
             if (psbt_out.IsBlinded()) {
                 is_fully_blinded &= psbt_out.IsFullyBlinded();
@@ -1797,6 +1797,7 @@ static RPCHelpMan combinepsbt()
             }
         }
         if (is_fully_blinded) {
+            LogPrintf("Cannot combine PSETs. Num unblinded outputs: %d\n", unblinded_count);
             throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Cannot combine PSETs as the values and blinders would become imbalanced");
         }
     }

src/script/interpreter.cpp

@@ -3096,7 +3096,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
 
     assert(txdata->m_simplicity_tx_data);
     assert(simplicityTapEnv);
-    if (!simplicity_elements_execSimplicity(&error, 0, txdata->m_simplicity_tx_data.get(), nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, 0, program.data(), program.size(), witness.data(), witness.size())) {
+    if (!simplicity_elements_execSimplicity(&error, nullptr, txdata->m_simplicity_tx_data.get(), nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, nullptr, program.data(), program.size(), witness.data(), witness.size())) {
         assert(!"simplicity_elements_execSimplicity internal error");
     }
     simplicity_elements_freeTapEnv(simplicityTapEnv);

src/script/script.cpp

@@ -9,6 +9,9 @@
 
 #include <string>
 
+// ELEMENTS
+bool g_con_elementsmode = false;
+
 std::string GetOpName(opcodetype opcode)
 {
     switch (opcode)

src/script/script.h

@@ -21,6 +21,7 @@
 #include <uint256.h>
 #include <vector>
 
+// ELEMENTS: global elements mode declaration, initialized in script.cpp
 // IsUnspendable() compatibility
 extern bool g_con_elementsmode;
 

src/wallet/coinselection.cpp

@@ -830,7 +830,7 @@ CAmountMap SelectionResult::GetChange(const CAmount min_viable_change, const CAm
     //  - input fees are covered by GetSelectedEffectiveValue()
     //  - non_input_fee is included in m_target
     //  - change_fee
-    const CAmountMap change = m_use_effective
+    CAmountMap change = m_use_effective
                            ? GetSelectedEffectiveValue() - m_target - CAmountMap{{::policyAsset, change_fee}}
                            : GetSelectedValue() - m_target;
 

src/wallet/rpc/elements.cpp

@@ -375,12 +375,12 @@ RPCHelpMan initpegoutwallet()
     }
 
     // Strip off leading key origin
-    if (xpub_str.find("]") != std::string::npos) {
-        xpub_str = xpub_str.substr(xpub_str.find("]")+1, std::string::npos);
+    if (xpub_str.find(']') != std::string::npos) {
+        xpub_str = xpub_str.substr(xpub_str.find(']') + 1, std::string::npos);
     }
 
     // Strip off following range
-    xpub_str = xpub_str.substr(0, xpub_str.find("/"));
+    xpub_str = xpub_str.substr(0, xpub_str.find('/'));
 
     xpub = DecodeExtPubKey(xpub_str);