Merge pull request #8178

5d388eb Bump ring size to 16 for v15 & remove set default in wallet cli (j-berman)
This commit is contained in:
luigi1111 2022-04-25 10:18:26 -05:00
commit e13244ea9c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
9 changed files with 38 additions and 87 deletions

View file

@ -7406,6 +7406,8 @@ int wallet2::get_fee_algorithm()
//------------------------------------------------------------------------------------------------------------------------------
uint64_t wallet2::get_min_ring_size()
{
if (use_fork_rules(HF_VERSION_MIN_MIXIN_15, 0))
return 16;
if (use_fork_rules(8, 10))
return 11;
if (use_fork_rules(7, 10))
@ -7419,6 +7421,8 @@ uint64_t wallet2::get_min_ring_size()
//------------------------------------------------------------------------------------------------------------------------------
uint64_t wallet2::get_max_ring_size()
{
if (use_fork_rules(HF_VERSION_MIN_MIXIN_15, 0))
return 16;
if (use_fork_rules(8, 10))
return 11;
return 0;