Misc bugfixes

src/cryptonote_core/tx_pool.cpp

@@ -78,7 +78,10 @@ namespace cryptonote
 
     uint64_t template_accept_threshold(uint64_t amount)
     {
-      return amount * ACCEPT_THRESHOLD;
+      // XXX: multiplying by ACCEPT_THRESHOLD here was removed because of a need
+      // to accept 0 fee transactions correctly. the cast to float / double and
+      // back again was causing issues estimating the effect of a zero fee tx
+      return amount;
     }
 
     uint64_t get_transaction_size_limit(uint8_t version)

src/simplewallet/simplewallet.cpp

@@ -5058,7 +5058,7 @@ bool simple_wallet::register_service_node(const std::vector<std::string> &args_)
         break;
       if (!m_idle_run.load(std::memory_order_relaxed))
         break;
-      m_idle_cond.wait_for(lock, boost::chrono::seconds(120));
+      m_idle_cond.wait_for(lock, boost::chrono::seconds(AUTOSTAKE_INTERVAL));
     }
   }
   else
@@ -5471,7 +5471,7 @@ bool simple_wallet::stake(const std::vector<std::string> &args_)
         break;
       if (!m_idle_run.load(std::memory_order_relaxed))
         break;
-      m_idle_cond.wait_for(lock, boost::chrono::seconds(120));
+      m_idle_cond.wait_for(lock, boost::chrono::seconds(AUTOSTAKE_INTERVAL));
     }
   }
   else

src/simplewallet/simplewallet.h

@@ -54,6 +54,8 @@
 // Hardcode Monero's donation address (see #1447)
 constexpr const char MONERO_DONATION_ADDR[] = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
 
+const int AUTOSTAKE_INTERVAL = 60 * 40; // once every 40 minutes.
+
 /*!
  * \namespace cryptonote
  * \brief Holds cryptonote related classes and helpers.