diff options
author | luigi1111 <luigi1111w@gmail.com> | 2024-03-08 20:26:58 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2024-03-08 20:26:58 -0500 |
commit | 769202bc529d8fc3f157f3d32897ab1ae80f0c2b (patch) | |
tree | fb9454f9a9097dd856c197a48624483aae44a072 | |
parent | Merge pull request #9222 (diff) | |
parent | wallet2: adjust fee during backlog, fix set priority (diff) | |
download | monero-769202bc529d8fc3f157f3d32897ab1ae80f0c2b.tar.xz |
Merge pull request #9219
e6f4875 wallet2: adjust fee during backlog, fix set priority (selsta)
-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; |