diff options
author | selsta <selsta@sent.at> | 2024-03-07 20:54:17 +0100 |
---|---|---|
committer | selsta <selsta@sent.at> | 2024-03-08 14:13:58 +0100 |
commit | e6f48752196132406c3a4432f0a31544d190dcdd (patch) | |
tree | 98f8891dcd63d5b7e15f3c21f45a5776b9ab8fc6 /src | |
parent | Merge pull request #9214 (diff) | |
download | monero-e6f48752196132406c3a4432f0a31544d190dcdd.tar.xz |
wallet2: adjust fee during backlog, fix set priority
Diffstat (limited to 'src')
-rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 | ||||
-rw-r--r-- | src/wallet/wallet2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index bff62f1a8..5a9d790cb 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -6313,7 +6313,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 5a739d50d..a9ad67f04 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -8118,7 +8118,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 @@ -8163,7 +8163,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; |