aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2024-03-07 20:54:17 +0100
committerselsta <selsta@sent.at>2024-03-08 14:12:17 +0100
commit32b3a56313dd8bb0525533e712bf17f8f4547903 (patch)
tree74b964162e76597103a1978504a6230b5cfe9e16
parentMerge pull request #9158 (diff)
downloadmonero-32b3a56313dd8bb0525533e712bf17f8f4547903.tar.xz
wallet2: adjust fee during backlog, fix set priority
-rw-r--r--src/simplewallet/simplewallet.cpp2
-rw-r--r--src/wallet/wallet2.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 7372d8d15..f2eaf6b13 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -6604,7 +6604,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
local_args.erase(local_args.begin());
}
- uint32_t priority = 0;
+ uint32_t priority = m_wallet->get_default_priority();
if (local_args.size() > 0 && parse_priority(local_args[0], priority))
local_args.erase(local_args.begin());
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index b48af7721..f34b10988 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -8212,7 +8212,7 @@ uint32_t wallet2::adjust_priority(uint32_t priority)
else if (blocks[0].first > 0)
{
MINFO("We don't use the low priority because there's a backlog in the tx pool.");
- return priority;
+ return 2;
}
// get the current full reward zone
@@ -8260,7 +8260,7 @@ uint32_t wallet2::adjust_priority(uint32_t priority)
if (P > 80)
{
MINFO("We don't use the low priority because recent blocks are quite full.");
- return priority;
+ return 2;
}
MINFO("We'll use the low priority because probably it's safe to do so.");
return 1;