bumped version, ready for testnet

README.md

@@ -1,4 +1,4 @@
-# Salvium Zero v0.5.4-rc3
+# Salvium Zero v0.6.0-rc1
 
 Copyright (c) 2023-2024, Salvium
 Portions Copyright (c) 2014-2023, The Monero Project
@@ -251,7 +251,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
     ```bash
     git clone https://github.com/salvium/salvium
     cd salvium
-    git checkout v0.5.4-rc3
+    git checkout v0.6.0-rc1
     ```
 
 * Build:
@@ -370,10 +370,10 @@ application.
     cd salvium
     ```
 
-* If you would like a specific [version/tag](https://github.com/salvium/salvium/tags), do a git checkout for that version. eg. 'v0.5.4-rc3'. If you don't care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/salvium/salvium/tags), do a git checkout for that version. eg. 'v0.6.0-rc1'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v0.5.4-rc3
+    git checkout v0.6.0-rc1
     ```
 
 * If you are on a 64-bit system, run:

src/cryptonote_basic/cryptonote_format_utils.cpp

@@ -1232,7 +1232,7 @@ namespace cryptonote
   {
     for (const auto &o: tx.vout)
     {
-      if (hf_version > HF_VERSION_VIEW_TAGS)
+      if (hf_version > HF_VERSION_REQUIRE_VIEW_TAGS)
       {
         // from v15, require outputs have view tags
         CHECK_AND_ASSERT_MES(o.target.type() == typeid(txout_to_tagged_key), false, "wrong variant type: "
@@ -1244,7 +1244,7 @@ namespace cryptonote
         CHECK_AND_ASSERT_MES(o.target.type() == typeid(txout_to_key), false, "wrong variant type: "
           << o.target.type().name() << ", expected txout_to_key in transaction id=" << get_transaction_hash(tx));
       }
-      else  //(hf_version == HF_VERSION_VIEW_TAGS)
+      else  //(hf_version == HF_VERSION_VIEW_TAGS || hf_version == HF_VERSION_VIEW_TAGS+1)
       {
         // require outputs be of type txout_to_key OR txout_to_tagged_key
         // to allow grace period before requiring all to be txout_to_tagged_key

src/cryptonote_config.h

@@ -216,6 +216,8 @@
 #define HF_VERSION_2021_SCALING                 2
 #define HF_VERSION_ENABLE_N_OUTS                2
 
+#define HF_VERSION_REQUIRE_VIEW_TAGS            3
+
 #define HF_VERSION_ENABLE_CONVERT               255
 #define HF_VERSION_ENABLE_ORACLE                255
 #define HF_VERSION_SLIPPAGE_YIELD               255

src/cryptonote_core/cryptonote_tx_utils.cpp

@@ -577,10 +577,10 @@ namespace cryptonote
     uint64_t amount = block_reward;
     summary_amounts += amount;
 
-      bool use_view_tags = hard_fork_version >= HF_VERSION_VIEW_TAGS;
-      crypto::view_tag view_tag;
-      if (use_view_tags)
-        crypto::derive_view_tag(derivation, 0, view_tag);
+    bool use_view_tags = hard_fork_version >= HF_VERSION_VIEW_TAGS;
+    crypto::view_tag view_tag;
+    if (use_view_tags)
+      crypto::derive_view_tag(derivation, 0, view_tag);
 
     // Should we award some of the block reward to the stakers?
     if (height != 0) {

src/multisig/multisig_tx_builder_ringct.cpp

@@ -1248,8 +1248,6 @@ bool tx_builder_ringct_t::init(
       rct_config, reconstruction, unsigned_tx, CLSAG_contexts, cached_w))
     return false;
 
-  MCINFO("tx_builder_ringct_t::init()", "transaction_created: " << get_transaction_hash(unsigned_tx) << ENDL << obj_to_json_str(unsigned_tx) << ENDL);
-  
   initialized = true;
   return true;
 }

src/rpc/core_rpc_server.cpp

@@ -2998,6 +2998,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_yield_info(const COMMAND_RPC_GET_YIELD_INFO::request& req, COMMAND_RPC_GET_YIELD_INFO::response& res, epee::json_rpc::error& error_resp, const connection_context *ctx)
   {
+    CHECK_CORE_READY();
     PERF_TIMER(on_get_yield_info);
     uint64_t height = m_core.get_current_blockchain_height();
     std::map<uint64_t, yield_block_info> ybi_cache;

src/simplewallet/simplewallet.cpp

@@ -8313,13 +8313,11 @@ bool simple_wallet::stake(const std::vector<std::string> &args_)
     return true;
   }
 
-  /*
   if(m_wallet->multisig())
   {
      fail_msg_writer() << tr("This is a multisig wallet, staking is not currently supported");
      return true;
   }
-  */
   
   std::vector<std::string> local_args;
   local_args.push_back(m_wallet->get_subaddress_as_str({m_current_subaddress_account,0}));

src/version.cpp.in

@@ -1,5 +1,5 @@
 #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
-#define DEF_SALVIUM_VERSION "0.5.4-rc3"
+#define DEF_SALVIUM_VERSION "0.6.0-rc1"
 #define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.3.3"
 #define DEF_MONERO_RELEASE_NAME "Zero"