1 files changed, 75 insertions, 48 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 15a134257..e0d23c17b 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -191,7 +191,7 @@ boost::optional<tools::password_container> get_password(const boost::program_opt
     }
 
     // Remove line breaks the user might have inserted
-    password.erase(std::remove(password.begin() - 1, password.end(), '\n'), password.end());
+    password.erase(std::remove(password.end() - 1, password.end(), '\n'), password.end());
     password.erase(std::remove(password.end() - 1, password.end(), '\r'), password.end());
     return {tools::password_container(std::move(password))};
   }
@@ -1574,12 +1574,35 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
   std::list<cryptonote::block_complete_entry> blocks;
   std::vector<COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices> o_indices;
 
+  std::string daemon_height_err = "";
+  uint64_t daemon_bc_height = get_daemon_blockchain_height(daemon_height_err);
+  if(daemon_height_err.size() > 0) {
+    throw std::runtime_error(daemon_height_err);
+  }
+
   // pull the first set of blocks
   get_short_chain_history(short_chain_history);
   m_run.store(true, std::memory_order_relaxed);
   if (start_height > m_blockchain.size() || m_refresh_from_block_height > m_blockchain.size()) {
-    if (!start_height)
-      start_height = m_refresh_from_block_height;
+    
+    // even target_height can be zero if the daemon just started and hasn't gotten some sync
+    // data back from peers .. hmmm, what to do ... O.o (you can see him thinking)
+    // i'm going with infiniti loop until i get something bigger than zero or err ... moneromoo don't kill me
+    std::string daemon_target_err = "";
+    uint64_t daemon_target_height = 0;
+    
+    while(daemon_target_height == 0)
+    {
+        daemon_target_height = get_daemon_blockchain_target_height(daemon_target_err);
+        if(daemon_target_err.size() > 0) {
+          daemon_target_height = get_approximate_blockchain_height(); // - x?
+        }
+    }
+    
+    if (m_refresh_from_block_height > daemon_target_height) m_refresh_from_block_height = daemon_target_height - 1;
+    if (!start_height) start_height = m_refresh_from_block_height;
+    if (start_height >= daemon_bc_height) start_height = daemon_bc_height - 1;
+
     // we can shortcut by only pulling hashes up to the start_height
     fast_refresh(start_height, blocks_start_height, short_chain_history);
     // regenerate the history now that we've got a full set of hashes
@@ -1589,53 +1612,56 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
     // and then fall through to regular refresh processing
   }
 
-  pull_blocks(start_height, blocks_start_height, short_chain_history, blocks, o_indices);
-  // always reset start_height to 0 to force short_chain_ history to be used on
-  // subsequent pulls in this refresh.
-  start_height = 0;
-
-  while(m_run.load(std::memory_order_relaxed))
+  if(!(m_refresh_from_block_height >= daemon_bc_height))
   {
-    try
-    {
-      // pull the next set of blocks while we're processing the current one
-      uint64_t next_blocks_start_height;
-      std::list<cryptonote::block_complete_entry> next_blocks;
-      std::vector<cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices> next_o_indices;
-      bool error = false;
-      pull_thread = boost::thread([&]{pull_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, next_o_indices, error);});
-
-      process_blocks(blocks_start_height, blocks, o_indices, added_blocks);
-      blocks_fetched += added_blocks;
-      pull_thread.join();
-      if(!added_blocks)
-        break;
-
-      // switch to the new blocks from the daemon
-      blocks_start_height = next_blocks_start_height;
-      blocks = next_blocks;
-      o_indices = next_o_indices;
+    pull_blocks(start_height, blocks_start_height, short_chain_history, blocks, o_indices);
+    // always reset start_height to 0 to force short_chain_ history to be used on
+    // subsequent pulls in this refresh.
+    start_height = 0;
 
-      // handle error from async fetching thread
-      if (error)
-      {
-        throw std::runtime_error("proxy exception in refresh thread");
-      }
-    }
-    catch (const std::exception&)
+    while(m_run.load(std::memory_order_relaxed))
     {
-      blocks_fetched += added_blocks;
-      if (pull_thread.joinable())
-        pull_thread.join();
-      if(try_count < 3)
+      try
       {
-        LOG_PRINT_L1("Another try pull_blocks (try_count=" << try_count << ")...");
-        ++try_count;
+        // pull the next set of blocks while we're processing the current one
+        uint64_t next_blocks_start_height;
+        std::list<cryptonote::block_complete_entry> next_blocks;
+        std::vector<cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices> next_o_indices;
+        bool error = false;
+        pull_thread = boost::thread([&]{pull_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, next_o_indices, error);});
+
+        process_blocks(blocks_start_height, blocks, o_indices, added_blocks);
+        blocks_fetched += added_blocks;
+        pull_thread.join();
+        if(!added_blocks)
+          break;
+
+        // switch to the new blocks from the daemon
+        blocks_start_height = next_blocks_start_height;
+        blocks = next_blocks;
+        o_indices = next_o_indices;
+
+        // handle error from async fetching thread
+        if (error)
+        {
+          throw std::runtime_error("proxy exception in refresh thread");
+        }
       }
-      else
+      catch (const std::exception&)
       {
-        LOG_ERROR("pull_blocks failed, try_count=" << try_count);
-        throw;
+        blocks_fetched += added_blocks;
+        if (pull_thread.joinable())
+          pull_thread.join();
+        if(try_count < 3)
+        {
+          LOG_PRINT_L1("Another try pull_blocks (try_count=" << try_count << ")...");
+          ++try_count;
+        }
+        else
+        {
+          LOG_ERROR("pull_blocks failed, try_count=" << try_count);
+          throw;
+        }
       }
     }
   }
@@ -4889,14 +4915,15 @@ std::string wallet2::encrypt_with_view_secret_key(const std::string &plaintext,
 //----------------------------------------------------------------------------------------------------
 std::string wallet2::decrypt(const std::string &ciphertext, const crypto::secret_key &skey, bool authenticated) const
 {
-  THROW_WALLET_EXCEPTION_IF(ciphertext.size() < sizeof(chacha8_iv),
-    error::wallet_internal_error, "key_image generated ephemeral public key not matched with output_key");
+  const size_t prefix_size = sizeof(chacha8_iv) + (authenticated ? sizeof(crypto::signature) : 0);
+  THROW_WALLET_EXCEPTION_IF(ciphertext.size() < prefix_size,
+    error::wallet_internal_error, "Unexpected ciphertext size");
 
   crypto::chacha8_key key;
   crypto::generate_chacha8_key(&skey, sizeof(skey), key);
   const crypto::chacha8_iv &iv = *(const crypto::chacha8_iv*)&ciphertext[0];
   std::string plaintext;
-  plaintext.resize(ciphertext.size() - sizeof(iv) - (authenticated ? sizeof(crypto::signature) : 0));
+  plaintext.resize(ciphertext.size() - prefix_size);
   if (authenticated)
   {
     crypto::hash hash;
@@ -4907,7 +4934,7 @@ std::string wallet2::decrypt(const std::string &ciphertext, const crypto::secret
     THROW_WALLET_EXCEPTION_IF(!crypto::check_signature(hash, pkey, signature),
       error::wallet_internal_error, "Failed to authenticate criphertext");
   }
-  crypto::chacha8(ciphertext.data() + sizeof(iv), ciphertext.size() - sizeof(iv), key, iv, &plaintext[0]);
+  crypto::chacha8(ciphertext.data() + sizeof(iv), ciphertext.size() - prefix_size, key, iv, &plaintext[0]);
   return std::move(plaintext);
 }
 //----------------------------------------------------------------------------------------------------