fixed a couple of unit_test issues; bumped RC version

src/blockchain_db/blockchain_db.cpp

@@ -296,7 +296,7 @@ uint64_t BlockchainDB::add_block( const std::pair<block, blobdata>& blck
   blobdata protocol_bd = tx_to_blob(blk.protocol_tx);
   add_transaction(blk_hash, std::make_pair(blk.protocol_tx, blobdata_ref(protocol_bd)));
 
-  if (blk.miner_tx.version == 2)
+  if (blk.miner_tx.version >= 2)
   {
     num_rct_outs += blk.miner_tx.vout.size();
 
@@ -311,7 +311,7 @@ uint64_t BlockchainDB::add_block( const std::pair<block, blobdata>& blck
 
   std::map<std::string, int64_t> slippage_counts;
   uint64_t audit_total = 0, yield_total = 0;
-  if (blk.protocol_tx.version == 2)
+  if (blk.protocol_tx.version >= 2)
   {
     num_rct_outs += blk.protocol_tx.vout.size();
 

src/cryptonote_core/blockchain.cpp

@@ -3622,7 +3622,14 @@ bool Blockchain::check_tx_type_and_version(const transaction& tx, tx_verificatio
       return false;
     }
   }
-  
+
+  // Check for invalid TX types
+  if (tx.type == cryptonote::transaction_type::UNSET || tx.type > cryptonote::transaction_type::MAX) {
+    MERROR("TX type `" + std::to_string(tx.type) + "' is not supported");
+    tvc.m_version_mismatch = true;
+    return false;
+  }
+
   return true;
 }
 //------------------------------------------------------------------

src/rpc/rpc_version_str.cpp

@@ -45,7 +45,7 @@ namespace rpc
 bool is_version_string_valid(const std::string& str)
 {
     return std::regex_match(str, std::regex(
-        "^\\d{1,2}(\\.\\d{1,2}){2}(-(release|[0-9a-f]{9}))?.+$",
+        "^\\d{1,2}(\\.\\d{1,2}){3}(-(release|[0-9a-f]{9}))?$",
         std::regex_constants::nosubs
     ));
 }

src/version.cpp.in

@@ -1,5 +1,5 @@
 #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
-#define DEF_SALVIUM_VERSION "0.9.6-rc1"
+#define DEF_SALVIUM_VERSION "0.9.6-rc2"
 #define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.3.4"
 #define DEF_MONERO_RELEASE_NAME "Zero"