From 4ca10cfcb4033004d9a4584b0113254818758356 Mon Sep 17 00:00:00 2001 From: sowle Date: Sun, 7 Jul 2024 22:32:14 +0200 Subject: [PATCH 1/2] wallet: fixed a mistake in wallet2::finalize_transaction() fee check --- 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 a4d8f950..c73876ce 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -7652,7 +7652,7 @@ void wallet2::finalize_transaction(currency::finalize_tx_param& ftp, currency::f //TIME_MEASURE_FINISH_MS(construct_tx_time); THROW_IF_FALSE_WALLET_EX(r, error::tx_not_constructed, ftp.sources, ftp.prepared_destinations, ftp.unlock_time); uint64_t effective_fee = 0; - THROW_IF_FALSE_WALLET_CMN_ERR_EX(get_tx_fee(result.tx, effective_fee) && effective_fee <= WALLET_TX_MAX_ALLOWED_FEE, "tx fee is WAY too big: " << print_money_brief(effective_fee) << ", max allowed is " << print_money_brief(WALLET_TX_MAX_ALLOWED_FEE)); + THROW_IF_FALSE_WALLET_CMN_ERR_EX(!get_tx_fee(result.tx, effective_fee) || effective_fee <= WALLET_TX_MAX_ALLOWED_FEE, "tx fee is WAY too big: " << print_money_brief(effective_fee) << ", max allowed is " << print_money_brief(WALLET_TX_MAX_ALLOWED_FEE)); //TIME_MEASURE_START_MS(sign_ms_input_time); if (ftp.multisig_id != currency::null_hash) From 86e5af333feb05fd0df53da59d8028105647b134 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Sun, 7 Jul 2024 23:33:39 +0300 Subject: [PATCH 2/2] === build number: 327 -> 328 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index dd768e84..77ef5f94 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 327 +#define PROJECT_VERSION_BUILD_NO 328 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"