From 3029d0efb34b30b3ab8a139a7cb44f8014a55fab Mon Sep 17 00:00:00 2001 From: Nano Akron Date: Tue, 9 May 2017 16:01:11 +0100 Subject: [PATCH 1/2] Remove the 1.25x multiplier in max transaction size in just the wallet --- src/wallet/wallet2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 9069789c..9220b10b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -4781,7 +4781,7 @@ uint64_t wallet2::get_upper_tranaction_size_limit() if (m_upper_transaction_size_limit > 0) return m_upper_transaction_size_limit; uint64_t full_reward_zone = use_fork_rules(5, 10) ? CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5 : use_fork_rules(2, 10) ? CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 : CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V1; - return ((full_reward_zone * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE; + return full_reward_zone - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE; } //---------------------------------------------------------------------------------------------------- std::vector wallet2::select_available_outputs(const std::function &f) From e2529347b6be707aab2a30f4ba09e2218c562aba Mon Sep 17 00:00:00 2001 From: Nano Akron Date: Tue, 9 May 2017 16:02:57 +0100 Subject: [PATCH 2/2] Correct spelling of 'get_upper_transaction_size_limit' --- src/wallet/wallet2.cpp | 2 +- src/wallet/wallet2.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 9220b10b..8c262b09 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3788,7 +3788,7 @@ void wallet2::transfer_selected(const std::vector get_unspent_amounts_vector(); uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm) const; uint64_t get_dynamic_per_kb_fee_estimate(); @@ -1022,7 +1022,7 @@ namespace tools // throw if attempting a transaction with no destinations THROW_WALLET_EXCEPTION_IF(dsts.empty(), error::zero_destination); - uint64_t upper_transaction_size_limit = get_upper_tranaction_size_limit(); + uint64_t upper_transaction_size_limit = get_upper_transaction_size_limit(); uint64_t needed_money = fee; // calculate total amount being sent to all destinations