From 37a58646fd8a499b6bb61b57d0f9d9fc0094e6c5 Mon Sep 17 00:00:00 2001 From: Some Random Crypto Guy Date: Wed, 10 Sep 2025 09:20:17 +0100 Subject: [PATCH] bumped RC version --- src/cryptonote_core/blockchain.cpp | 2 ++ src/simplewallet/simplewallet.cpp | 9 +++++++-- src/version.cpp.in | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 9cbd8eafa..0e7f205d7 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1414,6 +1414,8 @@ bool Blockchain::prevalidate_protocol_transaction(const block& b, uint64_t heigh CHECK_AND_ASSERT_MES(b.protocol_tx.version == 2, false, "protocol transaction has wrong version"); } CHECK_AND_ASSERT_MES(b.protocol_tx.type == cryptonote::transaction_type::PROTOCOL, false, "protocol transaction has wrong type"); + } else { + hf_version_submitted = hf_version; } // for v2 txes (ringct), we only accept empty rct signatures for protocol transactions, diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index d5921e2da..ce0f1948a 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -8594,7 +8594,13 @@ bool simple_wallet::burn(const std::vector &args_) } std::vector local_args; - local_args.push_back(m_wallet->get_subaddress_as_str({m_current_subaddress_account,0})); + carrot::AddressDeriveType derive_type; + if (m_wallet->use_fork_rules(HF_VERSION_CARROT, 0)) { + derive_type = carrot::AddressDeriveType::Carrot; + } else { + derive_type = carrot::AddressDeriveType::PreCarrot; + } + local_args.push_back(m_wallet->get_subaddress_as_str({{m_current_subaddress_account, 0}, derive_type, false})); local_args.insert(local_args.end(), args_.begin(), args_.end()); // Get the asset type @@ -8747,7 +8753,6 @@ bool simple_wallet::stake(const std::vector &args_) } std::vector local_args; - carrot::AddressDeriveType derive_type; if (m_wallet->use_fork_rules(HF_VERSION_CARROT, 0)) { derive_type = carrot::AddressDeriveType::Carrot; diff --git a/src/version.cpp.in b/src/version.cpp.in index e471011fc..71f562bf3 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" -#define DEF_SALVIUM_VERSION "1.0.0-rc4" +#define DEF_SALVIUM_VERSION "1.0.0-rc5" #define DEF_MONERO_VERSION_TAG "release" #define DEF_MONERO_VERSION "0.18.3.4" #define DEF_MONERO_RELEASE_NAME "One"