Merge pull request #9220

32b3a56 wallet2: adjust fee during backlog, fix set priority (selsta)

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());
 

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;