tiamak/Peya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bumped RC version

Browse Source
This commit is contained in:
Some Random Crypto Guy
2025-09-10 09:20:17 +01:00
parent 0e747e3f15
commit 37a58646fd
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@@ -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,

9
src/simplewallet/simplewallet.cpp
View File

@@ -8594,7 +8594,13 @@ bool simple_wallet::burn(const std::vector<std::string> &args_)
}
std::vector<std::string> 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<std::string> &args_)
}
std::vector<std::string> local_args;
carrot::AddressDeriveType derive_type;
if (m_wallet->use_fork_rules(HF_VERSION_CARROT, 0)) {
derive_type = carrot::AddressDeriveType::Carrot;

2
src/version.cpp.in
View File

@@ -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"