mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
Bump min ring size from 5 to 7 from v7
This commit is contained in:
parent
c102c49da5
commit
38657fd0e9
@ -132,6 +132,7 @@
|
||||
|
||||
#define HF_VERSION_DYNAMIC_FEE 4
|
||||
#define HF_VERSION_MIN_MIXIN_4 6
|
||||
#define HF_VERSION_MIN_MIXIN_6 7
|
||||
#define HF_VERSION_ENFORCE_RCT 6
|
||||
|
||||
#define PER_KB_FEE_QUANTIZATION_DECIMALS 8
|
||||
|
@ -2531,7 +2531,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<size_t>::max();
|
||||
const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2;
|
||||
const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_6 ? 6 : hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2;
|
||||
for (const auto& txin : tx.vin)
|
||||
{
|
||||
// non txin_to_key inputs will be rejected below
|
||||
|
@ -86,9 +86,9 @@ typedef cryptonote::simple_wallet sw;
|
||||
|
||||
#define EXTENDED_LOGS_FILE "wallet_details.log"
|
||||
|
||||
#define DEFAULT_MIX 4
|
||||
#define DEFAULT_MIX 6
|
||||
|
||||
#define MIN_RING_SIZE 5 // Used to inform user about min ring size -- does not track actual protocol
|
||||
#define MIN_RING_SIZE 7 // Used to inform user about min ring size -- does not track actual protocol
|
||||
|
||||
#define OUTPUT_EXPORT_FILE_MAGIC "Monero output export\003"
|
||||
|
||||
|
@ -5089,7 +5089,11 @@ int wallet2::get_fee_algorithm() const
|
||||
//------------------------------------------------------------------------------------------------------------------------------
|
||||
uint64_t wallet2::adjust_mixin(uint64_t mixin) const
|
||||
{
|
||||
if (mixin < 4 && use_fork_rules(6, 10)) {
|
||||
if (mixin < 6 && use_fork_rules(7, 10)) {
|
||||
MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 7, using 7");
|
||||
mixin = 6;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user