1 files changed, 23 insertions, 20 deletions

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 2e1e44662..9b2595716 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -387,7 +387,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
 
         if (field_spendkey.empty())
         {
-          // if we have an addres but no spend key, we can deduce the spend public key
+          // if we have an address but no spend key, we can deduce the spend public key
           // from the address
           if (field_address_found)
           {
@@ -2856,16 +2856,9 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip
   m_multisig_signers.clear();
   m_key_on_device = false;
 
-  // -1 month for fluctuations in block time and machine date/time setup.
-  // avg seconds per block
-  const int seconds_per_block = DIFFICULTY_TARGET_V2;
-  // ~num blocks per month
-  const uint64_t blocks_per_month = 60*60*24*30/seconds_per_block;
-
-  // try asking the daemon first
+  // calculate a starting refresh height
   if(m_refresh_from_block_height == 0 && !recover){
-    uint64_t height = estimate_blockchain_height();
-    m_refresh_from_block_height = height >= blocks_per_month ? height - blocks_per_month : 0;
+    m_refresh_from_block_height = estimate_blockchain_height();
   }
 
   if (!wallet_.empty())
@@ -2900,20 +2893,30 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const epee::wip
    std::string err;
    uint64_t height = 0;
 
-   // we get the max of approximated height and known height
+   // we get the max of approximated height and local height.
    // approximated height is the least of daemon target height
    // (the max of what the other daemons are claiming is their
    // height) and the theoretical height based on the local
    // clock. This will be wrong only if both the local clock
    // is bad *and* a peer daemon claims a highest height than
    // the real chain.
-   // known height is the height the local daemon is currently
+   // local height is the height the local daemon is currently
    // synced to, it will be lower than the real chain height if
    // the daemon is currently syncing.
+   // If we use the approximate height we subtract one month as
+   // a safety margin.
    height = get_approximate_blockchain_height();
    uint64_t target_height = get_daemon_blockchain_target_height(err);
-   if (err.empty() && target_height < height)
-     height = target_height;
+   if (err.empty()) {
+     if (target_height < height)
+       height = target_height;
+   } else {
+     // if we couldn't talk to the daemon, check safety margin.
+     if (height > blocks_per_month)
+       height -= blocks_per_month;
+     else
+       height = 0;
+   }
    uint64_t local_height = get_daemon_blockchain_height(err);
    if (err.empty() && local_height > height)
      height = local_height;
@@ -5316,7 +5319,7 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
   bool r = epee::net_utils::invoke_http_json("/get_random_outs", oreq, ores, m_http_client, rpc_timeout, "POST");
   m_daemon_rpc_mutex.unlock();
   THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_random_outs");
-  THROW_WALLET_EXCEPTION_IF(ores.amount_outs.empty() , error::wallet_internal_error, "No outputs recieved from light wallet node. Error: " + ores.Error);
+  THROW_WALLET_EXCEPTION_IF(ores.amount_outs.empty() , error::wallet_internal_error, "No outputs received from light wallet node. Error: " + ores.Error);
   
   // Check if we got enough outputs for each amount
   for(auto& out: ores.amount_outs) {
@@ -5540,7 +5543,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
         }
       }
 
-      // sort the subsection, to ensure the daemon doesn't know wich output is ours
+      // sort the subsection, to ensure the daemon doesn't know which output is ours
       std::sort(req.outputs.begin() + start, req.outputs.end(),
           [](const get_outputs_out &a, const get_outputs_out &b) { return a.index < b.index; });
     }
@@ -6167,7 +6170,7 @@ bool wallet2::light_wallet_login(bool &new_address)
   cryptonote::COMMAND_RPC_LOGIN::response response;
   request.address = get_account().get_public_address_str(m_nettype);
   request.view_key = string_tools::pod_to_hex(get_account().get_keys().m_view_secret_key);
-  // Always create account if it doesnt exist.
+  // Always create account if it doesn't exist.
   request.create_account = true;
   m_daemon_rpc_mutex.lock();
   bool connected = epee::net_utils::invoke_http_json("/login", request, response, m_http_client, rpc_timeout, "POST");
@@ -6180,7 +6183,7 @@ bool wallet2::light_wallet_login(bool &new_address)
   MDEBUG("New wallet: " << response.new_address);
   if(m_light_wallet_connected)
   {
-    // Clear old data on successfull login.
+    // Clear old data on successful login.
     // m_transfers.clear();
     // m_payments.clear();
     // m_unconfirmed_payments.clear();
@@ -6552,7 +6555,7 @@ void wallet2::light_wallet_get_address_txs()
 
   // Calculate wallet balance
   m_light_wallet_balance = ires.total_received-wallet_total_sent;
-  // MyMonero doesnt send unlocked balance
+  // MyMonero doesn't send unlocked balance
   if(ires.total_received_unlocked > 0)
     m_light_wallet_unlocked_balance = ires.total_received_unlocked-wallet_total_sent;
   else
@@ -6829,7 +6832,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
     {
       string s;
       for (auto i: preferred_inputs) s += boost::lexical_cast<std::string>(i) + " (" + print_money(m_transfers[i].amount()) + ") ";
-      LOG_PRINT_L1("Found prefered rct inputs for rct tx: " << s);
+      LOG_PRINT_L1("Found preferred rct inputs for rct tx: " << s);
 
       // bring the list of available outputs stored by the same subaddress index to the front of the list
       uint32_t index_minor = m_transfers[preferred_inputs[0]].m_subaddr_index.minor;