diff options
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 1 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 11efff664..1de36be8f 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -247,6 +247,7 @@ namespace cryptonote LOG_PRINT_L1("Transaction with id= "<< id << " used already spent key images"); tvc.m_verifivation_failed = true; tvc.m_double_spend = true; + tvc.m_no_drop_offense = true; return false; } } 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; |