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

solved issue of STAKE TXs paying out without view_tags; bumped version

Browse Source
This commit is contained in:
Some Random Crypto Guy
2024-10-14 10:55:57 +01:00
parent ce7a1bdd96
commit 884db2b499
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -1,4 +1,4 @@
# Salvium Zero v0.5.4-rc3 # Salvium Zero v0.5.4-rc4
Copyright (c) 2023-2024, Salvium Copyright (c) 2023-2024, Salvium
Portions Copyright (c) 2014-2023, The Monero Project 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 ```bash
git clone https://github.com/salvium/salvium git clone https://github.com/salvium/salvium
cd salvium cd salvium
git checkout v0.5.4-rc3 git checkout v0.5.4-rc4
``` ```
* Build: * Build:
@@ -370,10 +370,10 @@ application.
cd salvium 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.5.4-rc4'. If you don't care about the version and just want binaries from master, skip this step:
```bash ```bash
git checkout v0.5.4-rc3 git checkout v0.5.4-rc4
``` ```
* If you are on a 64-bit system, run: * If you are on a 64-bit system, run:

4
src/cryptonote_basic/cryptonote_format_utils.cpp
View File

@@ -1232,7 +1232,7 @@ namespace cryptonote
{ {
for (const auto &o: tx.vout) 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 // from v15, require outputs have view tags
CHECK_AND_ASSERT_MES(o.target.type() == typeid(txout_to_tagged_key), false, "wrong variant type: " 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: " 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)); << 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 // 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 // to allow grace period before requiring all to be txout_to_tagged_key

2
src/cryptonote_config.h
View File

@@ -216,6 +216,8 @@
#define HF_VERSION_2021_SCALING 2 #define HF_VERSION_2021_SCALING 2
#define HF_VERSION_ENABLE_N_OUTS 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_CONVERT 255
#define HF_VERSION_ENABLE_ORACLE 255 #define HF_VERSION_ENABLE_ORACLE 255
#define HF_VERSION_SLIPPAGE_YIELD 255 #define HF_VERSION_SLIPPAGE_YIELD 255

8
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

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

2
src/multisig/multisig_tx_builder_ringct.cpp
View File

@@ -1248,8 +1248,6 @@ bool tx_builder_ringct_t::init(
rct_config, reconstruction, unsigned_tx, CLSAG_contexts, cached_w)) rct_config, reconstruction, unsigned_tx, CLSAG_contexts, cached_w))
return false; 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; initialized = true;
return true; return true;
} }

2
src/version.cpp.in
View File

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