Merge pull request #186

3300ae5 remove unused display variable (warptangent)
0e0e557 return true on success (warptangent)
2e11eb1 deterministic wallet use of twelve words fixed (warptangent)
21a3c46 ensure that keccak is called on view spend key, not a possibly pre-sc_reduce32 version of it - for deriving view secret key (warptangent)

src/cryptonote_core/account.cpp

@@ -65,7 +65,7 @@ DISABLE_VS_WARNINGS(4244 4345)
 
     // rng for generating second set of keys is hash of first rng.  means only one set of electrum-style words needed for recovery
     crypto::secret_key second;
-    keccak((uint8_t *)&first, sizeof(crypto::secret_key), (uint8_t *)&second, sizeof(crypto::secret_key));
+    keccak((uint8_t *)&m_keys.m_spend_secret_key, sizeof(crypto::secret_key), (uint8_t *)&second, sizeof(crypto::secret_key));
 
     generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key, second, two_random ? false : true);
 

src/mnemonics/electrum-words.cpp

@@ -255,7 +255,7 @@ namespace crypto
       std::string wlist_copy = words;
       if (seed.size() == seed_length/2)
       {
-        memcpy(dst.data, dst.data + 16, 16);  // if electrum 12-word seed, duplicate
+        memcpy(dst.data+16, dst.data, 16);  // if electrum 12-word seed, duplicate
         wlist_copy += ' ';
         wlist_copy += words;
       }
@@ -328,7 +328,7 @@ namespace crypto
 
       words.pop_back();
       words += (' ' + words_store[create_checksum_index(words_store, language->get_unique_prefix_length())]);
-      return false;
+      return true;
     }
 
     /*!

src/simplewallet/simplewallet.cpp

@@ -551,9 +551,6 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
 
   crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words, mnemonic_language);
 
-  std::string print_electrum = "";
-
-
   success_msg_writer() <<
     "**********************************************************************\n" <<
     "Your wallet has been generated.\n" <<