From f95fcd6d6273ebd770ca5c1ffff0d830e72be21d Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 19 Apr 2018 04:21:25 +0300 Subject: [PATCH] increase ringsize to 10 --- src/cryptonote_config.h | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/simplewallet/simplewallet.cpp | 6 +++--- src/wallet/api/wallet.cpp | 2 +- src/wallet/wallet2.cpp | 8 ++++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 368f04c70..1d1e7e149 100755 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -136,6 +136,7 @@ #define HF_VERSION_DYNAMIC_FEE 4 #define HF_VERSION_MIN_MIXIN_4 6 #define HF_VERSION_MIN_MIXIN_7 7 +#define HF_VERSION_MIN_MIXIN_9 10 #define HF_VERSION_ENFORCE_RCT 6 #define PER_KB_FEE_QUANTIZATION_DECIMALS 8 diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index a340f4731..66f0f3cc8 100755 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -2613,7 +2613,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc, { size_t n_unmixable = 0, n_mixable = 0; size_t mixin = std::numeric_limits::max(); - const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_7 ? 7 : hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2; + const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_9 ? 9 : hf_version >= HF_VERSION_MIN_MIXIN_7 ? 7 : hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2; for (const auto& txin : tx.vin) { // non txin_to_key inputs will be rejected below diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index ed7942f13..b02809ba5 100755 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -86,9 +86,9 @@ typedef cryptonote::simple_wallet sw; #define EXTENDED_LOGS_FILE "wallet_details.log" -#define DEFAULT_MIX 7 +#define DEFAULT_MIX 9 -#define MIN_RING_SIZE 8 // Used to inform user about min ring size -- does not track actual protocol +#define MIN_RING_SIZE 10 // Used to inform user about min ring size -- does not track actual protocol #define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\003" @@ -2145,7 +2145,7 @@ simple_wallet::simple_wallet() "store-tx-info <1|0>\n " " Whether to store outgoing tx info (destination address, payment ID, tx secret key) for future reference.\n " "default-ring-size \n " - " Set the default ring size (default and minimum is 5).\n " + " Set the default ring size (default and minimum is 10).\n " "auto-refresh <1|0>\n " " Whether to automatically synchronize new blocks from the daemon.\n " "refresh-type \n " diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 6b282151f..e1baf5d97 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -60,7 +60,7 @@ namespace Monero { namespace { // copy-pasted from simplewallet - static const size_t DEFAULT_MIXIN = 6; + static const size_t DEFAULT_MIXIN = 9; static const int DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10; // limit maximum refresh interval as one minute static const int MAX_REFRESH_INTERVAL_MILLIS = 1000 * 60 * 1; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 1eaaa0f10..7a668073b 100755 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -5344,10 +5344,14 @@ int wallet2::get_fee_algorithm() const //------------------------------------------------------------------------------------------------------------------------------ uint64_t wallet2::adjust_mixin(uint64_t mixin) const { - if (mixin < 7 && use_fork_rules(7, 10)) { + if (mixin < 9 && use_fork_rules(8, 10)) { + MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 8, using 10"); + mixin = 9; + } + else if (mixin < 7 && use_fork_rules(7, 10)) { MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 7, using 7"); mixin = 7; - } + } else if (mixin < 4 && use_fork_rules(6, 10)) { MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 6, using 5"); mixin = 4;