FCMP++ <> Carrot, BP+ <> Legacy & enforce min tx version

Author: j-berman

src/cryptonote_basic/cryptonote_format_utils.cpp

@@ -1009,6 +1009,17 @@ namespace cryptonote
           << "expected matching variant types in transaction id=" << get_transaction_hash(tx));
       }
     }
+
+    // during v17, require non-coinbase carrot txs use FCMP++ and legacy use BP+
+    if (hf_version == HF_VERSION_CARROT && !cryptonote::is_coinbase(tx) && tx.vout.size())
+    {
+      const auto &o = tx.vout.front();
+      CHECK_AND_ASSERT_MES(
+        (o.target.type() == typeid(txout_to_carrot_v1) && tx.rct_signatures.type == rct::RCTTypeFcmpPlusPlus) ||
+        (o.target.type() == typeid(txout_to_tagged_key) && tx.rct_signatures.type == rct::RCTTypeBulletproofPlus),
+        false, "mismatched output type to tx proof type in transaction id=" << get_transaction_hash(tx));
+    }
+
     return true;
   }
   //---------------------------------------------------------------

src/cryptonote_core/tx_verification_utils.cpp

@@ -227,6 +227,7 @@ static bool ver_non_input_consensus_templated(TxForwardIt tx_begin, TxForwardIt
     std::vector<const rct::rctSig*> rvv;
     rvv.reserve(static_cast<size_t>(std::distance(tx_begin, tx_end)));
 
+    const size_t min_tx_version = hf_version <= HF_VERSION_FCMP_PLUS_PLUS ? 1 : 2;
     const size_t max_tx_version = hf_version < HF_VERSION_DYNAMIC_FEE ? 1 : 2;
 
     const size_t tx_weight_limit = get_transaction_weight_limit(hf_version);
@@ -245,7 +246,7 @@ static bool ver_non_input_consensus_templated(TxForwardIt tx_begin, TxForwardIt
         }
 
         // Rule 2 & 3
-        if (tx.version == 0 || tx.version > max_tx_version)
+        if (tx.version < min_tx_version || tx.version > max_tx_version)
         {
             tvc.m_verifivation_failed = true;
             return false;

src/cryptonote_core/tx_verification_utils.h

@@ -128,7 +128,7 @@ bool batch_ver_fcmp_pp_consensus
  *
  * List of checks that we do for each transaction:
  *     1. Check tx blob size < get_max_tx_size()
- *     2. Check tx version != 0
+ *     2. Check tx version is greater than minimum for given hard fork version
  *     3. Check tx version is less than maximum for given hard fork version
  *     4. Check tx weight < get_transaction_weight_limit()
  *     5. Passes core::check_tx_semantic()