From 3cc45e9324a402aee91e2f46861b2ca393d711aa Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Wed, 7 May 2014 11:15:45 -0700
Subject: [PATCH 01/76] Update slow-hash.c

Fixed scratchpad initialization/finalization for faster looping.
---
 src/crypto/slow-hash.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c
index c7264bd96..6495e490e 100644
--- a/src/crypto/slow-hash.c
+++ b/src/crypto/slow-hash.c
@@ -95,12 +95,11 @@ void cn_slow_hash(const void *data, size_t length, char *hash) {
   memcpy(text, state.init, INIT_SIZE_BYTE);
   memcpy(aes_key, state.hs.b, AES_KEY_SIZE);
   aes_ctx = oaes_alloc();
+  
+  oaes_key_import_data(aes_ctx, aes_key, AES_KEY_SIZE);
   for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
-    for (j = 0; j < INIT_SIZE_BLK; j++) {
-      oaes_key_import_data(aes_ctx, aes_key, AES_KEY_SIZE);
+    for (j = 0; j < INIT_SIZE_BLK; j++) {    
       oaes_pseudo_encrypt_ecb(aes_ctx, &text[AES_BLOCK_SIZE * j]);
-      /*memcpy(aes_key, &text[AES_BLOCK_SIZE * j], AES_KEY_SIZE);*/
-      memcpy(aes_key, state.hs.b, AES_KEY_SIZE);
     }
     memcpy(&long_state[i * INIT_SIZE_BYTE], text, INIT_SIZE_BYTE);
   }
@@ -137,10 +136,9 @@ void cn_slow_hash(const void *data, size_t length, char *hash) {
   }
 
   memcpy(text, state.init, INIT_SIZE_BYTE);
+  oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);
   for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
     for (j = 0; j < INIT_SIZE_BLK; j++) {
-      /*oaes_key_import_data(aes_ctx, &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE], AES_KEY_SIZE);*/
-      oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);
       xor_blocks(&text[j * AES_BLOCK_SIZE], &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE]);
       oaes_pseudo_encrypt_ecb(aes_ctx, &text[j * AES_BLOCK_SIZE]);
     }

From b27f060815a5fc3dde224f42d5ba9c6f2db5d2c0 Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Wed, 7 May 2014 19:55:34 -0400
Subject: [PATCH 02/76] added checkpoint @ 29556

---
 src/cryptonote_core/checkpoints_create.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h
index 9088b092d..2aa67c90d 100644
--- a/src/cryptonote_core/checkpoints_create.h
+++ b/src/cryptonote_core/checkpoints_create.h
@@ -13,6 +13,7 @@ namespace cryptonote {
   inline bool create_checkpoints(cryptonote::checkpoints& checkpoints)
   {      
     ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
+    ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
     return true;
   }
 }

From ed444b7175d8d9d62a7077aaf59e70d071d2fad6 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Wed, 7 May 2014 17:15:43 -0700
Subject: [PATCH 03/76] Update cryptonote_format_utils.cpp

Fixed problem with integer saturation when summing summary_amounts and out_amounts in a 32-bit platform.
---
 src/cryptonote_core/cryptonote_format_utils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
index b2eaf18a2..2b38d001f 100644
--- a/src/cryptonote_core/cryptonote_format_utils.cpp
+++ b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -80,7 +80,7 @@ namespace cryptonote
 #endif
     block_reward += fee;
 
-    std::vector<size_t> out_amounts;
+    std::vector<uint64_t> out_amounts;
     decompose_amount_into_digits(block_reward, DEFAULT_FEE,
       [&out_amounts](uint64_t a_chunk) { out_amounts.push_back(a_chunk); },
       [&out_amounts](uint64_t a_dust) { out_amounts.push_back(a_dust); });
@@ -92,7 +92,7 @@ namespace cryptonote
       out_amounts.resize(out_amounts.size() - 1);
     }
 
-    size_t summary_amounts = 0;
+    uint64_t summary_amounts = 0;
     for (size_t no = 0; no < out_amounts.size(); no++)
     {
       crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);;

From 5ceffa8c8abb96bb8314939bf75c9b935ea7b5bc Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Thu, 8 May 2014 11:12:54 -0400
Subject: [PATCH 04/76] disable checkpointing for security reasons

Further investigation of fast sync security is required
---
 src/cryptonote_core/checkpoints_create.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h
index 2aa67c90d..32d15831f 100644
--- a/src/cryptonote_core/checkpoints_create.h
+++ b/src/cryptonote_core/checkpoints_create.h
@@ -12,8 +12,12 @@
 namespace cryptonote {
   inline bool create_checkpoints(cryptonote::checkpoints& checkpoints)
   {      
-    ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
-    ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
+    // Checkpointing disabled until we can make the client not fast-sync
+    // without checking PoW at some point. Otherwise we may be exposed
+    // to blockchain corruption attacks. Need to investigate this further.
+    // 8-5-14
+    // ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
+    // ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
     return true;
   }
 }

From 26c1a8569c2f30ae204bf5be83a66491ab719dfb Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sun, 11 May 2014 14:10:24 -0700
Subject: [PATCH 05/76] Update simpleminer.cpp

1. Modified connection timeout from 1 second to 10 seconds
2. Modified behavior to retry instead of exiting when the miner fails to get a new job
---
 src/miner/simpleminer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/miner/simpleminer.cpp b/src/miner/simpleminer.cpp
index 3af04954f..1d6f18410 100644
--- a/src/miner/simpleminer.cpp
+++ b/src/miner/simpleminer.cpp
@@ -109,7 +109,7 @@ namespace mining
       if(!m_http_client.is_connected())
       {
         LOG_PRINT_L0("Connecting " << m_pool_ip << ":" << m_pool_port << "....");
-        if(!m_http_client.connect(m_pool_ip, m_pool_port, 1000))
+        if(!m_http_client.connect(m_pool_ip, m_pool_port, 10000))
         {
           LOG_PRINT_L0("Failed to connect " << m_pool_ip << ":" << m_pool_port << ", sleep....");
           epee::misc_utils::sleep_no_w(1000);
@@ -198,7 +198,7 @@ namespace mining
         LOG_PRINT_L0("Can't get new job! Disconnect and sleep....");
         m_http_client.disconnect();
         epee::misc_utils::sleep_no_w(1000);
-        break;
+        continue;
       }
       if (getjob_response.blob.empty() && getjob_response.target.empty() && getjob_response.job_id.empty())
       {

From 9b2d1bc4c2697e0291e15176579c63e6f293d372 Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Mon, 12 May 2014 21:30:00 -0400
Subject: [PATCH 06/76] 20s timeout for zone117x pool

---
 src/miner/simpleminer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner/simpleminer.cpp b/src/miner/simpleminer.cpp
index 1d6f18410..a1c1ad5c6 100644
--- a/src/miner/simpleminer.cpp
+++ b/src/miner/simpleminer.cpp
@@ -109,7 +109,7 @@ namespace mining
       if(!m_http_client.is_connected())
       {
         LOG_PRINT_L0("Connecting " << m_pool_ip << ":" << m_pool_port << "....");
-        if(!m_http_client.connect(m_pool_ip, m_pool_port, 10000))
+        if(!m_http_client.connect(m_pool_ip, m_pool_port, 20000))
         {
           LOG_PRINT_L0("Failed to connect " << m_pool_ip << ":" << m_pool_port << ", sleep....");
           epee::misc_utils::sleep_no_w(1000);

From c0cf78a1d157605ab1a937d022ba03e130b1bca3 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Tue, 13 May 2014 16:10:58 -0700
Subject: [PATCH 07/76] Update serialization.h

1. Added VARINT_FIELD_N(t,f) macro required for tx_extra_merge_mining_tag serialization.
---
 src/serialization/serialization.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h
index 2d78baf3a..2e69ea0a3 100644
--- a/src/serialization/serialization.h
+++ b/src/serialization/serialization.h
@@ -93,7 +93,12 @@ inline bool do_serialize(Archive &ar, T &v)
     ar.serialize_varint(f); \
     if (!ar.stream().good()) return false; \
   } while(0);
-
+#define VARINT_FIELD_N(t, f) \
+  do { \
+    ar.tag(t); \
+    ar.serialize_varint(f); \
+    if (!ar.stream().good()) return false; \
+  } while(0);
 namespace serialization {
   namespace detail
   {

From b5b061e0e876fdbe7d82c9ba610d5c514961f1c1 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Tue, 13 May 2014 17:53:20 -0700
Subject: [PATCH 08/76] Update tx_extra.h

1. Fixed bug where it's impossible to spend merge-mining blocks due to missing serialization support for "tx_etra_merge_mining_tag".
---
 src/cryptonote_core/tx_extra.h | 53 +++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/cryptonote_core/tx_extra.h b/src/cryptonote_core/tx_extra.h
index 8cff085dc..254a6a2ff 100644
--- a/src/cryptonote_core/tx_extra.h
+++ b/src/cryptonote_core/tx_extra.h
@@ -11,6 +11,7 @@
 #define TX_EXTRA_TAG_PADDING                0x00
 #define TX_EXTRA_TAG_PUBKEY                 0x01
 #define TX_EXTRA_NONCE                      0x02
+#define TX_EXTRA_MERGE_MINING_TAG           0x03
 
 #define TX_EXTRA_NONCE_PAYMENT_ID           0x00
 
@@ -82,13 +83,63 @@ namespace cryptonote
     END_SERIALIZE()
   };
 
+  struct tx_extra_merge_mining_tag
+  {
+    struct serialize_helper
+    {
+      tx_extra_merge_mining_tag& mm_tag;
+
+      serialize_helper(tx_extra_merge_mining_tag& mm_tag_) : mm_tag(mm_tag_)
+      {
+      }
+
+      BEGIN_SERIALIZE()
+        VARINT_FIELD_N("depth", mm_tag.depth)
+        FIELD_N("merkle_root", mm_tag.merkle_root)
+      END_SERIALIZE()
+    };
+
+    size_t depth;
+    crypto::hash merkle_root;
+
+    // load
+    template <template <bool> class Archive>
+    bool do_serialize(Archive<false>& ar)
+    {
+      std::string field;
+      if(!::do_serialize(ar, field))
+        return false;
+
+      std::istringstream iss(field);
+      binary_archive<false> iar(iss);
+      serialize_helper helper(*this);
+      return ::serialization::serialize(iar, helper);
+    }
+
+    // store
+    template <template <bool> class Archive>
+    bool do_serialize(Archive<true>& ar)
+    {
+      std::ostringstream oss;
+      binary_archive<true> oar(oss);
+      serialize_helper helper(*this);
+      if(!::do_serialize(oar, helper))
+        return false;
+
+      std::string field = oss.str();
+      return ::serialization::serialize(ar, field);
+    }
+  };
+
   // tx_extra_field format, except tx_extra_padding and tx_extra_pub_key:
   //   varint tag;
   //   varint size;
   //   varint data[];
-  typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce> tx_extra_field;
+  //typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce> tx_extra_field;
+  typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce, tx_extra_merge_mining_tag> tx_extra_field;
 }
 
 VARIANT_TAG(binary_archive, cryptonote::tx_extra_padding, TX_EXTRA_TAG_PADDING);
 VARIANT_TAG(binary_archive, cryptonote::tx_extra_pub_key, TX_EXTRA_TAG_PUBKEY);
 VARIANT_TAG(binary_archive, cryptonote::tx_extra_nonce, TX_EXTRA_NONCE);
+VARIANT_TAG(binary_archive, cryptonote::tx_extra_merge_mining_tag, TX_EXTRA_MERGE_MINING_TAG);

From a03b13b50b11638e3c2a6b92a336753572802789 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Tue, 13 May 2014 17:55:50 -0700
Subject: [PATCH 09/76] Update daemon_commands_handler.h

1. Added "diff" command to show current estimated difficulty and hash-rate.
---
 src/daemon/daemon_commands_handler.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/daemon/daemon_commands_handler.h b/src/daemon/daemon_commands_handler.h
index dca524f77..74b671e2a 100644
--- a/src/daemon/daemon_commands_handler.h
+++ b/src/daemon/daemon_commands_handler.h
@@ -34,6 +34,7 @@ public:
     m_cmd_binder.set_handler("show_hr", boost::bind(&daemon_cmmands_handler::show_hr, this, _1), "Start showing hash rate");
     m_cmd_binder.set_handler("hide_hr", boost::bind(&daemon_cmmands_handler::hide_hr, this, _1), "Stop showing hash rate");
     m_cmd_binder.set_handler("save", boost::bind(&daemon_cmmands_handler::save, this, _1), "Save blockchain");
+    m_cmd_binder.set_handler("diff", boost::bind(&daemon_cmmands_handler::diff, this, _1), "Show difficulty");
   }
 
   bool start_handling()
@@ -98,6 +99,17 @@ private:
     return true;
   }
   //--------------------------------------------------------------------------------
+  bool diff(const std::vector<std::string>& args)
+  {
+	  cryptonote::difficulty_type difficulty = m_srv.get_payload_object().get_core().get_blockchain_storage().get_difficulty_for_next_block();
+	  uint64_t height = m_srv.get_payload_object().get_core().get_blockchain_storage().get_current_blockchain_height();
+
+	  LOG_PRINT_GREEN("BH: " << height << ", DIFF: " << difficulty 
+		  << ", HR: " << (int) difficulty / 60L << " H/s", LOG_LEVEL_0);
+
+	  return true;
+  } 
+  //--------------------------------------------------------------------------------
   bool print_bc_outs(const std::vector<std::string>& args)
   {
     if(args.size() != 1)

From 46906700318c5361f0e04a7639bfe2ba01b7564c Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Fri, 16 May 2014 00:21:43 +0200
Subject: [PATCH 10/76] Added 'save_bc' command in daemon for saving blockchain
 remotely

---
 src/rpc/core_rpc_server.cpp             | 14 ++++++++++++++
 src/rpc/core_rpc_server.h               |  2 ++
 src/rpc/core_rpc_server_commands_defs.h | 20 ++++++++++++++++++++
 src/simplewallet/simplewallet.cpp       | 17 +++++++++++++++++
 src/simplewallet/simplewallet.h         |  1 +
 5 files changed, 54 insertions(+)

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 631fb5cf8..d2c94fe39 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -275,6 +275,20 @@ namespace cryptonote
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
+  bool core_rpc_server::on_save_bc(const COMMAND_RPC_SAVE_BC::request& req, COMMAND_RPC_SAVE_BC::response& res, connection_context& cntx)
+  {
+    CHECK_CORE_READY();
+    if( !m_core.get_blockchain_storage().store_blockchain() )
+    {
+      // TODO
+      res.status = "Error while storing blockhain";
+
+      return true;
+    }
+    res.status = CORE_RPC_STATUS_OK;
+    return true;
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_getblockcount(const COMMAND_RPC_GETBLOCKCOUNT::request& req, COMMAND_RPC_GETBLOCKCOUNT::response& res, connection_context& cntx)
   {
     CHECK_CORE_READY();
diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h
index 7b14e741a..ad0016c94 100644
--- a/src/rpc/core_rpc_server.h
+++ b/src/rpc/core_rpc_server.h
@@ -40,6 +40,7 @@ namespace cryptonote
       MAP_URI_AUTO_JON2("/sendrawtransaction", on_send_raw_tx, COMMAND_RPC_SEND_RAW_TX)
       MAP_URI_AUTO_JON2("/start_mining", on_start_mining, COMMAND_RPC_START_MINING)
       MAP_URI_AUTO_JON2("/stop_mining", on_stop_mining, COMMAND_RPC_STOP_MINING)
+      MAP_URI_AUTO_JON2("/save_bc", on_save_bc, COMMAND_RPC_SAVE_BC)
       MAP_URI_AUTO_JON2("/getinfo", on_get_info, COMMAND_RPC_GET_INFO)
       BEGIN_JSON_RPC_MAP("/json_rpc")
         MAP_JON_RPC("getblockcount",             on_getblockcount,              COMMAND_RPC_GETBLOCKCOUNT)
@@ -61,6 +62,7 @@ namespace cryptonote
     bool on_stop_mining(const COMMAND_RPC_STOP_MINING::request& req, COMMAND_RPC_STOP_MINING::response& res, connection_context& cntx);
     bool on_get_random_outs(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res, connection_context& cntx);        
     bool on_get_info(const COMMAND_RPC_GET_INFO::request& req, COMMAND_RPC_GET_INFO::response& res, connection_context& cntx);        
+    bool on_save_bc(const COMMAND_RPC_SAVE_BC::request& req, COMMAND_RPC_SAVE_BC::response& res, connection_context& cntx);
     
     //json_rpc
     bool on_getblockcount(const COMMAND_RPC_GETBLOCKCOUNT::request& req, COMMAND_RPC_GETBLOCKCOUNT::response& res, connection_context& cntx);
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index d67ebfdd7..1e8ebe8ff 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -260,7 +260,27 @@ namespace cryptonote
     };
   };
 
+  //-----------------------------------------------
+  struct COMMAND_RPC_SAVE_BC
+  {
+    struct request
+    {
 
+      BEGIN_KV_SERIALIZE_MAP()
+      END_KV_SERIALIZE_MAP()
+    };
+
+
+    struct response
+    {
+      std::string status;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(status)
+      END_KV_SERIALIZE_MAP()
+    };
+  };
+  
   //
   struct COMMAND_RPC_GETBLOCKCOUNT
   {
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 919782ab6..0f84b81de 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -181,6 +181,7 @@ simple_wallet::simple_wallet()
 {
   m_cmd_binder.set_handler("start_mining", boost::bind(&simple_wallet::start_mining, this, _1), "start_mining [<number_of_threads>] - Start mining in daemon");
   m_cmd_binder.set_handler("stop_mining", boost::bind(&simple_wallet::stop_mining, this, _1), "Stop mining in daemon");
+  m_cmd_binder.set_handler("save_bc", boost::bind(&simple_wallet::save_bc, this, _1), "Save current blockchain data");
   m_cmd_binder.set_handler("refresh", boost::bind(&simple_wallet::refresh, this, _1), "Resynchronize transactions and balance");
   m_cmd_binder.set_handler("balance", boost::bind(&simple_wallet::show_balance, this, _1), "Show current wallet balance");
   m_cmd_binder.set_handler("incoming_transfers", boost::bind(&simple_wallet::show_incoming_transfers, this, _1), "incoming_transfers [available|unavailable] - Show incoming transfers - all of them or filter them by availability");
@@ -491,6 +492,22 @@ bool simple_wallet::stop_mining(const std::vector<std::string>& args)
   return true;
 }
 //----------------------------------------------------------------------------------------------------
+bool simple_wallet::save_bc(const std::vector<std::string>& args)
+{
+  if (!try_connect_to_daemon())
+    return true;
+
+  COMMAND_RPC_SAVE_BC::request req;
+  COMMAND_RPC_SAVE_BC::response res;
+  bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/save_bc", req, res, m_http_client);
+  std::string err = interpret_rpc_response(r, res.status);
+  if (err.empty())
+    success_msg_writer() << "Blockchain saved";
+  else
+    fail_msg_writer() << "Blockchain can't be saved: " << err;
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
 void simple_wallet::on_new_block(uint64_t height, const cryptonote::block& block)
 {
   m_refresh_progress_reporter.update(height, false);
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index a6c771804..3aa0789ae 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -46,6 +46,7 @@ namespace cryptonote
     bool help(const std::vector<std::string> &args = std::vector<std::string>());
     bool start_mining(const std::vector<std::string> &args);
     bool stop_mining(const std::vector<std::string> &args);
+    bool save_bc(const std::vector<std::string>& args);
     bool refresh(const std::vector<std::string> &args);
     bool show_balance(const std::vector<std::string> &args = std::vector<std::string>());
     bool show_incoming_transfers(const std::vector<std::string> &args);

From eb2db3cf610a1c0ea0419037ae8544911815eca7 Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Fri, 16 May 2014 00:26:35 +0200
Subject: [PATCH 11/76] Added 'save_bc' command in daemon for saving blockchain
 remotely

---
 src/rpc/core_rpc_server.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index d2c94fe39..2c4e82085 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -280,9 +280,7 @@ namespace cryptonote
     CHECK_CORE_READY();
     if( !m_core.get_blockchain_storage().store_blockchain() )
     {
-      // TODO
       res.status = "Error while storing blockhain";
-
       return true;
     }
     res.status = CORE_RPC_STATUS_OK;

From e41c808d8d2b17d4df37fbf18f7bb1a830f9865f Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 15:39:46 -0700
Subject: [PATCH 12/76] Update oaes_config.h

1. Disabled OAES_DEBUG flag
---
 src/crypto/oaes_config.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/crypto/oaes_config.h b/src/crypto/oaes_config.h
index 8a58c3cfc..3fc0e1be5 100644
--- a/src/crypto/oaes_config.h
+++ b/src/crypto/oaes_config.h
@@ -39,9 +39,9 @@ extern "C" {
 //#define OAES_HAVE_ISAAC 1
 //#endif // OAES_HAVE_ISAAC
 
-#ifndef OAES_DEBUG
-#define OAES_DEBUG 0
-#endif // OAES_DEBUG
+//#ifndef OAES_DEBUG
+//#define OAES_DEBUG 0
+//#endif // OAES_DEBUG
 
 #ifdef __cplusplus 
 }

From 98e0326596a7e444321c70b5e8b0d410f81a9c99 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 16:20:47 -0700
Subject: [PATCH 13/76] Update oaes_lib.h

1. Moved structs oaes_ctx and oaes_key into oeas_lib header.
---
 src/crypto/oaes_lib.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/crypto/oaes_lib.h b/src/crypto/oaes_lib.h
index 9155bce02..16b914c7a 100644
--- a/src/crypto/oaes_lib.h
+++ b/src/crypto/oaes_lib.h
@@ -101,6 +101,32 @@ typedef int ( * oaes_step_cb ) (
 
 typedef uint16_t OAES_OPTION;
 
+
+typedef struct _oaes_key
+{
+	size_t data_len;
+	uint8_t *data;
+	size_t exp_data_len;
+	uint8_t *exp_data;
+	size_t num_keys;
+	size_t key_base;
+} oaes_key;
+
+typedef struct _oaes_ctx
+{
+#ifdef OAES_HAVE_ISAAC
+  randctx * rctx;
+#endif // OAES_HAVE_ISAAC
+
+#ifdef OAES_DEBUG
+	oaes_step_cb step_cb;
+#endif // OAES_DEBUG
+
+	oaes_key * key;
+	OAES_OPTION options;
+	uint8_t iv[OAES_BLOCK_SIZE];
+} oaes_ctx;
+
 /*
  * // usage:
  * 

From e4f7b92ff98ab5a552275f74747c56465c55ce8a Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 16:22:07 -0700
Subject: [PATCH 14/76] Update oaes_lib.c

1. Moved structs oaes_ctx and oaes_key into oeas_lib header.
---
 src/crypto/oaes_lib.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c
index 126f0a2f6..96f038600 100644
--- a/src/crypto/oaes_lib.c
+++ b/src/crypto/oaes_lib.c
@@ -64,30 +64,6 @@ static const char _NR[] = {
 # define min(a,b) (((a)<(b)) ? (a) : (b))
 #endif /* min */
 
-typedef struct _oaes_key
-{
-	size_t data_len;
-	uint8_t *data;
-	size_t exp_data_len;
-	uint8_t *exp_data;
-	size_t num_keys;
-	size_t key_base;
-} oaes_key;
-
-typedef struct _oaes_ctx
-{
-#ifdef OAES_HAVE_ISAAC
-  randctx * rctx;
-#endif // OAES_HAVE_ISAAC
-
-#ifdef OAES_DEBUG
-	oaes_step_cb step_cb;
-#endif // OAES_DEBUG
-
-	oaes_key * key;
-	OAES_OPTION options;
-	uint8_t iv[OAES_BLOCK_SIZE];
-} oaes_ctx;
 
 // "OAES<8-bit header version><8-bit type><16-bit options><8-bit flags><56-bit reserved>"
 static uint8_t oaes_header[OAES_BLOCK_SIZE] = {

From 49d55d3c308d99829a0ec3b74617c27ca30f364c Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 16:25:00 -0700
Subject: [PATCH 15/76] Update slow-hash.c

1. Various optimizations for faster hashing performance.
---
 src/crypto/slow-hash.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c
index 6495e490e..747cdec65 100644
--- a/src/crypto/slow-hash.c
+++ b/src/crypto/slow-hash.c
@@ -22,6 +22,9 @@ static void (*const extra_hashes[4])(const void *, size_t, char *) = {
 #define INIT_SIZE_BLK   8
 #define INIT_SIZE_BYTE (INIT_SIZE_BLK * AES_BLOCK_SIZE)
 
+extern int aesb_single_round(const uint8_t *in, uint8_t*out, const uint8_t *expandedKey);
+extern int aesb_pseudo_round(const uint8_t *in, uint8_t *out, const uint8_t *expandedKey);
+
 static size_t e2i(const uint8_t* a, size_t count) { return (*((uint64_t*)a) / AES_BLOCK_SIZE) & (count - 1); }
 
 static void mul(const uint8_t* a, const uint8_t* b, uint8_t* res) {
@@ -47,19 +50,20 @@ static void sum_half_blocks(uint8_t* a, const uint8_t* b) {
   ((uint64_t*)a)[0] = SWAP64LE(a0);
   ((uint64_t*)a)[1] = SWAP64LE(a1);
 }
+#define U64(x) ((uint64_t *) (x))
 
 static void copy_block(uint8_t* dst, const uint8_t* src) {
   memcpy(dst, src, AES_BLOCK_SIZE);
 }
 
-static void swap_blocks(uint8_t* a, uint8_t* b) {
-  size_t i;
-  uint8_t t;
-  for (i = 0; i < AES_BLOCK_SIZE; i++) {
-    t = a[i];
-    a[i] = b[i];
-    b[i] = t;
-  }
+static void swap_blocks(uint8_t *a, uint8_t *b){
+	uint64_t t[2];
+	U64(t)[0] = U64(a)[0];
+	U64(t)[1] = U64(a)[1];
+	U64(a)[0] = U64(b)[0];
+	U64(a)[1] = U64(b)[1];
+	U64(b)[0] = U64(t)[0];
+	U64(b)[1] = U64(t)[1];
 }
 
 static void xor_blocks(uint8_t* a, const uint8_t* b) {
@@ -89,17 +93,17 @@ void cn_slow_hash(const void *data, size_t length, char *hash) {
   uint8_t d[AES_BLOCK_SIZE];
   size_t i, j;
   uint8_t aes_key[AES_KEY_SIZE];
-  OAES_CTX* aes_ctx;
+  oaes_ctx *aes_ctx;
 
   hash_process(&state.hs, data, length);
   memcpy(text, state.init, INIT_SIZE_BYTE);
   memcpy(aes_key, state.hs.b, AES_KEY_SIZE);
-  aes_ctx = oaes_alloc();
+  aes_ctx = (oaes_ctx *) oaes_alloc();
   
   oaes_key_import_data(aes_ctx, aes_key, AES_KEY_SIZE);
   for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
     for (j = 0; j < INIT_SIZE_BLK; j++) {    
-      oaes_pseudo_encrypt_ecb(aes_ctx, &text[AES_BLOCK_SIZE * j]);
+		  aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], aes_ctx->key->exp_data);
     }
     memcpy(&long_state[i * INIT_SIZE_BYTE], text, INIT_SIZE_BYTE);
   }
@@ -117,7 +121,7 @@ void cn_slow_hash(const void *data, size_t length, char *hash) {
     /* Iteration 1 */
     j = e2i(a, MEMORY / AES_BLOCK_SIZE);
     copy_block(c, &long_state[j * AES_BLOCK_SIZE]);
-    oaes_encryption_round(a, c);
+	  aesb_single_round(c, c, a);
     xor_blocks(b, c);
     swap_blocks(b, c);
     copy_block(&long_state[j * AES_BLOCK_SIZE], c);
@@ -140,12 +144,12 @@ void cn_slow_hash(const void *data, size_t length, char *hash) {
   for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
     for (j = 0; j < INIT_SIZE_BLK; j++) {
       xor_blocks(&text[j * AES_BLOCK_SIZE], &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE]);
-      oaes_pseudo_encrypt_ecb(aes_ctx, &text[j * AES_BLOCK_SIZE]);
+	    aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], aes_ctx->key->exp_data);
     }
   }
   memcpy(state.init, text, INIT_SIZE_BYTE);
   hash_permutation(&state.hs);
   /*memcpy(hash, &state, 32);*/
   extra_hashes[state.hs.b[0] & 3](&state, 200, hash);
-  oaes_free(&aes_ctx);
+  oaes_free((OAES_CTX **) &aes_ctx);
 }

From ab7b25da5ebde156189db0491dcce813d8307a83 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 16:25:58 -0700
Subject: [PATCH 16/76] Create aesb.c

---
 src/crypto/aesb.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 src/crypto/aesb.c

diff --git a/src/crypto/aesb.c b/src/crypto/aesb.c
new file mode 100644
index 000000000..ba48313da
--- /dev/null
+++ b/src/crypto/aesb.c
@@ -0,0 +1,177 @@
+/*
+---------------------------------------------------------------------------
+Copyright (c) 1998-2013, Brian Gladman, Worcester, UK. All rights reserved.
+
+The redistribution and use of this software (with or without changes)
+is allowed without the payment of fees or royalties provided that:
+
+  source code distributions include the above copyright notice, this
+  list of conditions and the following disclaimer;
+
+  binary distributions include the above copyright notice, this list
+  of conditions and the following disclaimer in their documentation.
+
+This software is provided 'as is' with no explicit or implied warranties
+in respect of its operation, including, but not limited to, correctness
+and fitness for purpose.
+---------------------------------------------------------------------------
+Issue Date: 20/12/2007
+*/
+
+#include <stdint.h>
+
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+#define TABLE_ALIGN		32
+#define WPOLY			0x011b
+#define N_COLS			4
+#define AES_BLOCK_SIZE	16
+#define RC_LENGTH		(5 * (AES_BLOCK_SIZE / 4 - 2))
+
+#if defined(_MSC_VER)
+#define ALIGN __declspec(align(TABLE_ALIGN))
+#elif defined(__GNUC__)
+#define ALIGN __attribute__ ((aligned(16)))
+#else
+#define ALIGN
+#endif
+
+#define rf1(r,c) (r)
+#define word_in(x,c) (*((uint32_t*)(x)+(c)))
+#define word_out(x,c,v) (*((uint32_t*)(x)+(c)) = (v))
+
+#define s(x,c) x[c]
+#define si(y,x,c) (s(y,c) = word_in(x, c))
+#define so(y,x,c) word_out(y, c, s(x,c))
+#define state_in(y,x) si(y,x,0); si(y,x,1); si(y,x,2); si(y,x,3)
+#define state_out(y,x)  so(y,x,0); so(y,x,1); so(y,x,2); so(y,x,3)
+#define round(rm,y,x,k) rm(y,x,k,0); rm(y,x,k,1); rm(y,x,k,2); rm(y,x,k,3)
+#define to_byte(x) ((x) & 0xff)
+#define bval(x,n) to_byte((x) >> (8 * (n)))
+
+#define fwd_var(x,r,c)\
+ ( r == 0 ? ( c == 0 ? s(x,0) : c == 1 ? s(x,1) : c == 2 ? s(x,2) : s(x,3))\
+ : r == 1 ? ( c == 0 ? s(x,1) : c == 1 ? s(x,2) : c == 2 ? s(x,3) : s(x,0))\
+ : r == 2 ? ( c == 0 ? s(x,2) : c == 1 ? s(x,3) : c == 2 ? s(x,0) : s(x,1))\
+ :          ( c == 0 ? s(x,3) : c == 1 ? s(x,0) : c == 2 ? s(x,1) : s(x,2)))
+
+#define fwd_rnd(y,x,k,c)  (s(y,c) = (k)[c] ^ four_tables(x,t_use(f,n),fwd_var,rf1,c))
+
+#define sb_data(w) {\
+	w(0x63), w(0x7c), w(0x77), w(0x7b), w(0xf2), w(0x6b), w(0x6f), w(0xc5),\
+	w(0x30), w(0x01), w(0x67), w(0x2b), w(0xfe), w(0xd7), w(0xab), w(0x76),\
+	w(0xca), w(0x82), w(0xc9), w(0x7d), w(0xfa), w(0x59), w(0x47), w(0xf0),\
+	w(0xad), w(0xd4), w(0xa2), w(0xaf), w(0x9c), w(0xa4), w(0x72), w(0xc0),\
+	w(0xb7), w(0xfd), w(0x93), w(0x26), w(0x36), w(0x3f), w(0xf7), w(0xcc),\
+	w(0x34), w(0xa5), w(0xe5), w(0xf1), w(0x71), w(0xd8), w(0x31), w(0x15),\
+	w(0x04), w(0xc7), w(0x23), w(0xc3), w(0x18), w(0x96), w(0x05), w(0x9a),\
+	w(0x07), w(0x12), w(0x80), w(0xe2), w(0xeb), w(0x27), w(0xb2), w(0x75),\
+	w(0x09), w(0x83), w(0x2c), w(0x1a), w(0x1b), w(0x6e), w(0x5a), w(0xa0),\
+	w(0x52), w(0x3b), w(0xd6), w(0xb3), w(0x29), w(0xe3), w(0x2f), w(0x84),\
+	w(0x53), w(0xd1), w(0x00), w(0xed), w(0x20), w(0xfc), w(0xb1), w(0x5b),\
+	w(0x6a), w(0xcb), w(0xbe), w(0x39), w(0x4a), w(0x4c), w(0x58), w(0xcf),\
+	w(0xd0), w(0xef), w(0xaa), w(0xfb), w(0x43), w(0x4d), w(0x33), w(0x85),\
+	w(0x45), w(0xf9), w(0x02), w(0x7f), w(0x50), w(0x3c), w(0x9f), w(0xa8),\
+	w(0x51), w(0xa3), w(0x40), w(0x8f), w(0x92), w(0x9d), w(0x38), w(0xf5),\
+	w(0xbc), w(0xb6), w(0xda), w(0x21), w(0x10), w(0xff), w(0xf3), w(0xd2),\
+	w(0xcd), w(0x0c), w(0x13), w(0xec), w(0x5f), w(0x97), w(0x44), w(0x17),\
+	w(0xc4), w(0xa7), w(0x7e), w(0x3d), w(0x64), w(0x5d), w(0x19), w(0x73),\
+	w(0x60), w(0x81), w(0x4f), w(0xdc), w(0x22), w(0x2a), w(0x90), w(0x88),\
+	w(0x46), w(0xee), w(0xb8), w(0x14), w(0xde), w(0x5e), w(0x0b), w(0xdb),\
+	w(0xe0), w(0x32), w(0x3a), w(0x0a), w(0x49), w(0x06), w(0x24), w(0x5c),\
+	w(0xc2), w(0xd3), w(0xac), w(0x62), w(0x91), w(0x95), w(0xe4), w(0x79),\
+	w(0xe7), w(0xc8), w(0x37), w(0x6d), w(0x8d), w(0xd5), w(0x4e), w(0xa9),\
+	w(0x6c), w(0x56), w(0xf4), w(0xea), w(0x65), w(0x7a), w(0xae), w(0x08),\
+	w(0xba), w(0x78), w(0x25), w(0x2e), w(0x1c), w(0xa6), w(0xb4), w(0xc6),\
+	w(0xe8), w(0xdd), w(0x74), w(0x1f), w(0x4b), w(0xbd), w(0x8b), w(0x8a),\
+	w(0x70), w(0x3e), w(0xb5), w(0x66), w(0x48), w(0x03), w(0xf6), w(0x0e),\
+	w(0x61), w(0x35), w(0x57), w(0xb9), w(0x86), w(0xc1), w(0x1d), w(0x9e),\
+	w(0xe1), w(0xf8), w(0x98), w(0x11), w(0x69), w(0xd9), w(0x8e), w(0x94),\
+	w(0x9b), w(0x1e), w(0x87), w(0xe9), w(0xce), w(0x55), w(0x28), w(0xdf),\
+	w(0x8c), w(0xa1), w(0x89), w(0x0d), w(0xbf), w(0xe6), w(0x42), w(0x68),\
+	w(0x41), w(0x99), w(0x2d), w(0x0f), w(0xb0), w(0x54), w(0xbb), w(0x16) }
+
+#define rc_data(w) {\
+	w(0x01), w(0x02), w(0x04), w(0x08), w(0x10),w(0x20), w(0x40), w(0x80),\
+	w(0x1b), w(0x36) }
+
+#define bytes2word(b0, b1, b2, b3) (((uint32_t)(b3) << 24) | \
+	((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | (b0))
+
+#define h0(x)   (x)
+#define w0(p)   bytes2word(p, 0, 0, 0)
+#define w1(p)   bytes2word(0, p, 0, 0)
+#define w2(p)   bytes2word(0, 0, p, 0)
+#define w3(p)   bytes2word(0, 0, 0, p)
+
+#define u0(p)   bytes2word(f2(p), p, p, f3(p))
+#define u1(p)   bytes2word(f3(p), f2(p), p, p)
+#define u2(p)   bytes2word(p, f3(p), f2(p), p)
+#define u3(p)   bytes2word(p, p, f3(p), f2(p))
+
+#define v0(p)   bytes2word(fe(p), f9(p), fd(p), fb(p))
+#define v1(p)   bytes2word(fb(p), fe(p), f9(p), fd(p))
+#define v2(p)   bytes2word(fd(p), fb(p), fe(p), f9(p))
+#define v3(p)   bytes2word(f9(p), fd(p), fb(p), fe(p))
+
+#define f2(x)   ((x<<1) ^ (((x>>7) & 1) * WPOLY))
+#define f4(x)   ((x<<2) ^ (((x>>6) & 1) * WPOLY) ^ (((x>>6) & 2) * WPOLY))
+#define f8(x)   ((x<<3) ^ (((x>>5) & 1) * WPOLY) ^ (((x>>5) & 2) * WPOLY) ^ (((x>>5) & 4) * WPOLY))
+#define f3(x)   (f2(x) ^ x)
+#define f9(x)   (f8(x) ^ x)
+#define fb(x)   (f8(x) ^ f2(x) ^ x)
+#define fd(x)   (f8(x) ^ f4(x) ^ x)
+#define fe(x)   (f8(x) ^ f4(x) ^ f2(x))
+
+#define t_dec(m,n) t_##m##n
+#define t_set(m,n) t_##m##n
+#define t_use(m,n) t_##m##n
+
+#define d_4(t,n,b,e,f,g,h) ALIGN const t n[4][256] = { b(e), b(f), b(g), b(h) }
+
+#define four_tables(x,tab,vf,rf,c) \
+	(tab[0][bval(vf(x,0,c),rf(0,c))] \
+	^ tab[1][bval(vf(x,1,c),rf(1,c))] \
+	^ tab[2][bval(vf(x,2,c),rf(2,c))] \
+	^ tab[3][bval(vf(x,3,c),rf(3,c))])
+
+d_4(uint32_t, t_dec(f,n), sb_data, u0, u1, u2, u3);
+
+void aesb_single_round(const uint8_t *in, uint8_t *out, uint8_t *expandedKey)
+{   
+	uint32_t b0[4], b1[4];
+	const uint32_t  *kp = (uint32_t *) expandedKey;
+	state_in(b0, in);
+
+	round(fwd_rnd,  b1, b0, kp);
+
+	state_out(out, b1);
+}
+
+void aesb_pseudo_round(const uint8_t *in, uint8_t *out, uint8_t *expandedKey)
+{   
+	uint32_t b0[4], b1[4];
+	const uint32_t  *kp = (uint32_t *) expandedKey;
+	state_in(b0, in);
+	
+	round(fwd_rnd,  b1, b0, kp);
+	round(fwd_rnd,  b0, b1, kp + 1 * N_COLS);
+	round(fwd_rnd,  b1, b0, kp + 2 * N_COLS);
+	round(fwd_rnd,  b0, b1, kp + 3 * N_COLS);
+	round(fwd_rnd,  b1, b0, kp + 4 * N_COLS);
+	round(fwd_rnd,  b0, b1, kp + 5 * N_COLS);
+	round(fwd_rnd,  b1, b0, kp + 6 * N_COLS);
+	round(fwd_rnd,  b0, b1, kp + 7 * N_COLS);
+	round(fwd_rnd,  b1, b0, kp + 8 * N_COLS);
+	round(fwd_rnd,  b0, b1, kp + 9 * N_COLS);
+
+	state_out(out, b0);
+}
+
+
+#if defined(__cplusplus)
+}
+#endif

From 3b887decca4afa8e486368be4b1b85c7d9432a26 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Sat, 17 May 2014 16:43:09 -0700
Subject: [PATCH 17/76] Update version.h.in

1. Version to 0.8.8.1
---
 src/version.h.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/version.h.in b/src/version.h.in
index 2578ea635..f3b1ae071 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
-#define PROJECT_VERSION "0.8.6"
-#define PROJECT_VERSION_BUILD_NO "295"
+#define PROJECT_VERSION "0.8.8.1"
+#define PROJECT_VERSION_BUILD_NO "1"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"

From 44f61c3965d569c288520b75356ad3bdc68b47d1 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Wed, 21 May 2014 09:29:34 -0700
Subject: [PATCH 18/76] Update slow-hash.c

1. Added AES-NI support for modern processors.
---
 src/crypto/slow-hash.c | 362 ++++++++++++++++++++++++++---------------
 1 file changed, 234 insertions(+), 128 deletions(-)

diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c
index 747cdec65..35438dcab 100644
--- a/src/crypto/slow-hash.c
+++ b/src/crypto/slow-hash.c
@@ -11,145 +11,251 @@
 #include "hash-ops.h"
 #include "oaes_lib.h"
 
-static void (*const extra_hashes[4])(const void *, size_t, char *) = {
-  hash_extra_blake, hash_extra_groestl, hash_extra_jh, hash_extra_skein
-};
+#include <emmintrin.h>
 
-#define MEMORY         (1 << 21) /* 2 MiB */
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+#include <intrin.h>
+#define STATIC
+#define INLINE __inline
+#if !defined(RDATA_ALIGN16)
+#define RDATA_ALIGN16 __declspec(align(16))
+#endif
+#else
+#include <wmmintrin.h>
+#define STATIC static
+#define INLINE inline
+#if !defined(RDATA_ALIGN16)
+#define RDATA_ALIGN16 __attribute__ ((aligned(16)))
+#endif
+#endif
+
+#define MEMORY         (1 << 21) // 2MB scratchpad
 #define ITER           (1 << 20)
 #define AES_BLOCK_SIZE  16
-#define AES_KEY_SIZE    32 /*16*/
+#define AES_KEY_SIZE    32
 #define INIT_SIZE_BLK   8
 #define INIT_SIZE_BYTE (INIT_SIZE_BLK * AES_BLOCK_SIZE)
 
+#define U64(x) ((uint64_t *) (x))
+#define R128(x) ((__m128i *) (x))
+
 extern int aesb_single_round(const uint8_t *in, uint8_t*out, const uint8_t *expandedKey);
 extern int aesb_pseudo_round(const uint8_t *in, uint8_t *out, const uint8_t *expandedKey);
 
-static size_t e2i(const uint8_t* a, size_t count) { return (*((uint64_t*)a) / AES_BLOCK_SIZE) & (count - 1); }
-
-static void mul(const uint8_t* a, const uint8_t* b, uint8_t* res) {
-  uint64_t a0, b0;
-  uint64_t hi, lo;
-
-  a0 = SWAP64LE(((uint64_t*)a)[0]);
-  b0 = SWAP64LE(((uint64_t*)b)[0]);
-  lo = mul128(a0, b0, &hi);
-  ((uint64_t*)res)[0] = SWAP64LE(hi);
-  ((uint64_t*)res)[1] = SWAP64LE(lo);
-}
-
-static void sum_half_blocks(uint8_t* a, const uint8_t* b) {
-  uint64_t a0, a1, b0, b1;
-
-  a0 = SWAP64LE(((uint64_t*)a)[0]);
-  a1 = SWAP64LE(((uint64_t*)a)[1]);
-  b0 = SWAP64LE(((uint64_t*)b)[0]);
-  b1 = SWAP64LE(((uint64_t*)b)[1]);
-  a0 += b0;
-  a1 += b1;
-  ((uint64_t*)a)[0] = SWAP64LE(a0);
-  ((uint64_t*)a)[1] = SWAP64LE(a1);
-}
-#define U64(x) ((uint64_t *) (x))
-
-static void copy_block(uint8_t* dst, const uint8_t* src) {
-  memcpy(dst, src, AES_BLOCK_SIZE);
-}
-
-static void swap_blocks(uint8_t *a, uint8_t *b){
-	uint64_t t[2];
-	U64(t)[0] = U64(a)[0];
-	U64(t)[1] = U64(a)[1];
-	U64(a)[0] = U64(b)[0];
-	U64(a)[1] = U64(b)[1];
-	U64(b)[0] = U64(t)[0];
-	U64(b)[1] = U64(t)[1];
-}
-
-static void xor_blocks(uint8_t* a, const uint8_t* b) {
-  size_t i;
-  for (i = 0; i < AES_BLOCK_SIZE; i++) {
-    a[i] ^= b[i];
-  }
-}
-
 #pragma pack(push, 1)
-union cn_slow_hash_state {
-  union hash_state hs;
-  struct {
-    uint8_t k[64];
-    uint8_t init[INIT_SIZE_BYTE];
-  };
+union cn_slow_hash_state
+{
+    union hash_state hs;
+    struct
+    {
+        uint8_t k[64];
+        uint8_t init[INIT_SIZE_BYTE];
+    };
 };
 #pragma pack(pop)
 
-void cn_slow_hash(const void *data, size_t length, char *hash) {
-  uint8_t long_state[MEMORY];
-  union cn_slow_hash_state state;
-  uint8_t text[INIT_SIZE_BYTE];
-  uint8_t a[AES_BLOCK_SIZE];
-  uint8_t b[AES_BLOCK_SIZE];
-  uint8_t c[AES_BLOCK_SIZE];
-  uint8_t d[AES_BLOCK_SIZE];
-  size_t i, j;
-  uint8_t aes_key[AES_KEY_SIZE];
-  oaes_ctx *aes_ctx;
-
-  hash_process(&state.hs, data, length);
-  memcpy(text, state.init, INIT_SIZE_BYTE);
-  memcpy(aes_key, state.hs.b, AES_KEY_SIZE);
-  aes_ctx = (oaes_ctx *) oaes_alloc();
-  
-  oaes_key_import_data(aes_ctx, aes_key, AES_KEY_SIZE);
-  for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
-    for (j = 0; j < INIT_SIZE_BLK; j++) {    
-		  aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], aes_ctx->key->exp_data);
-    }
-    memcpy(&long_state[i * INIT_SIZE_BYTE], text, INIT_SIZE_BYTE);
-  }
-
-  for (i = 0; i < 16; i++) {
-    a[i] = state.k[     i] ^ state.k[32 + i];
-    b[i] = state.k[16 + i] ^ state.k[48 + i];
-  }
-
-  for (i = 0; i < ITER / 2; i++) {
-    /* Dependency chain: address -> read value ------+
-     * written value <-+ hard function (AES or MUL) <+
-     * next address  <-+
-     */
-    /* Iteration 1 */
-    j = e2i(a, MEMORY / AES_BLOCK_SIZE);
-    copy_block(c, &long_state[j * AES_BLOCK_SIZE]);
-	  aesb_single_round(c, c, a);
-    xor_blocks(b, c);
-    swap_blocks(b, c);
-    copy_block(&long_state[j * AES_BLOCK_SIZE], c);
-    assert(j == e2i(a, MEMORY / AES_BLOCK_SIZE));
-    swap_blocks(a, b);
-    /* Iteration 2 */
-    j = e2i(a, MEMORY / AES_BLOCK_SIZE);
-    copy_block(c, &long_state[j * AES_BLOCK_SIZE]);
-    mul(a, c, d);
-    sum_half_blocks(b, d);
-    swap_blocks(b, c);
-    xor_blocks(b, c);
-    copy_block(&long_state[j * AES_BLOCK_SIZE], c);
-    assert(j == e2i(a, MEMORY / AES_BLOCK_SIZE));
-    swap_blocks(a, b);
-  }
-
-  memcpy(text, state.init, INIT_SIZE_BYTE);
-  oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);
-  for (i = 0; i < MEMORY / INIT_SIZE_BYTE; i++) {
-    for (j = 0; j < INIT_SIZE_BLK; j++) {
-      xor_blocks(&text[j * AES_BLOCK_SIZE], &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE]);
-	    aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], aes_ctx->key->exp_data);
-    }
-  }
-  memcpy(state.init, text, INIT_SIZE_BYTE);
-  hash_permutation(&state.hs);
-  /*memcpy(hash, &state, 32);*/
-  extra_hashes[state.hs.b[0] & 3](&state, 200, hash);
-  oaes_free((OAES_CTX **) &aes_ctx);
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+#define cpuid(info,x)    __cpuidex(info,x,0)
+#else
+void cpuid(int CPUInfo[4], int InfoType)
+{
+    __asm__ __volatile__
+    (
+        "cpuid":
+        "=a" (CPUInfo[0]),
+        "=b" (CPUInfo[1]),
+        "=c" (CPUInfo[2]),
+        "=d" (CPUInfo[3]) :
+        "a" (InfoType), "c" (0)
+    );
+}
+#endif
+
+STATIC INLINE void mul(const uint8_t *a, const uint8_t *b, uint8_t *res)
+{
+    uint64_t a0, b0;
+    uint64_t hi, lo;
+
+    a0 = U64(a)[0];
+    b0 = U64(b)[0];
+    lo = mul128(a0, b0, &hi);
+    U64(res)[0] = hi;
+    U64(res)[1] = lo;
+}
+
+STATIC INLINE void sum_half_blocks(uint8_t *a, const uint8_t *b)
+{
+    uint64_t a0, a1, b0, b1;
+    a0 = U64(a)[0];
+    a1 = U64(a)[1];
+    b0 = U64(b)[0];
+    b1 = U64(b)[1];
+    a0 += b0;
+    a1 += b1;
+    U64(a)[0] = a0;
+    U64(a)[1] = a1;
+}
+
+STATIC INLINE void swap_blocks(uint8_t *a, uint8_t *b)
+{
+    uint64_t t[2];
+    U64(t)[0] = U64(a)[0];
+    U64(t)[1] = U64(a)[1];
+    U64(a)[0] = U64(b)[0];
+    U64(a)[1] = U64(b)[1];
+    U64(b)[0] = U64(t)[0];
+    U64(b)[1] = U64(t)[1];
+}
+
+STATIC INLINE void xor_blocks(uint8_t *a, const uint8_t *b)
+{
+    U64(a)[0] ^= U64(b)[0];
+    U64(a)[1] ^= U64(b)[1];
+}
+
+STATIC INLINE int check_aes_hw(void)
+{
+    int cpuid_results[4];
+    static int supported = -1;
+
+    if(supported >= 0)
+        return supported;
+
+    cpuid(cpuid_results,1);
+    return supported = cpuid_results[2] & (1 << 25);
+}
+
+STATIC INLINE void aesni_pseudo_round(const uint8_t *in, uint8_t *out,
+                                      const uint8_t *expandedKey)
+{
+    __m128i *k = R128(expandedKey);
+    __m128i d;
+
+    d = _mm_loadu_si128(R128(in));
+    d = _mm_aesenc_si128(d, *R128(&k[0]));
+    d = _mm_aesenc_si128(d, *R128(&k[1]));
+    d = _mm_aesenc_si128(d, *R128(&k[2]));
+    d = _mm_aesenc_si128(d, *R128(&k[3]));
+    d = _mm_aesenc_si128(d, *R128(&k[4]));
+    d = _mm_aesenc_si128(d, *R128(&k[5]));
+    d = _mm_aesenc_si128(d, *R128(&k[6]));
+    d = _mm_aesenc_si128(d, *R128(&k[7]));
+    d = _mm_aesenc_si128(d, *R128(&k[8]));
+    d = _mm_aesenc_si128(d, *R128(&k[9]));
+    _mm_storeu_si128((R128(out)), d);
+}
+
+void cn_slow_hash(const void *data, size_t length, char *hash)
+{
+    uint8_t long_state[MEMORY];
+    uint8_t text[INIT_SIZE_BYTE];
+    uint8_t a[AES_BLOCK_SIZE];
+    uint8_t b[AES_BLOCK_SIZE];
+    uint8_t d[AES_BLOCK_SIZE];
+    uint8_t aes_key[AES_KEY_SIZE];
+    RDATA_ALIGN16 uint8_t expandedKey[256];
+
+    union cn_slow_hash_state state;
+
+    size_t i, j;
+    uint8_t *p = NULL;
+    oaes_ctx *aes_ctx;
+
+    int useAes = check_aes_hw();
+    static void (*const extra_hashes[4])(const void *, size_t, char *) =
+    {
+        hash_extra_blake, hash_extra_groestl, hash_extra_jh, hash_extra_skein
+    };
+
+    hash_process(&state.hs, data, length);
+    memcpy(text, state.init, INIT_SIZE_BYTE);
+
+    aes_ctx = (oaes_ctx *) oaes_alloc();
+    oaes_key_import_data(aes_ctx, state.hs.b, AES_KEY_SIZE);
+
+    // use aligned data
+    memcpy(expandedKey, aes_ctx->key->exp_data, aes_ctx->key->exp_data_len);
+
+    if(useAes)
+    {
+        for(i = 0; i < MEMORY / INIT_SIZE_BYTE; i++)
+        {
+            for(j = 0; j < INIT_SIZE_BLK; j++)
+                aesni_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], expandedKey);
+            memcpy(&long_state[i * INIT_SIZE_BYTE], text, INIT_SIZE_BYTE);
+        }
+    }
+    else
+    {
+        for(i = 0; i < MEMORY / INIT_SIZE_BYTE; i++)
+        {
+            for(j = 0; j < INIT_SIZE_BLK; j++)
+                aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], expandedKey);
+
+            memcpy(&long_state[i * INIT_SIZE_BYTE], text, INIT_SIZE_BYTE);
+        }
+    }
+
+    U64(a)[0] = U64(&state.k[0])[0] ^ U64(&state.k[32])[0];
+    U64(a)[1] = U64(&state.k[0])[1] ^ U64(&state.k[32])[1];
+    U64(b)[0] = U64(&state.k[16])[0] ^ U64(&state.k[48])[0];
+    U64(b)[1] = U64(&state.k[16])[1] ^ U64(&state.k[48])[1];
+
+    for(i = 0; i < ITER / 2; i++)
+    {
+				#define TOTALBLOCKS (MEMORY / AES_BLOCK_SIZE)
+				#define state_index(x) (((*((uint64_t *)x) >> 4) & (TOTALBLOCKS - 1)) << 4)
+
+        // Iteration 1
+        p = &long_state[state_index(a)];
+
+        if(useAes)
+            _mm_storeu_si128(R128(p), _mm_aesenc_si128(_mm_loadu_si128(R128(p)), _mm_loadu_si128(R128(a))));
+        else
+            aesb_single_round(p, p, a);
+
+        xor_blocks(b, p);
+        swap_blocks(b, p);
+        swap_blocks(a, b);
+
+        // Iteration 2
+        p = &long_state[state_index(a)];
+
+        mul(a, p, d);
+        sum_half_blocks(b, d);
+        swap_blocks(b, p);
+        xor_blocks(b, p);
+        swap_blocks(a, b);
+    }
+
+    memcpy(text, state.init, INIT_SIZE_BYTE);
+    oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);
+    memcpy(expandedKey, aes_ctx->key->exp_data, aes_ctx->key->exp_data_len);
+    if(useAes)
+    {
+        for(i = 0; i < MEMORY / INIT_SIZE_BYTE; i++)
+        {
+            for(j = 0; j < INIT_SIZE_BLK; j++)
+            {
+                xor_blocks(&text[j * AES_BLOCK_SIZE], &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE]);
+                aesni_pseudo_round(&text[j * AES_BLOCK_SIZE], &text[j * AES_BLOCK_SIZE], expandedKey);
+            }
+        }
+    }
+    else
+    {
+        for(i = 0; i < MEMORY / INIT_SIZE_BYTE; i++)
+        {
+            for(j = 0; j < INIT_SIZE_BLK; j++)
+            {
+                xor_blocks(&text[j * AES_BLOCK_SIZE], &long_state[i * INIT_SIZE_BYTE + j * AES_BLOCK_SIZE]);
+                aesb_pseudo_round(&text[AES_BLOCK_SIZE * j], &text[AES_BLOCK_SIZE * j], expandedKey);
+            }
+        }
+    }
+
+    oaes_free((OAES_CTX **) &aes_ctx);
+    memcpy(state.init, text, INIT_SIZE_BYTE);
+    hash_permutation(&state.hs);
+    extra_hashes[state.hs.b[0] & 3](&state, 200, hash);
 }

From 6d94334ad52e6dd7cb041ad6823ec217325e2613 Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Wed, 21 May 2014 09:43:59 -0700
Subject: [PATCH 19/76] Update version.h.in

1. Updated version to 0.8.8.2
---
 src/version.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.h.in b/src/version.h.in
index f3b1ae071..01d2994f8 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
-#define PROJECT_VERSION "0.8.8.1"
+#define PROJECT_VERSION "0.8.8.2"
 #define PROJECT_VERSION_BUILD_NO "1"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"

From 3c5d7468d72793612a40eee21bac6a3d727dd56a Mon Sep 17 00:00:00 2001
From: NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com>
Date: Wed, 21 May 2014 13:02:46 -0700
Subject: [PATCH 20/76] Update CMakeLists.txt

1. Fixed build error on machines not supporting aes-ni.
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 705513d66..3d367b2e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,8 +59,8 @@ else()
   else()
     set(STATIC_ASSERT_FLAG "-Dstatic_assert=_Static_assert")
   endif()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG}")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -maes")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG} -maes")
   if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_TR1_TUPLE=0")
   endif()

From 9f1ffe0473d247ac95764268baac6d0e1390b068 Mon Sep 17 00:00:00 2001
From: OracionSeis <this is my e-mail>
Date: Thu, 22 May 2014 15:00:48 +0400
Subject: [PATCH 21/76] OS X compilation fixed

---
 CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d367b2e1..e1c2586c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,11 @@ else()
   else()
     set(DEBUG_FLAGS "-g3 -O0")
   endif()
-  set(RELEASE_FLAGS "-Ofast -DNDEBUG -Wno-unused-variable -flto")
+  set(RELEASE_FLAGS "-Ofast -DNDEBUG -Wno-unused-variable")
+  if(NOT APPLE)
+    # There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled
+    set(RELEASE_FLAGS "${RELEASE_FLAGS} -flto")
+  endif()
   #if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT MINGW)
   #  set(RELEASE_FLAGS "${RELEASE_FLAGS} -fno-fat-lto-objects")
   #endif()

From 17a9ee3f8f2d8af23f9f4f3f27b38fd7f9d90c2b Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Sun, 25 May 2014 00:20:46 +0200
Subject: [PATCH 22/76] 'getaddress' wallet-rpc command

---
 src/wallet/wallet_rpc_server.cpp            | 15 +++++++++++++++
 src/wallet/wallet_rpc_server.h              |  2 ++
 src/wallet/wallet_rpc_server_commans_defs.h | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index f1766c3b4..55f81aacc 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -71,6 +71,21 @@ namespace tools
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
+  bool wallet_rpc_server::on_getaddress(const wallet_rpc::COMMAND_RPC_GET_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_GET_ADDRESS::response& res, epee::json_rpc::error& er, connection_context& cntx)
+  {
+    try
+    {
+      res.address = m_wallet.get_account().get_public_address_str();
+    }
+    catch (std::exception& e)
+    {
+      er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
+      er.message = e.what();
+      return false;
+    }
+    return true;
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
   bool wallet_rpc_server::on_transfer(const wallet_rpc::COMMAND_RPC_TRANSFER::request& req, wallet_rpc::COMMAND_RPC_TRANSFER::response& res, epee::json_rpc::error& er, connection_context& cntx)
   {
 
diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h
index db49df574..ec29e0932 100644
--- a/src/wallet/wallet_rpc_server.h
+++ b/src/wallet/wallet_rpc_server.h
@@ -36,6 +36,7 @@ namespace tools
     BEGIN_URI_MAP2()
       BEGIN_JSON_RPC_MAP("/json_rpc")
         MAP_JON_RPC_WE("getbalance",   on_getbalance,   wallet_rpc::COMMAND_RPC_GET_BALANCE)
+        MAP_JON_RPC_WE("getaddress",   on_getaddress,   wallet_rpc::COMMAND_RPC_GET_ADDRESS)
         MAP_JON_RPC_WE("transfer",     on_transfer,     wallet_rpc::COMMAND_RPC_TRANSFER)
         MAP_JON_RPC_WE("store",        on_store,        wallet_rpc::COMMAND_RPC_STORE)
         MAP_JON_RPC_WE("get_payments", on_get_payments, wallet_rpc::COMMAND_RPC_GET_PAYMENTS)
@@ -44,6 +45,7 @@ namespace tools
 
       //json_rpc
       bool on_getbalance(const wallet_rpc::COMMAND_RPC_GET_BALANCE::request& req, wallet_rpc::COMMAND_RPC_GET_BALANCE::response& res, epee::json_rpc::error& er, connection_context& cntx);
+      bool on_getaddress(const wallet_rpc::COMMAND_RPC_GET_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_GET_ADDRESS::response& res, epee::json_rpc::error& er, connection_context& cntx);
       bool on_transfer(const wallet_rpc::COMMAND_RPC_TRANSFER::request& req, wallet_rpc::COMMAND_RPC_TRANSFER::response& res, epee::json_rpc::error& er, connection_context& cntx);
       bool on_store(const wallet_rpc::COMMAND_RPC_STORE::request& req, wallet_rpc::COMMAND_RPC_STORE::response& res, epee::json_rpc::error& er, connection_context& cntx);
       bool on_get_payments(const wallet_rpc::COMMAND_RPC_GET_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_PAYMENTS::response& res, epee::json_rpc::error& er, connection_context& cntx);
diff --git a/src/wallet/wallet_rpc_server_commans_defs.h b/src/wallet/wallet_rpc_server_commans_defs.h
index b99d92ca2..cc005b29c 100644
--- a/src/wallet/wallet_rpc_server_commans_defs.h
+++ b/src/wallet/wallet_rpc_server_commans_defs.h
@@ -34,6 +34,24 @@ namespace wallet_rpc
     };
   };
 
+    struct COMMAND_RPC_GET_ADDRESS
+  {
+    struct request
+    {
+      BEGIN_KV_SERIALIZE_MAP()
+      END_KV_SERIALIZE_MAP()
+    };
+
+    struct response
+    {
+      std::string   address;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(address)
+      END_KV_SERIALIZE_MAP()
+    };
+  };
+
   struct trnsfer_destination
   {
     uint64_t amount;

From 3a3a8176782a4fa75b0607fba0393c9d4a1746be Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 13:06:40 -0400
Subject: [PATCH 23/76] 0.8.8update

---
 .gitignore                                    |   2 +-
 CMakeLists.txt                                |   6 +-
 ReleaseNotes.txt                              |  15 +-
 contrib/epee/include/console_handler.h        |  17 --
 .../epee/include/net/abstract_tcp_server2.inl |   4 +-
 .../epee/include/net/http_protocol_handler.h  |  45 ++--
 .../include/net/http_server_handlers_map2.h   |  99 +--------
 contrib/epee/include/net/net_utils_base.h     |  17 +-
 contrib/epee/include/profile_tools.h          |  10 +-
 .../serialization/keyvalue_serialization.h    |   6 +-
 .../epee/include/storages/portable_storage.h  |  24 +--
 .../portable_storage_template_helper.h        |  11 +-
 .../storages/portable_storage_to_json.h       |  59 +++---
 contrib/epee/include/string_tools.h           |   1 +
 src/crypto/oaes_lib.c                         |   1 -
 src/crypto/oaes_lib.h                         |  23 +--
 src/cryptonote_config.h                       |   6 +-
 src/cryptonote_core/blockchain_storage.cpp    | 143 ++++++++-----
 src/cryptonote_core/blockchain_storage.h      |  12 +-
 src/cryptonote_core/checkpoints.cpp           |  26 ++-
 src/cryptonote_core/checkpoints.h             |   3 +
 src/cryptonote_core/checkpoints_create.h      |   9 +-
 src/cryptonote_core/cryptonote_core.cpp       |   2 +-
 src/cryptonote_core/cryptonote_core.h         |   4 +-
 .../cryptonote_format_utils.cpp               |   3 +-
 src/cryptonote_core/miner.h                   |  13 +-
 src/cryptonote_core/tx_extra.h                |   1 -
 src/cryptonote_core/tx_pool.h                 |   2 -
 .../cryptonote_protocol_handler.h             |   4 +-
 .../cryptonote_protocol_handler.inl           |  25 ++-
 src/daemon/daemon_commands_handler.h          |  49 ++++-
 src/p2p/net_node.h                            |  25 ++-
 src/p2p/net_node.inl                          | 194 ++++++++++++------
 src/rpc/core_rpc_server.cpp                   |   4 +-
 src/serialization/crypto.h                    |   2 +
 src/serialization/serialization.h             |   6 +-
 src/simplewallet/simplewallet.cpp             |  10 +-
 src/simplewallet/simplewallet.h               |   2 +-
 src/version.h.in                              |   2 +-
 src/wallet/wallet2.cpp                        |   4 +-
 src/wallet/wallet2.h                          |   6 +-
 tests/core_tests/chaingen_main.cpp            |  12 +-
 tests/performance_tests/main.cpp              |   3 +
 43 files changed, 504 insertions(+), 408 deletions(-)

diff --git a/.gitignore b/.gitignore
index 554267b09..20a3894a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .DS_Store
 /build
-/tags
\ No newline at end of file
+/tags
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1c2586c5..28130e566 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,8 @@ else()
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_FLAGS}")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${RELEASE_FLAGS}")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${RELEASE_FLAGS}")
-  if(STATIC)
-    set_static_flags()
+  if(STATIC AND NOT APPLE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
   endif()
 endif()
 
@@ -90,7 +90,7 @@ if(STATIC)
   set(Boost_USE_STATIC_LIBS ON)
   set(Boost_USE_STATIC_RUNTIME ON)
 endif()
-find_package(Boost 1.53 REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization atomic program_options)
+find_package(Boost 1.53 REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options)
 if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 54))
   message(SEND_ERROR "Boost version 1.54 is unsupported, more details are available here http://goo.gl/RrCFmA")
 endif()
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 3aa32a238..2edc278a9 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,18 @@
 Bitmonero
 
+Release notes 0.8.8
+
+- JSON RPC v2.0 compatibility
+- JSON RPC over TCP added- Further optimizations
+- Fixed a bug with checkpoints behavior
+- UI improvements for daemon
+- Fixed COIN value (10^12)
+- Raised minimum fee to (1/2) * (10^10)
+
+Release notes 0.8.7
+
+- Slow hash optimizations
+
 Release notes 0.8.6
 
 - Simplwallet can set extra for transfers
@@ -34,4 +47,4 @@ Release notes 0.8.2
 
 Release notes 0.8.1
 
-Bytecoin project is moved to GitHub
\ No newline at end of file
+Bytecoin project is moved to GitHub
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 5798d2def..fcab35aaa 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -267,23 +267,6 @@ namespace epee
         if(0 == command.compare("exit") || 0 == command.compare("q"))
         {
           continue_handle = false;
-        }else if (!command.compare(0, 7, "set_log"))
-        {
-          //parse set_log command
-          if(command.size() != 9)
-          {
-            std::cout << "wrong syntax: " << command << std::endl << "use set_log n" << std::endl;
-            continue;
-          }
-          uint16_t n = 0;
-          if(!string_tools::get_xtype_from_string(n, command.substr(8, 1)))
-          {
-            std::cout << "wrong syntax: " << command << std::endl << "use set_log n" << std::endl;
-            continue;
-          }
-          log_space::get_set_log_detalisation_level(true, n);
-          std::cout << "New log level set " << n;
-          LOG_PRINT_L2("New log level set " << n);
         }else if (command.empty())
         {
           continue;
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 2a4b10e48..403f5a3bd 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -52,11 +52,11 @@ PRAGMA_WARNING_DISABLE_VS(4355)
     typename t_protocol_handler::config_type& config, volatile uint32_t& sock_count, i_connection_filter* &pfilter)
                           : strand_(io_service),
                             socket_(io_service),
-                            m_protocol_handler(this, config, context), 
                             m_want_close_connection(0), 
                             m_was_shutdown(0), 
                             m_ref_sockets_count(sock_count), 
-                            m_pfilter(pfilter)
+                            m_pfilter(pfilter),
+                            m_protocol_handler(this, config, context)
   {
     boost::interprocess::ipcdetail::atomic_inc32(&m_ref_sockets_count);
   }
diff --git a/contrib/epee/include/net/http_protocol_handler.h b/contrib/epee/include/net/http_protocol_handler.h
index 4bf48750e..aed909778 100644
--- a/contrib/epee/include/net/http_protocol_handler.h
+++ b/contrib/epee/include/net/http_protocol_handler.h
@@ -55,20 +55,20 @@ namespace net_utils
 		/************************************************************************/
 		/*                                                                      */
 		/************************************************************************/
-    template<class t_connection_context  = net_utils::connection_context_base>
+		template<class t_connection_context  = net_utils::connection_context_base>
 		class simple_http_connection_handler
 		{
 		public:
-      typedef t_connection_context connection_context;//t_connection_context net_utils::connection_context_base connection_context;
+			typedef t_connection_context connection_context;//t_connection_context net_utils::connection_context_base connection_context;
 			typedef http_server_config config_type;
 
 			simple_http_connection_handler(i_service_endpoint* psnd_hndlr, config_type& config);
 			virtual ~simple_http_connection_handler(){}
 
-      bool release_protocol()
-      {
-        return true;
-      }
+			bool release_protocol()
+			{
+				return true;
+			}
 
 			virtual bool thread_init()
 			{
@@ -85,10 +85,6 @@ namespace net_utils
 			}
 			virtual bool handle_recv(const void* ptr, size_t cb);
 			virtual bool handle_request(const http::http_request_info& query_info, http_response_info& response);
-    
-      
-      //temporary here
-      //bool parse_uri(const std::string uri, uri_content& content);
 
 		private:
 			enum machine_state{
@@ -142,34 +138,37 @@ namespace net_utils
 			i_service_endpoint* m_psnd_hndlr; 
 		};
 
-    template<class t_connection_context>
+		template<class t_connection_context>
 		struct i_http_server_handler
 		{
 			virtual ~i_http_server_handler(){}
-			virtual bool handle_http_request(const http_request_info& query_info, http_response_info& response, t_connection_context& m_conn_context)=0;
-      virtual bool init_server_thread(){return true;}
+			virtual bool handle_http_request(const http_request_info& query_info,
+																						 http_response_info& response,
+																						 t_connection_context& m_conn_context) = 0;
+			virtual bool init_server_thread(){return true;}
 			virtual bool deinit_server_thread(){return true;}
 		};
 
-    template<class t_connection_context>
+		template<class t_connection_context>
 		struct custum_handler_config: public http_server_config
 		{
 			i_http_server_handler<t_connection_context>* m_phandler;
 		};
 
-    /************************************************************************/
-    /*                                                                      */
-    /************************************************************************/
+		/************************************************************************/
+		/*                                                                      */
+		/************************************************************************/
 
-    template<class t_connection_context = net_utils::connection_context_base>
+		template<class t_connection_context = net_utils::connection_context_base>
 		class http_custom_handler: public simple_http_connection_handler<t_connection_context>
 		{
 		public:
 			typedef custum_handler_config<t_connection_context> config_type;
 			
-			http_custom_handler(i_service_endpoint* psnd_hndlr, config_type& config, t_connection_context& conn_context):simple_http_connection_handler<t_connection_context>(psnd_hndlr, config), 
-				m_config(config),
-				m_conn_context(conn_context)
+			http_custom_handler(i_service_endpoint* psnd_hndlr, config_type& config, t_connection_context& conn_context)
+				: simple_http_connection_handler<t_connection_context>(psnd_hndlr, config),
+					m_config(config),
+					m_conn_context(conn_context)
 			{}
 			inline bool handle_request(const http_request_info& query_info, http_response_info& response)
 			{
@@ -191,8 +190,8 @@ namespace net_utils
 			{
 				return m_config.m_phandler->deinit_server_thread();
 			}
-      void handle_qued_callback()   
-      {}
+			void handle_qued_callback()
+			{}
 			bool after_init_connection()
 			{
 				return true;
diff --git a/contrib/epee/include/net/http_server_handlers_map2.h b/contrib/epee/include/net/http_server_handlers_map2.h
index af4e035f8..201460130 100644
--- a/contrib/epee/include/net/http_server_handlers_map2.h
+++ b/contrib/epee/include/net/http_server_handlers_map2.h
@@ -26,9 +26,10 @@
 
 
 #pragma once 
-#include "serialization/keyvalue_serialization.h"
-#include "storages/portable_storage_template_helper.h"
 #include "http_base.h"
+#include "jsonrpc_structs.h"
+#include "storages/portable_storage.h"
+#include "storages/portable_storage_template_helper.h"
 
 
 #define CHAIN_HTTP_TO_MAP2(context_type) bool handle_http_request(const epee::net_utils::http::http_request_info& query_info, \
@@ -109,98 +110,6 @@
 #define END_URI_MAP2() return handled;}
 
 
-
-
-namespace epee 
-{
-  namespace json_rpc
-  {
-    template<typename t_param>
-    struct request
-    {
-      std::string jsonrpc;
-      std::string method;
-      epee::serialization::storage_entry id;
-      t_param     params;
-
-      BEGIN_KV_SERIALIZE_MAP()
-        KV_SERIALIZE(jsonrpc)
-        KV_SERIALIZE(id)
-        KV_SERIALIZE(method)
-        KV_SERIALIZE(params)
-      END_KV_SERIALIZE_MAP()
-    };
-
-    struct error
-    {
-      int64_t code;
-      std::string message;
-      BEGIN_KV_SERIALIZE_MAP()
-        KV_SERIALIZE(code)
-        KV_SERIALIZE(message)
-      END_KV_SERIALIZE_MAP()
-    };
-    
-    struct dummy_error
-    {
-      BEGIN_KV_SERIALIZE_MAP()
-      END_KV_SERIALIZE_MAP()
-    };
-
-    struct dummy_result
-    {
-      BEGIN_KV_SERIALIZE_MAP()
-      END_KV_SERIALIZE_MAP()
-    };
-
-    template<typename t_param, typename t_error>
-    struct response
-    {
-      std::string jsonrpc;
-      t_param     result;
-      epee::serialization::storage_entry id;
-      t_error     error;
-      BEGIN_KV_SERIALIZE_MAP()
-        KV_SERIALIZE(jsonrpc)
-        KV_SERIALIZE(id)
-        KV_SERIALIZE(result)
-        KV_SERIALIZE(error)
-      END_KV_SERIALIZE_MAP()
-    };
-
-    template<typename t_param>
-    struct response<t_param, dummy_error>
-    {
-      std::string jsonrpc;
-      t_param     result;
-      epee::serialization::storage_entry id;
-      BEGIN_KV_SERIALIZE_MAP()
-        KV_SERIALIZE(jsonrpc)
-        KV_SERIALIZE(id)
-        KV_SERIALIZE(result)
-      END_KV_SERIALIZE_MAP()
-    };
-
-    template<typename t_error>
-    struct response<dummy_result, t_error>
-    {
-      std::string jsonrpc;
-      t_error     error;
-      epee::serialization::storage_entry id;
-      BEGIN_KV_SERIALIZE_MAP()
-        KV_SERIALIZE(jsonrpc)
-        KV_SERIALIZE(id)
-        KV_SERIALIZE(error)
-      END_KV_SERIALIZE_MAP()
-    };
-
-    typedef response<dummy_result, error> error_response;
-  }
-}
-
-
-
-
 #define BEGIN_JSON_RPC_MAP(uri)    else if(query_info.m_URI == uri) \
     { \
     uint64_t ticks = epee::misc_utils::get_tick_count(); \
@@ -315,6 +224,6 @@ namespace epee
   rsp.error.message = "Method not found"; \
   epee::serialization::store_t_to_json(static_cast<epee::json_rpc::error_response&>(rsp), response_info.m_body); \
   return true; \
-  }
+}
 
 
diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h
index 793135b87..b5619bab3 100644
--- a/contrib/epee/include/net/net_utils_base.h
+++ b/contrib/epee/include/net/net_utils_base.h
@@ -47,8 +47,8 @@ namespace net_utils
 	struct connection_context_base
 	{
     const boost::uuids::uuid m_connection_id;
-		const uint32_t m_remote_ip;
-		const uint32_t m_remote_port;
+    const uint32_t m_remote_ip;
+    const uint32_t m_remote_port;
     const bool     m_is_income;
     const time_t   m_started;
     time_t   m_last_recv;
@@ -56,27 +56,30 @@ namespace net_utils
     uint64_t m_recv_cnt;
     uint64_t m_send_cnt;
 
-    connection_context_base(boost::uuids::uuid connection_id, long remote_ip, int remote_port, bool is_income, time_t last_recv = 0, time_t last_send = 0, uint64_t recv_cnt = 0, uint64_t send_cnt = 0):
+    connection_context_base(boost::uuids::uuid connection_id,
+                            long remote_ip, int remote_port, bool is_income,
+                            time_t last_recv = 0, time_t last_send = 0,
+                            uint64_t recv_cnt = 0, uint64_t send_cnt = 0):
                                             m_connection_id(connection_id),
                                             m_remote_ip(remote_ip),
                                             m_remote_port(remote_port),
                                             m_is_income(is_income),
+                                            m_started(time(NULL)),
                                             m_last_recv(last_recv),
                                             m_last_send(last_send),
                                             m_recv_cnt(recv_cnt),
-                                            m_send_cnt(send_cnt),
-                                            m_started(time(NULL))
+                                            m_send_cnt(send_cnt)
     {}
 
     connection_context_base(): m_connection_id(),
                                m_remote_ip(0),
                                m_remote_port(0),
                                m_is_income(false),
+                               m_started(time(NULL)),
                                m_last_recv(0),
                                m_last_send(0),
                                m_recv_cnt(0),
-                               m_send_cnt(0),
-                               m_started(time(NULL))
+                               m_send_cnt(0)
     {}
 
     connection_context_base& operator=(const connection_context_base& a)
diff --git a/contrib/epee/include/profile_tools.h b/contrib/epee/include/profile_tools.h
index be45feafe..0e1646f60 100644
--- a/contrib/epee/include/profile_tools.h
+++ b/contrib/epee/include/profile_tools.h
@@ -51,13 +51,13 @@ namespace epee
 #define PROFILE_FUNC_THIRD(immortal_ptr_str)
 #endif
 
-#define START_WAY_POINTS() uint64_t _____way_point_time = misc_utils::get_tick_count();
-#define WAY_POINT(name) {uint64_t delta = misc_utils::get_tick_count()-_____way_point_time; LOG_PRINT("Way point " << name << ": " << delta, LOG_LEVEL_2);_____way_point_time = misc_utils::get_tick_count();}
-#define WAY_POINT2(name, avrg_obj) {uint64_t delta = misc_utils::get_tick_count()-_____way_point_time; avrg_obj.push(delta); LOG_PRINT("Way point " << name << ": " << delta, LOG_LEVEL_2);_____way_point_time = misc_utils::get_tick_count();}
+#define START_WAY_POINTS() uint64_t _____way_point_time = epee::misc_utils::get_tick_count();
+#define WAY_POINT(name) {uint64_t delta = epee::misc_utils::get_tick_count()-_____way_point_time; LOG_PRINT("Way point " << name << ": " << delta, LOG_LEVEL_2);_____way_point_time = misc_utils::get_tick_count();}
+#define WAY_POINT2(name, avrg_obj) {uint64_t delta = epee::misc_utils::get_tick_count()-_____way_point_time; avrg_obj.push(delta); LOG_PRINT("Way point " << name << ": " << delta, LOG_LEVEL_2);_____way_point_time = misc_utils::get_tick_count();}
 
 
-#define TIME_MEASURE_START(var_name)    uint64_t var_name = misc_utils::get_tick_count();
-#define TIME_MEASURE_FINISH(var_name)   var_name = misc_utils::get_tick_count() - var_name;
+#define TIME_MEASURE_START(var_name)    uint64_t var_name = epee::misc_utils::get_tick_count();
+#define TIME_MEASURE_FINISH(var_name)   var_name = epee::misc_utils::get_tick_count() - var_name;
 
 namespace profile_tools
 {
diff --git a/contrib/epee/include/serialization/keyvalue_serialization.h b/contrib/epee/include/serialization/keyvalue_serialization.h
index 27fb0f1e2..bf2c8dacd 100644
--- a/contrib/epee/include/serialization/keyvalue_serialization.h
+++ b/contrib/epee/include/serialization/keyvalue_serialization.h
@@ -31,6 +31,8 @@
 #include "misc_log_ex.h"
 #include "enableable.h"
 #include "keyvalue_serialization_overloads.h"
+#include "serialization/serialization.h"
+
 namespace epee
 {
   /************************************************************************/
@@ -41,12 +43,12 @@ public: \
   template<class t_storage> \
   bool store( t_storage& st, typename t_storage::hsection hparent_section = nullptr) const\
   {\
-  return serialize_map<true>(*this, st, hparent_section);\
+    return serialize_map<true>(*this, st, hparent_section);\
   }\
   template<class t_storage> \
   bool _load( t_storage& stg, typename t_storage::hsection hparent_section = nullptr)\
   {\
-  return serialize_map<false>(*this, stg, hparent_section);\
+    return serialize_map<false>(*this, stg, hparent_section);\
   }\
   template<class t_storage> \
   bool load( t_storage& stg, typename t_storage::hsection hparent_section = nullptr)\
diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
index c244dac19..bbfe5f85c 100644
--- a/contrib/epee/include/storages/portable_storage.h
+++ b/contrib/epee/include/storages/portable_storage.h
@@ -83,7 +83,7 @@ namespace epee
       bool		load_from_binary(const binarybuffer& target);
       template<class trace_policy>
       bool		  dump_as_xml(std::string& targetObj, const std::string& root_name = "");
-      bool		  dump_as_json(std::string& targetObj, size_t indent = 0);
+      bool		  dump_as_json(std::string& targetObj, size_t indent = 0, bool insert_newlines = true);
       bool		  load_from_json(const std::string& source);
 
     private:
@@ -106,17 +106,17 @@ namespace epee
 #pragma pack(pop)
     };
     inline
-    bool		  portable_storage::dump_as_json(std::string& buff, size_t indent)
+    bool portable_storage::dump_as_json(std::string& buff, size_t indent, bool insert_newlines)
     {
       TRY_ENTRY();
       std::stringstream ss;
-      epee::serialization::dump_as_json(ss, m_root, indent);
+      epee::serialization::dump_as_json(ss, m_root, indent, insert_newlines);
       buff = ss.str();
       return true;
       CATCH_ENTRY("portable_storage::dump_as_json", false)
     }
     inline
-    bool		portable_storage::load_from_json(const std::string& source)
+    bool portable_storage::load_from_json(const std::string& source)
     {
       TRY_ENTRY();
       return json::load_from_json(source, *this);
@@ -124,13 +124,13 @@ namespace epee
     }
 
     template<class trace_policy>
-    bool		  portable_storage::dump_as_xml(std::string& targetObj, const std::string& root_name)
+    bool portable_storage::dump_as_xml(std::string& targetObj, const std::string& root_name)
     {
       return false;//TODO: don't think i ever again will use xml - ambiguous and "overtagged" format
     }
 
     inline
-    bool		portable_storage::store_to_binary(binarybuffer& target)
+    bool portable_storage::store_to_binary(binarybuffer& target)
     {
       TRY_ENTRY();
       std::stringstream ss;
@@ -145,7 +145,7 @@ namespace epee
       CATCH_ENTRY("portable_storage::store_to_binary", false)
     }
     inline
-    bool		portable_storage::load_from_binary(const binarybuffer& source)
+    bool portable_storage::load_from_binary(const binarybuffer& source)
     {
       m_root.m_entries.clear();
       if(source.size() < sizeof(storage_block_header))
@@ -174,7 +174,7 @@ namespace epee
     }
     //---------------------------------------------------------------------------------------------------------------
     inline
-    hsection   portable_storage::open_section(const std::string& section_name,  hsection hparent_section, bool create_if_notexist)
+    hsection portable_storage::open_section(const std::string& section_name,  hsection hparent_section, bool create_if_notexist)
     {
       TRY_ENTRY();
       hparent_section = hparent_section ? hparent_section:&m_root;
@@ -238,7 +238,7 @@ namespace epee
     }
     //---------------------------------------------------------------------------------------------------------------
     template<class t_value>
-    bool       portable_storage::set_value(const std::string& value_name, const t_value& v, hsection hparent_section)        
+    bool portable_storage::set_value(const std::string& value_name, const t_value& v, hsection hparent_section)        
     {
       BOOST_MPL_ASSERT(( boost::mpl::contains<boost::mpl::push_front<storage_entry::types, storage_entry>::type, t_value> )); 
       TRY_ENTRY();
@@ -345,7 +345,7 @@ namespace epee
 
 
     template<class t_value>
-    bool          portable_storage::get_next_value(harray hval_array, t_value& target)
+    bool portable_storage::get_next_value(harray hval_array, t_value& target)
     {
       BOOST_MPL_ASSERT(( boost::mpl::contains<storage_entry::types, t_value> )); 
       //TRY_ENTRY();
@@ -462,7 +462,7 @@ namespace epee
     }
     //---------------------------------------------------------------------------------------------------------------
     inline
-    bool            portable_storage::insert_next_section(harray hsec_array, hsection& hinserted_childsection)
+    bool portable_storage::insert_next_section(harray hsec_array, hsection& hinserted_childsection)
     {
       TRY_ENTRY();
       CHECK_AND_ASSERT(hsec_array, false);
@@ -476,4 +476,4 @@ namespace epee
     }
     //---------------------------------------------------------------------------------------------------------------
   }
-}
\ No newline at end of file
+}
diff --git a/contrib/epee/include/storages/portable_storage_template_helper.h b/contrib/epee/include/storages/portable_storage_template_helper.h
index 2163cb879..008f44321 100644
--- a/contrib/epee/include/storages/portable_storage_template_helper.h
+++ b/contrib/epee/include/storages/portable_storage_template_helper.h
@@ -25,6 +25,9 @@
 // 
 
 #pragma once
+
+#include <string>
+
 #include "parserse_base_utils.h"
 #include "portable_storage.h"
 #include "file_io_utils.h"
@@ -56,19 +59,19 @@ namespace epee
     }
     //-----------------------------------------------------------------------------------------------------------
     template<class t_struct>
-    bool store_t_to_json(t_struct& str_in, std::string& json_buff, size_t indent = 0)
+    bool store_t_to_json(t_struct& str_in, std::string& json_buff, size_t indent = 0, bool insert_newlines = true)
     {
       portable_storage ps;
       str_in.store(ps);
-      ps.dump_as_json(json_buff, indent);
+      ps.dump_as_json(json_buff, indent, insert_newlines);
       return true;
     }
     //-----------------------------------------------------------------------------------------------------------
     template<class t_struct>
-    std::string store_t_to_json(t_struct& str_in, size_t indent = 0)
+    std::string store_t_to_json(t_struct& str_in, size_t indent = 0, bool insert_newlines = true)
     {
       std::string json_buff;
-      store_t_to_json(str_in, json_buff, indent);
+      store_t_to_json(str_in, json_buff, indent, insert_newlines);
       return std::move(json_buff);
     }
     //-----------------------------------------------------------------------------------------------------------
diff --git a/contrib/epee/include/storages/portable_storage_to_json.h b/contrib/epee/include/storages/portable_storage_to_json.h
index aff85b201..e3fdcec29 100644
--- a/contrib/epee/include/storages/portable_storage_to_json.h
+++ b/contrib/epee/include/storages/portable_storage_to_json.h
@@ -30,6 +30,7 @@
 
 #include "misc_language.h"
 #include "portable_storage_base.h"
+#include "parserse_base_utils.h"
 
 namespace epee
 {
@@ -37,21 +38,21 @@ namespace epee
   {
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const array_entry& ae, size_t indent);
+    void dump_as_json(t_stream& strm, const array_entry& ae, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const storage_entry& se, size_t indent);
+    void dump_as_json(t_stream& strm, const storage_entry& se, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const std::string& v, size_t indent);
+    void dump_as_json(t_stream& strm, const std::string& v, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const int8_t& v, size_t indent);
+    void dump_as_json(t_stream& strm, const int8_t& v, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const uint8_t& v, size_t indent);
+    void dump_as_json(t_stream& strm, const uint8_t& v, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const bool& v, size_t indent);
+    void dump_as_json(t_stream& strm, const bool& v, size_t indent, bool insert_newlines);
     template<class t_stream, class t_type>
-    void dump_as_json(t_stream& strm, const t_type& v, size_t indent);
+    void dump_as_json(t_stream& strm, const t_type& v, size_t indent, bool insert_newlines);
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const section& sec, size_t indent);
+    void dump_as_json(t_stream& strm, const section& sec, size_t indent, bool insert_newlines);
 
 
     inline std::string make_indent(size_t indent)
@@ -64,7 +65,11 @@ namespace epee
     {
       t_stream& m_strm;
       size_t m_indent;
-      array_entry_store_to_json_visitor(t_stream& strm, size_t indent):m_strm(strm), m_indent(indent){}
+      bool m_insert_newlines;
+      array_entry_store_to_json_visitor(t_stream& strm, size_t indent,
+                                        bool insert_newlines = true)
+        : m_strm(strm), m_indent(indent), m_insert_newlines(insert_newlines)
+      {}
 
       template<class t_type>
       void operator()(const array_entry_t<t_type>& a)
@@ -75,7 +80,7 @@ namespace epee
           auto last_it = --a.m_array.end();
           for(auto it = a.m_array.begin(); it != a.m_array.end(); it++)
           {
-            dump_as_json(m_strm, *it, m_indent);
+            dump_as_json(m_strm, *it, m_indent, m_insert_newlines);
             if(it != last_it)
               m_strm << ",";
           }
@@ -89,50 +94,53 @@ namespace epee
     {
       t_stream& m_strm;
       size_t m_indent;
-      storage_entry_store_to_json_visitor(t_stream& strm, size_t indent):m_strm(strm), m_indent(indent)
+      bool m_insert_newlines;
+      storage_entry_store_to_json_visitor(t_stream& strm, size_t indent,
+                                          bool insert_newlines = true)
+          : m_strm(strm), m_indent(indent), m_insert_newlines(insert_newlines)
       {}
       //section, array_entry
       template<class visited_type>
       void operator()(const visited_type& v)
       { 
-        dump_as_json(m_strm, v, m_indent);
+        dump_as_json(m_strm, v, m_indent, m_insert_newlines);
       }
     };
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const array_entry& ae, size_t indent)
+    void dump_as_json(t_stream& strm, const array_entry& ae, size_t indent, bool insert_newlines)
     {
-      array_entry_store_to_json_visitor<t_stream> aesv(strm, indent);
+      array_entry_store_to_json_visitor<t_stream> aesv(strm, indent, insert_newlines);
       boost::apply_visitor(aesv, ae);
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const storage_entry& se, size_t indent)
+    void dump_as_json(t_stream& strm, const storage_entry& se, size_t indent, bool insert_newlines)
     {
-      storage_entry_store_to_json_visitor<t_stream> sv(strm, indent);
+      storage_entry_store_to_json_visitor<t_stream> sv(strm, indent, insert_newlines);
       boost::apply_visitor(sv, se);
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const std::string& v, size_t indent)
+    void dump_as_json(t_stream& strm, const std::string& v, size_t indent, bool insert_newlines)
     {
       strm << "\"" << misc_utils::parse::transform_to_escape_sequence(v) << "\"";
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const int8_t& v, size_t indent)
+    void dump_as_json(t_stream& strm, const int8_t& v, size_t indent, bool insert_newlines)
     {
       strm << static_cast<int32_t>(v);
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const uint8_t& v, size_t indent)
+    void dump_as_json(t_stream& strm, const uint8_t& v, size_t indent, bool insert_newlines)
     {
       strm << static_cast<int32_t>(v);
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const bool& v, size_t indent)
+    void dump_as_json(t_stream& strm, const bool& v, size_t indent, bool insert_newlines)
     {
       if(v)
         strm << "true";
@@ -143,16 +151,17 @@ namespace epee
 
 
     template<class t_stream, class t_type>
-    void dump_as_json(t_stream& strm, const t_type& v, size_t indent)
+    void dump_as_json(t_stream& strm, const t_type& v, size_t indent, bool insert_newlines)
     {
       strm << v;
     }
 
     template<class t_stream>
-    void dump_as_json(t_stream& strm, const section& sec, size_t indent)
+    void dump_as_json(t_stream& strm, const section& sec, size_t indent, bool insert_newlines)
     {
       size_t local_indent = indent + 1;
-      strm << "{\r\n";
+      std::string newline = insert_newlines ? "\r\n" : "";
+      strm << "{" << newline;
       std::string indent_str = make_indent(local_indent);
       if(sec.m_entries.size())
       {
@@ -160,10 +169,10 @@ namespace epee
         for(auto it = sec.m_entries.begin(); it!= sec.m_entries.end();it++)
         {
           strm << indent_str << "\"" << misc_utils::parse::transform_to_escape_sequence(it->first) << "\"" << ": ";
-          dump_as_json(strm, it->second, local_indent);
+          dump_as_json(strm, it->second, local_indent, insert_newlines);
           if(it_last != it)
             strm << ",";
-          strm << "\r\n";
+          strm << newline;
         }
       }
       strm << make_indent(indent) <<  "}";
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h
index 4cc88418c..8289ee0ba 100644
--- a/contrib/epee/include/string_tools.h
+++ b/contrib/epee/include/string_tools.h
@@ -32,6 +32,7 @@
 //#include <objbase.h>
 #include <locale>
 #include <cstdlib>
+#include <iomanip>
 //#include <strsafe.h>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c
index 96f038600..f3f2aac8c 100644
--- a/src/crypto/oaes_lib.c
+++ b/src/crypto/oaes_lib.c
@@ -64,7 +64,6 @@ static const char _NR[] = {
 # define min(a,b) (((a)<(b)) ? (a) : (b))
 #endif /* min */
 
-
 // "OAES<8-bit header version><8-bit type><16-bit options><8-bit flags><56-bit reserved>"
 static uint8_t oaes_header[OAES_BLOCK_SIZE] = {
 	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
diff --git a/src/crypto/oaes_lib.h b/src/crypto/oaes_lib.h
index 16b914c7a..fd1942822 100644
--- a/src/crypto/oaes_lib.h
+++ b/src/crypto/oaes_lib.h
@@ -32,6 +32,7 @@
 #define _OAES_LIB_H
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #ifdef __cplusplus 
 extern "C" {
@@ -101,15 +102,14 @@ typedef int ( * oaes_step_cb ) (
 
 typedef uint16_t OAES_OPTION;
 
-
 typedef struct _oaes_key
 {
-	size_t data_len;
-	uint8_t *data;
-	size_t exp_data_len;
-	uint8_t *exp_data;
-	size_t num_keys;
-	size_t key_base;
+  size_t data_len;
+  uint8_t *data;
+  size_t exp_data_len;
+  uint8_t *exp_data;
+  size_t num_keys;
+  size_t key_base;
 } oaes_key;
 
 typedef struct _oaes_ctx
@@ -119,14 +119,13 @@ typedef struct _oaes_ctx
 #endif // OAES_HAVE_ISAAC
 
 #ifdef OAES_DEBUG
-	oaes_step_cb step_cb;
+  oaes_step_cb step_cb;
 #endif // OAES_DEBUG
 
-	oaes_key * key;
-	OAES_OPTION options;
-	uint8_t iv[OAES_BLOCK_SIZE];
+  oaes_key * key;
+  OAES_OPTION options;
+  uint8_t iv[OAES_BLOCK_SIZE];
 } oaes_ctx;
-
 /*
  * // usage:
  * 
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index 34d053aa8..a992a9db0 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -8,7 +8,7 @@
 #define CRYPTONOTE_MAX_BLOCK_SIZE                       500000000  // block header blob limit, never used!
 #define CRYPTONOTE_MAX_TX_SIZE                          1000000000
 #define CRYPTONOTE_PUBLIC_ADDRESS_TEXTBLOB_VER          0
-#define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX         18 // addresses start with "2"
+#define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX         18 // addresses start with "4"
 #define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW            60
 #define CURRENT_TRANSACTION_VERSION                     1
 #define CURRENT_BLOCK_MAJOR_VERSION                     1
@@ -26,8 +26,8 @@
 #define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE          600
 #define CRYPTONOTE_DISPLAY_DECIMAL_POINT                12
 // COIN - number of smallest units in one coin
-#define COIN                                            ((uint64_t)100000000) // pow(10, 8)
-#define DEFAULT_FEE                                     ((uint64_t)1000000) // pow(10, 6)
+#define COIN                                            ((uint64_t)1000000000000) // pow(10, 12)
+#define DEFAULT_FEE                                     ((uint64_t)5000000000) // 5 * pow(10, 9)
 
 
 #define ORPHANED_BLOCKS_MAX_COUNT                       100
diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp
index 0e20b454b..7123b7521 100644
--- a/src/cryptonote_core/blockchain_storage.cpp
+++ b/src/cryptonote_core/blockchain_storage.cpp
@@ -372,7 +372,7 @@ bool blockchain_storage::rollback_blockchain_switching(std::list<block>& origina
   return true;
 }
 //------------------------------------------------------------------
-bool blockchain_storage::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::iterator>& alt_chain)
+bool blockchain_storage::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::iterator>& alt_chain, bool discard_disconnected_chain)
 {
   CRITICAL_REGION_LOCAL(m_blockchain_lock);
   CHECK_AND_ASSERT_MES(alt_chain.size(), false, "switch_to_alternative_blockchain: empty chain passed");
@@ -414,16 +414,19 @@ bool blockchain_storage::switch_to_alternative_blockchain(std::list<blocks_ext_b
     }
   }
 
-  //pushing old chain as alternative chain
-  BOOST_FOREACH(auto& old_ch_ent, disconnected_chain)
+  if(!discard_disconnected_chain)
   {
-    block_verification_context bvc = boost::value_initialized<block_verification_context>();
-    bool r = handle_alternative_block(old_ch_ent, get_block_hash(old_ch_ent), bvc);
-    if(!r)
+    //pushing old chain as alternative chain
+    BOOST_FOREACH(auto& old_ch_ent, disconnected_chain)
     {
-      LOG_ERROR("Failed to push ex-main chain blocks to alternative chain ");
-      rollback_blockchain_switching(disconnected_chain, split_height);
-      return false;
+      block_verification_context bvc = boost::value_initialized<block_verification_context>();
+      bool r = handle_alternative_block(old_ch_ent, get_block_hash(old_ch_ent), bvc);
+      if(!r)
+      {
+        LOG_ERROR("Failed to push ex-main chain blocks to alternative chain ");
+        rollback_blockchain_switching(disconnected_chain, split_height);
+        return false;
+      }
     }
   }
 
@@ -701,6 +704,22 @@ bool blockchain_storage::handle_alternative_block(const block& b, const crypto::
 {
   CRITICAL_REGION_LOCAL(m_blockchain_lock);
 
+  uint64_t block_height = get_block_height(b);
+  if(0 == block_height)
+  {
+    LOG_ERROR("Block with id: " << string_tools::pod_to_hex(id) << " (as alternative) have wrong miner transaction");
+    bvc.m_verifivation_failed = true;
+    return false;
+  }
+  if (!m_checkpoints.is_alternative_block_allowed(get_current_blockchain_height(), block_height))
+  {
+    LOG_PRINT_RED_L0("Block with id: " << id
+      << ENDL << " can't be accepted for alternative chain, block height: " << block_height
+      << ENDL << " blockchain height: " << get_current_blockchain_height());
+    bvc.m_verifivation_failed = true;
+    return false;
+  }
+
   //block is not related with head of main chain
   //first of all - look in alternative chains container
   auto it_main_prev = m_blocks_index.find(b.prev_id);
@@ -746,31 +765,28 @@ bool blockchain_storage::handle_alternative_block(const block& b, const crypto::
     block_extended_info bei = boost::value_initialized<block_extended_info>();
     bei.bl = b;
     bei.height = alt_chain.size() ? it_prev->second.height + 1 : it_main_prev->second + 1;
+
+    bool is_a_checkpoint;
+    if(!m_checkpoints.check_block(bei.height, id, is_a_checkpoint))
+    {
+      LOG_ERROR("CHECKPOINT VALIDATION FAILED");
+      bvc.m_verifivation_failed = true;
+      return false;
+    }
+
+    // Always check PoW for alternative blocks
+    m_is_in_checkpoint_zone = false;
     difficulty_type current_diff = get_next_difficulty_for_alternative_chain(alt_chain, bei);
     CHECK_AND_ASSERT_MES(current_diff, false, "!!!!!!! DIFFICULTY OVERHEAD !!!!!!!");
     crypto::hash proof_of_work = null_hash;
-    if(!m_checkpoints.is_in_checkpoint_zone(bei.height))
+    get_block_longhash(bei.bl, proof_of_work, bei.height);
+    if(!check_hash(proof_of_work, current_diff))
     {
-      m_is_in_checkpoint_zone = false;
-      get_block_longhash(bei.bl, proof_of_work, bei.height);
-
-      if(!check_hash(proof_of_work, current_diff))
-      {
-        LOG_PRINT_RED_L0("Block with id: " << id
-          << ENDL << " for alternative chain, have not enough proof of work: " << proof_of_work
-          << ENDL << " expected difficulty: " << current_diff);
-        bvc.m_verifivation_failed = true;
-        return false;
-      }
-    }else
-    {
-      m_is_in_checkpoint_zone = true;
-      if(!m_checkpoints.check_block(bei.height, id))
-      {
-        LOG_ERROR("CHECKPOINT VALIDATION FAILED");
-        bvc.m_verifivation_failed = true;
-        return false;
-      }
+      LOG_PRINT_RED_L0("Block with id: " << id
+        << ENDL << " for alternative chain, have not enough proof of work: " << proof_of_work
+        << ENDL << " expected difficulty: " << current_diff);
+      bvc.m_verifivation_failed = true;
+      return false;
     }
 
     if(!prevalidate_miner_transaction(b, bei.height))
@@ -792,22 +808,33 @@ bool blockchain_storage::handle_alternative_block(const block& b, const crypto::
     auto i_res = m_alternative_chains.insert(blocks_ext_by_hash::value_type(id, bei));
     CHECK_AND_ASSERT_MES(i_res.second, false, "insertion of new alternative block returned as it already exist");
     alt_chain.push_back(i_res.first);
-    //check if difficulty bigger then in main chain
-    if(m_blocks.back().cumulative_difficulty < bei.cumulative_difficulty)
+
+    if(is_a_checkpoint)
     {
       //do reorganize!
-      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_blocks.size() -1  << " with cum_difficulty " << m_blocks.back().cumulative_difficulty
-        << ENDL << " alternative blockchain size: " << alt_chain.size() << " with cum_difficulty " << bei.cumulative_difficulty, LOG_LEVEL_0);
-      bool r = switch_to_alternative_blockchain(alt_chain);
+      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_blocks.size() - 1 <<
+        ", checkpoint is found in alternative chain on height " << bei.height, LOG_LEVEL_0);
+      bool r = switch_to_alternative_blockchain(alt_chain, true);
       if(r) bvc.m_added_to_main_chain = true;
       else bvc.m_verifivation_failed = true;
       return r;
+    }else if(m_blocks.back().cumulative_difficulty < bei.cumulative_difficulty) //check if difficulty bigger then in main chain
+    {
+      //do reorganize!
+      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_blocks.size() - 1 << " with cum_difficulty " << m_blocks.back().cumulative_difficulty
+        << ENDL << " alternative blockchain size: " << alt_chain.size() << " with cum_difficulty " << bei.cumulative_difficulty, LOG_LEVEL_0);
+      bool r = switch_to_alternative_blockchain(alt_chain, false);
+      if(r) bvc.m_added_to_main_chain = true;
+      else bvc.m_verifivation_failed = true;
+      return r;
+    }else
+    {
+      LOG_PRINT_BLUE("----- BLOCK ADDED AS ALTERNATIVE ON HEIGHT " << bei.height
+        << ENDL << "id:\t" << id
+        << ENDL << "PoW:\t" << proof_of_work
+        << ENDL << "difficulty:\t" << current_diff, LOG_LEVEL_0);
+      return true;
     }
-    LOG_PRINT_BLUE("----- BLOCK ADDED AS ALTERNATIVE ON HEIGHT " << bei.height
-      << ENDL << "id:\t" << id
-      << ENDL << "PoW:\t" << proof_of_work
-      << ENDL << "difficulty:\t" << current_diff, LOG_LEVEL_0);
-    return true;
   }else
   {
     //block orphaned
@@ -815,7 +842,6 @@ bool blockchain_storage::handle_alternative_block(const block& b, const crypto::
     LOG_PRINT_RED_L0("Block recognized as orphaned and rejected, id = " << id);
   }
 
-
   return true;
 }
 //------------------------------------------------------------------
@@ -1480,19 +1506,27 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
   TIME_MEASURE_FINISH(target_calculating_time);
   TIME_MEASURE_START(longhash_calculating_time);
   crypto::hash proof_of_work = null_hash;
-  if(!m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height()))
-  {
-    proof_of_work = get_block_longhash(bl, m_blocks.size());
 
-    if(!check_hash(proof_of_work, current_diffic))
-    {
-      LOG_PRINT_L0("Block with id: " << id << ENDL
-        << "have not enough proof of work: " << proof_of_work << ENDL
-        << "nexpected difficulty: " << current_diffic );
-      bvc.m_verifivation_failed = true;
-      return false;
-    }
-  }else
+  // Formerly the code below contained an if loop with the following condition
+  // !m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height())
+  // however, this caused the daemon to not bother checking PoW for blocks
+  // before checkpoints, which is very dangerous behaviour. We moved the PoW
+  // validation out of the next chunk of code to make sure that we correctly
+  // check PoW now.
+  proof_of_work = get_block_longhash(bl, m_blocks.size());
+
+  if(!check_hash(proof_of_work, current_diffic))
+  {
+    LOG_PRINT_L0("Block with id: " << id << ENDL
+      << "have not enough proof of work: " << proof_of_work << ENDL
+      << "nexpected difficulty: " << current_diffic );
+    bvc.m_verifivation_failed = true;
+    return false;
+  }
+
+  // If we're at a checkpoint, ensure that our hardcoded checkpoint hash
+  // is correct.
+  if(!m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height()))
   {
     if(!m_checkpoints.check_block(get_current_blockchain_height(), id))
     {
@@ -1501,6 +1535,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
       return false;
     }
   }
+
   TIME_MEASURE_FINISH(longhash_calculating_time);
 
   if(!prevalidate_miner_transaction(bl, m_blocks.size()))
@@ -1648,4 +1683,4 @@ bool blockchain_storage::add_new_block(const block& bl_, block_verification_cont
   }
 
   return handle_block_to_main_chain(bl, id, bvc);
-}
\ No newline at end of file
+}
diff --git a/src/cryptonote_core/blockchain_storage.h b/src/cryptonote_core/blockchain_storage.h
index 1ea5e29ea..b1fb5df41 100644
--- a/src/cryptonote_core/blockchain_storage.h
+++ b/src/cryptonote_core/blockchain_storage.h
@@ -13,6 +13,8 @@
 #include <boost/foreach.hpp>
 #include <atomic>
 
+#include "syncobj.h"
+#include "string_tools.h"
 #include "tx_pool.h"
 #include "cryptonote_basic.h"
 #include "common/util.h"
@@ -50,7 +52,7 @@ namespace cryptonote
       uint64_t already_generated_coins;
     };
 
-    blockchain_storage(tx_memory_pool& tx_pool):m_tx_pool(tx_pool), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false)
+    blockchain_storage(tx_memory_pool& tx_pool):m_tx_pool(tx_pool), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false), m_is_blockchain_storing(false)
     {};
 
     bool init() { return init(tools::get_default_data_dir()); }
@@ -119,7 +121,7 @@ namespace cryptonote
           missed_bs.push_back(bl_id);
         else
         {
-          CHECK_AND_ASSERT_MES(it->second < m_blocks.size(), false, "Internal error: bl_id=" << string_tools::pod_to_hex(bl_id)
+          CHECK_AND_ASSERT_MES(it->second < m_blocks.size(), false, "Internal error: bl_id=" << epee::string_tools::pod_to_hex(bl_id)
             << " have index record with offset="<<it->second<< ", bigger then m_blocks.size()=" << m_blocks.size());
             blocks.push_back(m_blocks[it->second].bl);
         }
@@ -163,7 +165,7 @@ namespace cryptonote
     typedef std::map<uint64_t, std::vector<std::pair<crypto::hash, size_t>>> outputs_container; //crypto::hash - tx hash, size_t - index of out in transaction
 
     tx_memory_pool& m_tx_pool;
-    critical_section m_blockchain_lock; // TODO: add here reader/writer lock
+    epee::critical_section m_blockchain_lock; // TODO: add here reader/writer lock
 
     // main chain
     blocks_container m_blocks;               // height  -> block_extended_info
@@ -186,7 +188,7 @@ namespace cryptonote
     std::atomic<bool> m_is_in_checkpoint_zone;
     std::atomic<bool> m_is_blockchain_storing;
 
-    bool switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::iterator>& alt_chain);
+    bool switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::iterator>& alt_chain, bool discard_disconnected_chain);
     bool pop_block_from_blockchain();
     bool purge_block_data_from_blockchain(const block& b, size_t processed_tx_count);
     bool purge_transaction_from_blockchain(const crypto::hash& tx_id);
@@ -301,7 +303,7 @@ namespace cryptonote
         return false;
       }
       transactions_container::iterator tx_it = m_transactions.find(amount_outs_vec[i].first);
-      CHECK_AND_ASSERT_MES(tx_it != m_transactions.end(), false, "Wrong transaction id in output indexes: " <<string_tools::pod_to_hex(amount_outs_vec[i].first));
+      CHECK_AND_ASSERT_MES(tx_it != m_transactions.end(), false, "Wrong transaction id in output indexes: " << epee::string_tools::pod_to_hex(amount_outs_vec[i].first));
       CHECK_AND_ASSERT_MES(amount_outs_vec[i].second < tx_it->second.tx.vout.size(), false,
         "Wrong index in transaction outputs: " << amount_outs_vec[i].second << ", expected less then " << tx_it->second.tx.vout.size());
       if(!vis.handle_output(tx_it->second.tx, tx_it->second.tx.vout[amount_outs_vec[i].second]))
diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp
index 54c2f3a6d..33a2d2986 100644
--- a/src/cryptonote_core/checkpoints.cpp
+++ b/src/cryptonote_core/checkpoints.cpp
@@ -29,10 +29,11 @@ namespace cryptonote
     return !m_points.empty() && (height <= (--m_points.end())->first);
   }
   //---------------------------------------------------------------------------
-  bool checkpoints::check_block(uint64_t height, const crypto::hash& h) const
+  bool checkpoints::check_block(uint64_t height, const crypto::hash& h, bool& is_a_checkpoint) const
   {
     auto it = m_points.find(height);
-    if(it == m_points.end())
+    is_a_checkpoint = it != m_points.end();
+    if(!is_a_checkpoint)
       return true;
 
     if(it->second == h)
@@ -45,4 +46,25 @@ namespace cryptonote
       return false;
     }
   }
+  //---------------------------------------------------------------------------
+  bool checkpoints::check_block(uint64_t height, const crypto::hash& h) const
+  {
+    bool ignored;
+    return check_block(height, h, ignored);
+  }
+  //---------------------------------------------------------------------------
+  bool checkpoints::is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const
+  {
+    if (0 == block_height)
+      return false;
+
+    auto it = m_points.upper_bound(blockchain_height);
+    // Is blockchain_height before the first checkpoint?
+    if (it == m_points.begin())
+      return true;
+
+    --it;
+    uint64_t checkpoint_height = it->first;
+    return checkpoint_height < block_height;
+  }
 }
diff --git a/src/cryptonote_core/checkpoints.h b/src/cryptonote_core/checkpoints.h
index 20014b1c8..1bc055d91 100644
--- a/src/cryptonote_core/checkpoints.h
+++ b/src/cryptonote_core/checkpoints.h
@@ -16,6 +16,9 @@ namespace cryptonote
     bool add_checkpoint(uint64_t height, const std::string& hash_str);
     bool is_in_checkpoint_zone(uint64_t height) const;
     bool check_block(uint64_t height, const crypto::hash& h) const;
+    bool check_block(uint64_t height, const crypto::hash& h, bool& is_a_checkpoint) const;
+    bool is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const;
+
   private:
     std::map<uint64_t, crypto::hash> m_points;
   };
diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h
index 32d15831f..3ecbbf0b6 100644
--- a/src/cryptonote_core/checkpoints_create.h
+++ b/src/cryptonote_core/checkpoints_create.h
@@ -12,12 +12,9 @@
 namespace cryptonote {
   inline bool create_checkpoints(cryptonote::checkpoints& checkpoints)
   {      
-    // Checkpointing disabled until we can make the client not fast-sync
-    // without checking PoW at some point. Otherwise we may be exposed
-    // to blockchain corruption attacks. Need to investigate this further.
-    // 8-5-14
-    // ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
-    // ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
+    ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
+    ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
+    ADD_CHECKPOINT(50000, "0fe8758ab06a8b9cb35b7328fd4f757af530a5d37759f9d3e421023231f7b31c");
     return true;
   }
 }
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index a09f25d31..b6bfa09c8 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -502,7 +502,7 @@ namespace cryptonote
       LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL 
         << "The daemon will start synchronizing with the network. It may take up to several hours." << ENDL 
         << ENDL
-        << "You can set the level of process detailization by using command \"set_log <level>\", where <level> is either 0 (no details), 1 (current block height synchronized), or 2 (all details)." << ENDL
+        << "You can set the level of process detailization* through \"set_log <level>\" command*, where <level> is between 0 (no details) and 4 (very verbose)." << ENDL
         << ENDL
         << "Use \"help\" command to see the list of available commands." << ENDL
         << ENDL
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index c298451e8..cde52d5a2 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -115,13 +115,13 @@ namespace cryptonote
      tx_memory_pool m_mempool;
      blockchain_storage m_blockchain_storage;
      i_cryptonote_protocol* m_pprotocol;
-     critical_section m_incoming_tx_lock;
+     epee::critical_section m_incoming_tx_lock;
      //m_miner and m_miner_addres are probably temporary here
      miner m_miner;
      account_public_address m_miner_address;
      std::string m_config_folder;
      cryptonote_protocol_stub m_protocol_stub;
-     math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval;
+     epee::math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval;
      friend class tx_validate_inputs;
      std::atomic<bool> m_starter_message_showed;
    };
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
index 2b38d001f..7b7f18844 100644
--- a/src/cryptonote_core/cryptonote_format_utils.cpp
+++ b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -239,8 +239,7 @@ namespace cryptonote
   crypto::public_key get_tx_pub_key_from_extra(const std::vector<uint8_t>& tx_extra)
   {
     std::vector<tx_extra_field> tx_extra_fields;
-    if (!parse_tx_extra(tx_extra, tx_extra_fields))
-      return null_pkey;
+    parse_tx_extra(tx_extra, tx_extra_fields);
 
     tx_extra_pub_key pub_key_field;
     if(!find_tx_extra_field_by_type(tx_extra_fields, pub_key_field))
diff --git a/src/cryptonote_core/miner.h b/src/cryptonote_core/miner.h
index da4578b06..61c063ddf 100644
--- a/src/cryptonote_core/miner.h
+++ b/src/cryptonote_core/miner.h
@@ -4,7 +4,6 @@
 
 #pragma once 
 
-#include <boost/atomic.hpp>
 #include <boost/program_options.hpp>
 #include <atomic>
 #include "cryptonote_basic.h"
@@ -64,7 +63,7 @@ namespace cryptonote
 
 
     volatile uint32_t m_stop;
-    ::critical_section m_template_lock;
+    epee::critical_section m_template_lock;
     block m_template;
     std::atomic<uint32_t> m_template_no;
     std::atomic<uint32_t> m_starter_nonce;
@@ -73,21 +72,21 @@ namespace cryptonote
     volatile uint32_t m_thread_index; 
     volatile uint32_t m_threads_total;
     std::atomic<int32_t> m_pausers_count;
-    ::critical_section m_miners_count_lock;
+    epee::critical_section m_miners_count_lock;
 
     std::list<boost::thread> m_threads;
-    ::critical_section m_threads_lock;
+    epee::critical_section m_threads_lock;
     i_miner_handler* m_phandler;
     account_public_address m_mine_address;
-    math_helper::once_a_time_seconds<5> m_update_block_template_interval;
-    math_helper::once_a_time_seconds<2> m_update_merge_hr_interval;
+    epee::math_helper::once_a_time_seconds<5> m_update_block_template_interval;
+    epee::math_helper::once_a_time_seconds<2> m_update_merge_hr_interval;
     std::vector<blobdata> m_extra_messages;
     miner_config m_config;
     std::string m_config_folder_path;    
     std::atomic<uint64_t> m_last_hr_merge_time;
     std::atomic<uint64_t> m_hashes;
     std::atomic<uint64_t> m_current_hash_rate;
-    critical_section m_last_hash_rates_lock;
+    epee::critical_section m_last_hash_rates_lock;
     std::list<uint64_t> m_last_hash_rates;
     bool m_do_print_hashrate;
     bool m_do_mining;
diff --git a/src/cryptonote_core/tx_extra.h b/src/cryptonote_core/tx_extra.h
index 254a6a2ff..37a04a41e 100644
--- a/src/cryptonote_core/tx_extra.h
+++ b/src/cryptonote_core/tx_extra.h
@@ -135,7 +135,6 @@ namespace cryptonote
   //   varint tag;
   //   varint size;
   //   varint data[];
-  //typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce> tx_extra_field;
   typedef boost::variant<tx_extra_padding, tx_extra_pub_key, tx_extra_nonce, tx_extra_merge_mining_tag> tx_extra_field;
 }
 
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h
index 3978dfb96..26d273aa7 100644
--- a/src/cryptonote_core/tx_pool.h
+++ b/src/cryptonote_core/tx_pool.h
@@ -4,8 +4,6 @@
 
 #pragma once
 #include "include_base_utils.h"
-using namespace epee;
-
 
 #include <set>
 #include <unordered_map>
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.h b/src/cryptonote_protocol/cryptonote_protocol_handler.h
index 178ec2eb1..80538677c 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.h
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.h
@@ -81,7 +81,7 @@ namespace cryptonote
     template<class t_parametr>
       bool post_notify(typename t_parametr::request& arg, cryptonote_connection_context& context)
       {
-        LOG_PRINT_L2("[" << net_utils::print_connection_context_short(context) << "] post " << typeid(t_parametr).name() << " -->");
+        LOG_PRINT_L2("[" << epee::net_utils::print_connection_context_short(context) << "] post " << typeid(t_parametr).name() << " -->");
         std::string blob;
         epee::serialization::store_t_to_binary(arg, blob);
         return m_p2p->invoke_notify_to_peer(t_parametr::ID, blob, context);
@@ -90,7 +90,7 @@ namespace cryptonote
       template<class t_parametr>
       bool relay_post_notify(typename t_parametr::request& arg, cryptonote_connection_context& exlude_context)
       {
-        LOG_PRINT_L2("[" << net_utils::print_connection_context_short(exlude_context) << "] post relay " << typeid(t_parametr).name() << " -->");
+        LOG_PRINT_L2("[" << epee::net_utils::print_connection_context_short(exlude_context) << "] post relay " << typeid(t_parametr).name() << " -->");
         std::string arg_buff;
         epee::serialization::store_t_to_binary(arg, arg_buff);
         return m_p2p->relay_notify_to_all(t_parametr::ID, arg_buff, exlude_context);
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index a0838e690..2584f1097 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -81,7 +81,7 @@ namespace cryptonote
     m_p2p->for_each_connection([&](const connection_context& cntxt, nodetool::peerid_type peer_id)
     {
       ss << std::setw(25) << std::left << std::string(cntxt.m_is_income ? " [INC]":"[OUT]") + 
-        string_tools::get_ip_string_from_int32(cntxt.m_remote_ip) + ":" + std::to_string(cntxt.m_remote_port) 
+        epee::string_tools::get_ip_string_from_int32(cntxt.m_remote_ip) + ":" + std::to_string(cntxt.m_remote_port) 
         << std::setw(20) << std::hex << peer_id
         << std::setw(25) << std::to_string(cntxt.m_recv_cnt)+ "(" + std::to_string(time(NULL) - cntxt.m_last_recv) + ")" + "/" + std::to_string(cntxt.m_send_cnt) + "(" + std::to_string(time(NULL) - cntxt.m_last_send) + ")"
         << std::setw(25) << get_protocol_state_string(cntxt.m_state)
@@ -108,9 +108,12 @@ namespace cryptonote
       return true;
     }
 
-    LOG_PRINT_CCONTEXT_YELLOW("Sync data returned unknown top block: " << m_core.get_current_blockchain_height() << "->" << hshd.current_height 
-      << "[" << static_cast<int64_t>(hshd.current_height - m_core.get_current_blockchain_height()) << " blocks(" << (hshd.current_height - m_core.get_current_blockchain_height()) /1440 << " days) behind] " << ENDL 
-      << "remote top: "  << hshd.top_id << "[" << hshd.current_height << "]" << ", set SYNCHRONIZATION mode", (is_inital ? LOG_LEVEL_0:LOG_LEVEL_1));
+    int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height());
+    LOG_PRINT_CCONTEXT_YELLOW("Sync data returned unknown top block: " << m_core.get_current_blockchain_height() << " -> " << hshd.current_height
+      << " [" << std::abs(diff) << " blocks (" << diff / (24 * 60 * 60 / DIFFICULTY_TARGET) << " days) "
+      << (0 <= diff ? std::string("behind") : std::string("ahead"))
+      << "] " << ENDL << "SYNCHRONIZATION started", (is_inital ? LOG_LEVEL_0:LOG_LEVEL_1));
+    LOG_PRINT_L1("Remote top block height: " << hshd.current_height << ", id: " << hshd.top_id);
     context.m_state = cryptonote_connection_context::state_synchronizing;
     context.m_remote_blockchain_height = hshd.current_height;
     //let the socket to send response to handshake, but request callback, to let send request data after response
@@ -254,7 +257,7 @@ namespace cryptonote
       if(!parse_and_validate_block_from_blob(block_entry.block, b))
       {
         LOG_ERROR_CCONTEXT("sent wrong block: failed to parse and validate block: \r\n" 
-          << string_tools::buff_to_hex_nodelimer(block_entry.block) << "\r\n dropping connection");
+          << epee::string_tools::buff_to_hex_nodelimer(block_entry.block) << "\r\n dropping connection");
         m_p2p->drop_connection(context);
         return 1;
       }      
@@ -274,14 +277,14 @@ namespace cryptonote
       auto req_it = context.m_requested_objects.find(get_block_hash(b));
       if(req_it == context.m_requested_objects.end())
       {
-        LOG_ERROR_CCONTEXT("sent wrong NOTIFY_RESPONSE_GET_OBJECTS: block with id=" << string_tools::pod_to_hex(get_blob_hash(block_entry.block)) 
+        LOG_ERROR_CCONTEXT("sent wrong NOTIFY_RESPONSE_GET_OBJECTS: block with id=" << epee::string_tools::pod_to_hex(get_blob_hash(block_entry.block)) 
           << " wasn't requested, dropping connection");
         m_p2p->drop_connection(context);
         return 1;
       }
       if(b.tx_hashes.size() != block_entry.txs.size()) 
       {
-        LOG_ERROR_CCONTEXT("sent wrong NOTIFY_RESPONSE_GET_OBJECTS: block with id=" << string_tools::pod_to_hex(get_blob_hash(block_entry.block)) 
+        LOG_ERROR_CCONTEXT("sent wrong NOTIFY_RESPONSE_GET_OBJECTS: block with id=" << epee::string_tools::pod_to_hex(get_blob_hash(block_entry.block)) 
           << ", tx_hashes.size()=" << b.tx_hashes.size() << " mismatch with block_complete_entry.m_txs.size()=" << block_entry.txs.size() << ", dropping connection");
         m_p2p->drop_connection(context);
         return 1;
@@ -300,7 +303,7 @@ namespace cryptonote
 
     {
       m_core.pause_mine();
-      misc_utils::auto_scope_leave_caller scope_exit_handler = misc_utils::create_scope_leave_handler(
+      epee::misc_utils::auto_scope_leave_caller scope_exit_handler = epee::misc_utils::create_scope_leave_handler(
         boost::bind(&t_core::resume_mine, &m_core));
 
       BOOST_FOREACH(const block_complete_entry& block_entry, arg.blocks)
@@ -314,7 +317,7 @@ namespace cryptonote
           if(tvc.m_verifivation_failed)
           {
             LOG_ERROR_CCONTEXT("transaction verification failed on NOTIFY_RESPONSE_GET_OBJECTS, \r\ntx_id = " 
-              << string_tools::pod_to_hex(get_blob_hash(tx_blob)) << ", dropping connection");
+              << epee::string_tools::pod_to_hex(get_blob_hash(tx_blob)) << ", dropping connection");
             m_p2p->drop_connection(context);
             return 1;
           }
@@ -408,7 +411,7 @@ namespace cryptonote
                            << "\r\nm_remote_blockchain_height=" << context.m_remote_blockchain_height
                            << "\r\nm_needed_objects.size()=" << context.m_needed_objects.size()
                            << "\r\nm_requested_objects.size()=" << context.m_requested_objects.size()
-                           << "\r\non connection [" << net_utils::print_connection_context_short(context)<< "]");
+                           << "\r\non connection [" << epee::net_utils::print_connection_context_short(context)<< "]");
       
       context.m_state = cryptonote_connection_context::state_normal;
       LOG_PRINT_CCONTEXT_GREEN(" SYNCHRONIZED OK", LOG_LEVEL_0);
@@ -464,7 +467,7 @@ namespace cryptonote
     if(!m_core.have_block(arg.m_block_ids.front()))
     {
       LOG_ERROR_CCONTEXT("sent m_block_ids starting from unknown id: "
-                                              << string_tools::pod_to_hex(arg.m_block_ids.front()) << " , dropping connection");
+                                              << epee::string_tools::pod_to_hex(arg.m_block_ids.front()) << " , dropping connection");
       m_p2p->drop_connection(context);
       return 1;
     }
diff --git a/src/daemon/daemon_commands_handler.h b/src/daemon/daemon_commands_handler.h
index 74b671e2a..135ec68f8 100644
--- a/src/daemon/daemon_commands_handler.h
+++ b/src/daemon/daemon_commands_handler.h
@@ -11,6 +11,7 @@
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"
 #include "common/util.h"
 #include "crypto/hash.h"
+#include "version.h"
 
 
 class daemon_cmmands_handler
@@ -34,6 +35,7 @@ public:
     m_cmd_binder.set_handler("show_hr", boost::bind(&daemon_cmmands_handler::show_hr, this, _1), "Start showing hash rate");
     m_cmd_binder.set_handler("hide_hr", boost::bind(&daemon_cmmands_handler::hide_hr, this, _1), "Stop showing hash rate");
     m_cmd_binder.set_handler("save", boost::bind(&daemon_cmmands_handler::save, this, _1), "Save blockchain");
+    m_cmd_binder.set_handler("set_log", boost::bind(&daemon_cmmands_handler::set_log, this, _1), "set_log <level> - Change current log detalization level, <level> is a number 0-4");
     m_cmd_binder.set_handler("diff", boost::bind(&daemon_cmmands_handler::diff, this, _1), "Show difficulty");
   }
 
@@ -55,6 +57,7 @@ private:
   std::string get_commands_str()
   {
     std::stringstream ss;
+    ss << CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG << ENDL;
     ss << "Commands: " << ENDL;
     std::string usage = m_cmd_binder.get_usage();
     boost::replace_all(usage, "\n", "\n  ");
@@ -135,19 +138,34 @@ private:
       return false;
     }
     uint64_t start_index = 0;
+    uint64_t end_index = 0;
     uint64_t end_block_parametr = m_srv.get_payload_object().get_core().get_current_blockchain_height();
     if(!string_tools::get_xtype_from_string(start_index, args[0]))
     {
       std::cout << "wrong starter block index parameter" << ENDL;
       return false;
     }
-    if(args.size() >1 && !string_tools::get_xtype_from_string(end_block_parametr, args[1]))
+    if(args.size() >1 && !string_tools::get_xtype_from_string(end_index, args[1]))
     {
       std::cout << "wrong end block index parameter" << ENDL;
       return false;
     }
+    if (end_index == 0)
+    {
+      end_index = end_block_parametr;
+    }
+    if (end_index > end_block_parametr)
+    {
+      std::cout << "end block index parameter shouldn't be greater than " << end_block_parametr << ENDL;
+      return false;
+    }
+    if (end_index <= start_index)
+    {
+      std::cout << "end block index should be greater than starter block index" << ENDL;
+      return false;
+    }
 
-    m_srv.get_payload_object().get_core().print_blockchain(start_index, end_block_parametr);
+    m_srv.get_payload_object().get_core().print_blockchain(start_index, end_index);
     return true;
   }
   //--------------------------------------------------------------------------------
@@ -156,6 +174,33 @@ private:
     m_srv.get_payload_object().get_core().print_blockchain_index();
     return true;
   }
+
+  bool set_log(const std::vector<std::string>& args)
+  {
+    if(args.size() != 1)
+    {
+      std::cout << "use: set_log <log_level_number_0-4>" << ENDL;
+      return true;
+    }
+
+    uint16_t l = 0;
+    if(!string_tools::get_xtype_from_string(l, args[0]))
+    {
+      std::cout << "wrong number format, use: set_log <log_level_number_0-4>" << ENDL;
+      return true;
+    }
+
+    if(LOG_LEVEL_4 < l)
+    {
+      std::cout << "wrong number range, use: set_log <log_level_number_0-4>" << ENDL;
+      return true;
+    }
+
+    log_space::log_singletone::get_set_log_detalisation_level(true, l);
+
+    return true;
+  }
+
   //--------------------------------------------------------------------------------
   template <typename T>
   static bool print_as_json(T& obj)
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index 794b97429..5a03b049f 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -24,8 +24,7 @@
 #include "p2p_networks.h"
 #include "math_helper.h"
 #include "net_node_common.h"
-
-using namespace epee;
+#include "common/command_line.h"
 
 PUSH_WARNINGS
 DISABLE_VS_WARNINGS(4355)
@@ -39,7 +38,7 @@ namespace nodetool
   };
 
   template<class t_payload_net_handler>
-  class node_server: public levin::levin_commands_handler<p2p_connection_context_t<typename t_payload_net_handler::connection_context> >,
+  class node_server: public epee::levin::levin_commands_handler<p2p_connection_context_t<typename t_payload_net_handler::connection_context> >,
                      public i_p2p_endpoint<typename t_payload_net_handler::connection_context>
   {
     struct by_conn_id{};
@@ -126,7 +125,7 @@ namespace nodetool
     bool parse_peer_from_string(nodetool::net_address& pe, const std::string& node_addr);
     bool handle_command_line(const boost::program_options::variables_map& vm);
     bool idle_worker();
-    bool handle_remote_peerlist(const std::list<peerlist_entry>& peerlist, time_t local_time, const net_utils::connection_context_base& context);
+    bool handle_remote_peerlist(const std::list<peerlist_entry>& peerlist, time_t local_time, const epee::net_utils::connection_context_base& context);
     bool get_local_node_data(basic_node_data& node_data);
     //bool get_local_handshake_data(handshake_data& hshd);
 
@@ -136,7 +135,7 @@ namespace nodetool
     bool connections_maker();
     bool peer_sync_idle_maker();
     bool do_handshake_with_peer(peerid_type& pi, p2p_connection_context& context, bool just_take_peerlist = false);
-    bool do_peer_timed_sync(const net_utils::connection_context_base& context, peerid_type peer_id);
+    bool do_peer_timed_sync(const epee::net_utils::connection_context_base& context, peerid_type peer_id);
 
     bool make_new_connection_from_peerlist(bool use_white_list);
     bool try_to_connect_and_handshake_with_new_peer(const net_address& na, bool just_take_peerlist = false, uint64_t last_seen_stamp = 0, bool white = true);
@@ -146,12 +145,19 @@ namespace nodetool
     template<class t_callback>
     bool try_ping(basic_node_data& node_data, p2p_connection_context& context, t_callback cb);
     bool make_expected_connections_count(bool white_list, size_t expected_connections);
+    bool is_priority_node(const net_address& na);
+
+    template <class Container>
+    bool connect_to_peerlist(const Container& peers);
+
+    template <class Container>
+    bool parse_peers_and_add_to_container(const boost::program_options::variables_map& vm, const command_line::arg_descriptor<std::vector<std::string> > & arg, Container& container);
 
     //debug functions
     std::string print_connections_container();
 
 
-    typedef net_utils::boosted_tcp_server<levin::async_protocol_handler<p2p_connection_context> > net_server;
+    typedef epee::net_utils::boosted_tcp_server<epee::levin::async_protocol_handler<p2p_connection_context> > net_server;
 
     struct config
     {
@@ -181,9 +187,9 @@ namespace nodetool
     t_payload_net_handler& m_payload_handler;
     peerlist_manager m_peerlist;
 
-    math_helper::once_a_time_seconds<P2P_DEFAULT_HANDSHAKE_INTERVAL> m_peer_handshake_idle_maker_interval;
-    math_helper::once_a_time_seconds<1> m_connections_maker_interval;
-    math_helper::once_a_time_seconds<60*30, false> m_peerlist_store_interval;
+    epee::math_helper::once_a_time_seconds<P2P_DEFAULT_HANDSHAKE_INTERVAL> m_peer_handshake_idle_maker_interval;
+    epee::math_helper::once_a_time_seconds<1> m_connections_maker_interval;
+    epee::math_helper::once_a_time_seconds<60*30, false> m_peerlist_store_interval;
 
     std::string m_bind_ip;
     std::string m_port;
@@ -191,6 +197,7 @@ namespace nodetool
     uint64_t m_last_stat_request_time;
 #endif
     std::list<net_address>   m_priority_peers;
+    std::vector<net_address> m_exclusive_peers;
     std::vector<net_address> m_seed_nodes;
     std::list<nodetool::peerlist_entry> m_command_line_peers;
     uint64_t m_peer_livetime;
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 31d3e6597..e45e51b77 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <algorithm>
+
 #include "version.h"
 #include "string_tools.h"
-#include "common/command_line.h"
 #include "common/util.h"
 #include "net/net_helper.h"
 #include "math_helper.h"
@@ -31,8 +32,11 @@ namespace nodetool
     const command_line::arg_descriptor<bool>        arg_p2p_allow_local_ip = {"allow-local-ip", "Allow local ip add to peer list, mostly in debug purposes"};
     const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_peer   = {"add-peer", "Manually add peer to local peerlist"};
     const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_priority_node   = {"add-priority-node", "Specify list of peers to connect to and attempt to keep the connection open"};
+    const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_exclusive_node   = {"add-exclusive-node", "Specify list of peers to connect to only."
+                                                                                                  " If this option is given the options add-priority-node and seed-node are ignored"};
     const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_seed_node   = {"seed-node", "Connect to a node to retrieve peer addresses, and disconnect"};
-    const command_line::arg_descriptor<bool> arg_p2p_hide_my_port   =    {"hide-my-port", "Do not announce yourself as peerlist candidate", false, true};  }
+    const command_line::arg_descriptor<bool> arg_p2p_hide_my_port   =    {"hide-my-port", "Do not announce yourself as peerlist candidate", false, true};
+  }
 
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
@@ -44,6 +48,7 @@ namespace nodetool
     command_line::add_arg(desc, arg_p2p_allow_local_ip);
     command_line::add_arg(desc, arg_p2p_add_peer);
     command_line::add_arg(desc, arg_p2p_add_priority_node);
+    command_line::add_arg(desc, arg_p2p_add_exclusive_node);
     command_line::add_arg(desc, arg_p2p_seed_node);    
     command_line::add_arg(desc, arg_p2p_hide_my_port);   }
   //-----------------------------------------------------------------------------------
@@ -96,7 +101,7 @@ namespace nodetool
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::parse_peer_from_string(nodetool::net_address& pe, const std::string& node_addr)
   {
-    return string_tools::parse_peer_from_string(pe.ip, pe.port, node_addr);
+    return epee::string_tools::parse_peer_from_string(pe.ip, pe.port, node_addr);
   }
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
@@ -120,30 +125,26 @@ namespace nodetool
       }
     }
 
-    if (command_line::has_arg(vm, arg_p2p_add_priority_node))
-    {       
-      std::vector<std::string> perrs = command_line::get_arg(vm, arg_p2p_add_priority_node);
-      for(const std::string& pr_str: perrs)
-      {
-        nodetool::net_address na = AUTO_VAL_INIT(na);
-        bool r = parse_peer_from_string(na, pr_str);
-        CHECK_AND_ASSERT_MES(r, false, "Failed to parse address from string: " << pr_str);
-        m_priority_peers.push_back(na);
-      }
+    if (command_line::has_arg(vm,arg_p2p_add_exclusive_node))
+    {
+      if (!parse_peers_and_add_to_container(vm, arg_p2p_add_exclusive_node, m_exclusive_peers))
+        return false;
+    }
+    else if (command_line::has_arg(vm, arg_p2p_add_priority_node))
+    {
+      if (!parse_peers_and_add_to_container(vm, arg_p2p_add_priority_node, m_priority_peers))
+        return false;
     }
     if (command_line::has_arg(vm, arg_p2p_seed_node))
     {
-      std::vector<std::string> seed_perrs = command_line::get_arg(vm, arg_p2p_seed_node);
-      for(const std::string& pr_str: seed_perrs)
-      {
-        nodetool::net_address na = AUTO_VAL_INIT(na);
-        bool r = parse_peer_from_string(na, pr_str);
-        CHECK_AND_ASSERT_MES(r, false, "Failed to parse seed address from string: " << pr_str);
-        m_seed_nodes.push_back(na);
-      }
+      if (!parse_peers_and_add_to_container(vm, arg_p2p_seed_node, m_seed_nodes))
+        return false;
     }
+
     if(command_line::has_arg(vm, arg_p2p_hide_my_port))
-      m_hide_my_port = true;    return true;
+      m_hide_my_port = true;
+
+    return true;
   }
   //-----------------------------------------------------------------------------------
   namespace
@@ -353,23 +354,23 @@ namespace nodetool
     get_local_node_data(arg.node_data);
     m_payload_handler.get_payload_sync_data(arg.payload_data);
     
-    simple_event ev;
+    epee::simple_event ev;
     std::atomic<bool> hsh_result(false);
     
-    bool r = net_utils::async_invoke_remote_command2<typename COMMAND_HANDSHAKE::response>(context_.m_connection_id, COMMAND_HANDSHAKE::ID, arg, m_net_server.get_config_object(), 
+    bool r = epee::net_utils::async_invoke_remote_command2<typename COMMAND_HANDSHAKE::response>(context_.m_connection_id, COMMAND_HANDSHAKE::ID, arg, m_net_server.get_config_object(), 
       [this, &pi, &ev, &hsh_result, &just_take_peerlist](int code, const typename COMMAND_HANDSHAKE::response& rsp, p2p_connection_context& context)
     {
-      misc_utils::auto_scope_leave_caller scope_exit_handler = misc_utils::create_scope_leave_handler([&](){ev.raise();});
+      epee::misc_utils::auto_scope_leave_caller scope_exit_handler = epee::misc_utils::create_scope_leave_handler([&](){ev.raise();});
 
       if(code < 0)
       {
-        LOG_PRINT_CC_RED(context, "COMMAND_HANDSHAKE invoke failed. (" << code <<  ", " << levin::get_err_descr(code) << ")", LOG_LEVEL_1);
+        LOG_PRINT_CC_RED(context, "COMMAND_HANDSHAKE invoke failed. (" << code <<  ", " << epee::levin::get_err_descr(code) << ")", LOG_LEVEL_1);
         return;
       }
 
       if(rsp.node_data.network_id != BYTECOIN_NETWORK)
       {
-        LOG_ERROR_CCONTEXT("COMMAND_HANDSHAKE Failed, wrong network!  (" << string_tools::get_str_from_guid_a(rsp.node_data.network_id) << "), closing connection.");
+        LOG_ERROR_CCONTEXT("COMMAND_HANDSHAKE Failed, wrong network!  (" << epee::string_tools::get_str_from_guid_a(rsp.node_data.network_id) << "), closing connection.");
         return;
       }
 
@@ -397,10 +398,10 @@ namespace nodetool
           hsh_result = false;
           return;
         }
-        LOG_PRINT_CCONTEXT_L0(" COMMAND_HANDSHAKE INVOKED OK");
+        LOG_PRINT_CCONTEXT_L1(" COMMAND_HANDSHAKE INVOKED OK");
       }else
       {
-        LOG_PRINT_CCONTEXT_L0(" COMMAND_HANDSHAKE(AND CLOSE) INVOKED OK");
+        LOG_PRINT_CCONTEXT_L1(" COMMAND_HANDSHAKE(AND CLOSE) INVOKED OK");
       }
     }, P2P_DEFAULT_HANDSHAKE_INVOKE_TIMEOUT);
 
@@ -411,7 +412,7 @@ namespace nodetool
 
     if(!hsh_result)
     {
-      LOG_PRINT_CC_L0(context_, "COMMAND_HANDSHAKE Failed");
+      LOG_PRINT_CC_L1(context_, "COMMAND_HANDSHAKE Failed");
       m_net_server.get_config_object().close(context_.m_connection_id);
     }
 
@@ -419,17 +420,17 @@ namespace nodetool
   }
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
-  bool node_server<t_payload_net_handler>::do_peer_timed_sync(const net_utils::connection_context_base& context_, peerid_type peer_id)
+  bool node_server<t_payload_net_handler>::do_peer_timed_sync(const epee::net_utils::connection_context_base& context_, peerid_type peer_id)
   {
     typename COMMAND_TIMED_SYNC::request arg = AUTO_VAL_INIT(arg);
     m_payload_handler.get_payload_sync_data(arg.payload_data);
 
-    bool r = net_utils::async_invoke_remote_command2<typename COMMAND_TIMED_SYNC::response>(context_.m_connection_id, COMMAND_TIMED_SYNC::ID, arg, m_net_server.get_config_object(), 
+    bool r = epee::net_utils::async_invoke_remote_command2<typename COMMAND_TIMED_SYNC::response>(context_.m_connection_id, COMMAND_TIMED_SYNC::ID, arg, m_net_server.get_config_object(), 
       [this](int code, const typename COMMAND_TIMED_SYNC::response& rsp, p2p_connection_context& context)
     {
       if(code < 0)
       {
-        LOG_PRINT_CC_RED(context, "COMMAND_TIMED_SYNC invoke failed. (" << code <<  ", " << levin::get_err_descr(code) << ")", LOG_LEVEL_1);
+        LOG_PRINT_CC_RED(context, "COMMAND_TIMED_SYNC invoke failed. (" << code <<  ", " << epee::levin::get_err_descr(code) << ")", LOG_LEVEL_1);
         return;
       }
 
@@ -502,36 +503,53 @@ namespace nodetool
     return connected;
   }
 
-  //-----------------------------------------------------------------------------------
+#define LOG_PRINT_CC_PRIORITY_NODE(priority, con, msg) \
+  do { \
+    if (priority) {\
+      LOG_PRINT_CC_L0(con, msg); \
+    } else {\
+      LOG_PRINT_CC_L1(con, msg); \
+    } \
+  } while(0)
+
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::try_to_connect_and_handshake_with_new_peer(const net_address& na, bool just_take_peerlist, uint64_t last_seen_stamp, bool white)
   {
-    LOG_PRINT_L0("Connecting to " << string_tools::get_ip_string_from_int32(na.ip)  << ":" << string_tools::num_to_string_fast(na.port) << "(white=" << white << ", last_seen: " << (last_seen_stamp?misc_utils::get_time_interval_string(time(NULL) - last_seen_stamp):"never" ) << ")...");
+    LOG_PRINT_L1("Connecting to " << epee::string_tools::get_ip_string_from_int32(na.ip)  << ":"
+        << epee::string_tools::num_to_string_fast(na.port) << "(white=" << white << ", last_seen: "
+        << (last_seen_stamp ? epee::misc_utils::get_time_interval_string(time(NULL) - last_seen_stamp):"never")
+        << ")...");
 
     typename net_server::t_connection_context con = AUTO_VAL_INIT(con);
-    bool res = m_net_server.connect(string_tools::get_ip_string_from_int32(na.ip),
-      string_tools::num_to_string_fast(na.port),
+    bool res = m_net_server.connect(epee::string_tools::get_ip_string_from_int32(na.ip),
+      epee::string_tools::num_to_string_fast(na.port),
       m_config.m_net_config.connection_timeout,
       con);
+
     if(!res)
     {
-      LOG_PRINT_L0("Connect failed to "
-        << string_tools::get_ip_string_from_int32(na.ip)
-        << ":" << string_tools::num_to_string_fast(na.port)
+      bool is_priority = is_priority_node(na);
+      LOG_PRINT_CC_PRIORITY_NODE(is_priority, con, "Connect failed to "
+        << epee::string_tools::get_ip_string_from_int32(na.ip)
+        << ":" << epee::string_tools::num_to_string_fast(na.port)
         /*<< ", try " << try_count*/);
       //m_peerlist.set_peer_unreachable(pe);
       return false;
     }
+
     peerid_type pi = AUTO_VAL_INIT(pi);
     res = do_handshake_with_peer(pi, con, just_take_peerlist);
+
     if(!res)
     {
-      LOG_PRINT_CC_L0(con, "Failed to HANDSHAKE with peer "
-        << string_tools::get_ip_string_from_int32(na.ip)
-        << ":" << string_tools::num_to_string_fast(na.port)
+      bool is_priority = is_priority_node(na);
+      LOG_PRINT_CC_PRIORITY_NODE(is_priority, con, "Failed to HANDSHAKE with peer "
+        << epee::string_tools::get_ip_string_from_int32(na.ip)
+        << ":" << epee::string_tools::num_to_string_fast(na.port)
         /*<< ", try " << try_count*/);
       return false;
     }
+
     if(just_take_peerlist)
     {
       m_net_server.get_config_object().close(con.m_connection_id);
@@ -549,6 +567,9 @@ namespace nodetool
     LOG_PRINT_CC_GREEN(con, "CONNECTION HANDSHAKED OK.", LOG_LEVEL_2);
     return true;
   }
+
+#undef LOG_PRINT_CC_PRIORITY_NODE
+
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::make_new_connection_from_peerlist(bool use_white_list)
@@ -582,7 +603,10 @@ namespace nodetool
       if(is_peer_used(pe))
         continue;
 
-      LOG_PRINT_L1("Selected peer: " << pe.id << " " << string_tools::get_ip_string_from_int32(pe.adr.ip) << ":" << boost::lexical_cast<std::string>(pe.adr.port) << "[white=" << use_white_list << "] last_seen: " << (pe.last_seen ? misc_utils::get_time_interval_string(time(NULL) - pe.last_seen) : "never"));
+      LOG_PRINT_L1("Selected peer: " << pe.id << " " << epee::string_tools::get_ip_string_from_int32(pe.adr.ip)
+                    << ":" << boost::lexical_cast<std::string>(pe.adr.port)
+                    << "[white=" << use_white_list
+                    << "] last_seen: " << (pe.last_seen ? epee::misc_utils::get_time_interval_string(time(NULL) - pe.last_seen) : "never"));
       
       if(!try_to_connect_and_handshake_with_new_peer(pe.adr, false, pe.last_seen, use_white_list))
         continue;
@@ -595,6 +619,10 @@ namespace nodetool
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::connections_maker()
   {
+    if (!connect_to_peerlist(m_exclusive_peers)) return false;
+
+    if (!m_exclusive_peers.empty()) return true;
+
     if(!m_peerlist.get_white_peers_count() && m_seed_nodes.size())
     {
       size_t try_count = 0;
@@ -616,15 +644,7 @@ namespace nodetool
       }
     }
 
-    for(const net_address& na: m_priority_peers)
-    {
-      if(m_net_server.is_stop_signal_sent())
-        return false;
-
-      if(is_addr_connected(na))
-        continue;
-      try_to_connect_and_handshake_with_new_peer(na);
-    }
+    if (!connect_to_peerlist(m_priority_peers)) return false;
 
     size_t expected_white_connections = (m_config.m_net_config.connections_count*P2P_DEFAULT_WHITELIST_CONNECTIONS_PERCENT)/100;
 
@@ -698,7 +718,7 @@ namespace nodetool
   bool node_server<t_payload_net_handler>::peer_sync_idle_maker()
   {
     LOG_PRINT_L2("STARTED PEERLIST IDLE HANDSHAKE");
-    typedef std::list<std::pair<net_utils::connection_context_base, peerid_type> > local_connects_type;
+    typedef std::list<std::pair<epee::net_utils::connection_context_base, peerid_type> > local_connects_type;
     local_connects_type cncts;
     m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt)
     {
@@ -725,7 +745,7 @@ namespace nodetool
     {
       if(be.last_seen > local_time)
       {
-        LOG_PRINT_RED_L0("FOUND FUTURE peerlist for entry " << string_tools::get_ip_string_from_int32(be.adr.ip) << ":" << be.adr.port << " last_seen: " << be.last_seen << ", local_time(on remote node):" << local_time);
+        LOG_PRINT_RED_L0("FOUND FUTURE peerlist for entry " << epee::string_tools::get_ip_string_from_int32(be.adr.ip) << ":" << be.adr.port << " last_seen: " << be.last_seen << ", local_time(on remote node):" << local_time);
         return false;
       }
       be.last_seen += delta;
@@ -734,7 +754,7 @@ namespace nodetool
   }
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
-  bool node_server<t_payload_net_handler>::handle_remote_peerlist(const std::list<peerlist_entry>& peerlist, time_t local_time, const net_utils::connection_context_base& context)
+  bool node_server<t_payload_net_handler>::handle_remote_peerlist(const std::list<peerlist_entry>& peerlist, time_t local_time, const epee::net_utils::connection_context_base& context)
   {
     int64_t delta = 0;
     std::list<peerlist_entry> peerlist_ = peerlist;
@@ -782,7 +802,7 @@ namespace nodetool
       return false;
     }
     crypto::public_key pk = AUTO_VAL_INIT(pk);
-    string_tools::hex_to_pod(P2P_STAT_TRUSTED_PUB_KEY, pk);
+    epee::string_tools::hex_to_pod(P2P_STAT_TRUSTED_PUB_KEY, pk);
     crypto::hash h = tools::get_proof_of_trust_hash(tr);
     if(!crypto::check_signature(h, pk, tr.sign))
     {
@@ -903,8 +923,8 @@ namespace nodetool
     uint32_t actual_ip =  context.m_remote_ip;
     if(!m_peerlist.is_ip_allowed(actual_ip))
       return false;
-    std::string ip = string_tools::get_ip_string_from_int32(actual_ip);
-    std::string port = string_tools::num_to_string_fast(node_data.my_port);
+    std::string ip = epee::string_tools::get_ip_string_from_int32(actual_ip);
+    std::string port = epee::string_tools::num_to_string_fast(node_data.my_port);
     peerid_type pr = node_data.peer_id;
     bool r = m_net_server.connect_async(ip, port, m_config.m_net_config.ping_connection_timeout, [cb, /*context,*/ ip, port, pr, this](
       const typename net_server::t_connection_context& ping_context,
@@ -922,12 +942,12 @@ namespace nodetool
       std::string port_=port;
       peerid_type pr_ = pr;
       auto cb_ = cb;*/
-      bool inv_call_res = net_utils::async_invoke_remote_command2<COMMAND_PING::response>(ping_context.m_connection_id, COMMAND_PING::ID, req, m_net_server.get_config_object(),
+      bool inv_call_res = epee::net_utils::async_invoke_remote_command2<COMMAND_PING::response>(ping_context.m_connection_id, COMMAND_PING::ID, req, m_net_server.get_config_object(),
         [=](int code, const COMMAND_PING::response& rsp, p2p_connection_context& context)
       {
         if(code <= 0)
         {
-          LOG_PRINT_CC_L2(ping_context, "Failed to invoke COMMAND_PING to " << ip << ":" << port << "(" << code <<  ", " << levin::get_err_descr(code) << ")");
+          LOG_PRINT_CC_L2(ping_context, "Failed to invoke COMMAND_PING to " << ip << ":" << port << "(" << code <<  ", " << epee::levin::get_err_descr(code) << ")");
           return;
         }
 
@@ -979,7 +999,7 @@ namespace nodetool
     if(arg.node_data.network_id != BYTECOIN_NETWORK)
     {
 
-      LOG_PRINT_CCONTEXT_L0("WRONG NETWORK AGENT CONNECTED! id=" << string_tools::get_str_from_guid_a(arg.node_data.network_id));
+      LOG_PRINT_CCONTEXT_L0("WRONG NETWORK AGENT CONNECTED! id=" << epee::string_tools::get_str_from_guid_a(arg.node_data.network_id));
       drop_connection(context);
       return 1;
     }
@@ -1021,7 +1041,7 @@ namespace nodetool
         time(&pe.last_seen);
         pe.id = peer_id_l;
         this->m_peerlist.append_with_peer_white(pe);
-        LOG_PRINT_CCONTEXT_L2("PING SUCCESS " << string_tools::get_ip_string_from_int32(context.m_remote_ip) << ":" << port_l);
+        LOG_PRINT_CCONTEXT_L2("PING SUCCESS " << epee::string_tools::get_ip_string_from_int32(context.m_remote_ip) << ":" << port_l);
       });
     }
 
@@ -1066,9 +1086,9 @@ namespace nodetool
     std::stringstream ss;
     m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt)
     {
-      ss << string_tools::get_ip_string_from_int32(cntxt.m_remote_ip) << ":" << cntxt.m_remote_port
+      ss << epee::string_tools::get_ip_string_from_int32(cntxt.m_remote_ip) << ":" << cntxt.m_remote_port
         << " \t\tpeer_id " << cntxt.peer_id
-        << " \t\tconn_id " << string_tools::get_str_from_guid_a(cntxt.m_connection_id) << (cntxt.m_is_income ? " INC":" OUT")
+        << " \t\tconn_id " << epee::string_tools::get_str_from_guid_a(cntxt.m_connection_id) << (cntxt.m_is_income ? " INC":" OUT")
         << std::endl;
       return true;
     });
@@ -1079,13 +1099,51 @@ namespace nodetool
   template<class t_payload_net_handler>
   void node_server<t_payload_net_handler>::on_connection_new(p2p_connection_context& context)
   {
-    LOG_PRINT_L2("["<< net_utils::print_connection_context(context) << "] NEW CONNECTION");
+    LOG_PRINT_L2("["<< epee::net_utils::print_connection_context(context) << "] NEW CONNECTION");
   }
   //-----------------------------------------------------------------------------------
   template<class t_payload_net_handler>
   void node_server<t_payload_net_handler>::on_connection_close(p2p_connection_context& context)
   {
-    LOG_PRINT_L2("["<< net_utils::print_connection_context(context) << "] CLOSE CONNECTION");
+    LOG_PRINT_L2("["<< epee::net_utils::print_connection_context(context) << "] CLOSE CONNECTION");
+  }
+
+  template<class t_payload_net_handler>
+  bool node_server<t_payload_net_handler>::is_priority_node(const net_address& na)
+  {
+    return (std::find(m_priority_peers.begin(), m_priority_peers.end(), na) != m_priority_peers.end()) || (std::find(m_exclusive_peers.begin(), m_exclusive_peers.end(), na) != m_exclusive_peers.end());
+  }
+
+  template<class t_payload_net_handler> template <class Container>
+  bool node_server<t_payload_net_handler>::connect_to_peerlist(const Container& peers)
+  {
+    for(const net_address& na: peers)
+    {
+      if(m_net_server.is_stop_signal_sent())
+        return false;
+
+      if(is_addr_connected(na))
+        continue;
+
+      try_to_connect_and_handshake_with_new_peer(na);
+    }
+
+    return true;
+  }
+
+  template<class t_payload_net_handler> template <class Container>
+  bool node_server<t_payload_net_handler>::parse_peers_and_add_to_container(const boost::program_options::variables_map& vm, const command_line::arg_descriptor<std::vector<std::string> > & arg, Container& container)
+  {
+    std::vector<std::string> perrs = command_line::get_arg(vm, arg);
+
+    for(const std::string& pr_str: perrs)
+    {
+      nodetool::net_address na = AUTO_VAL_INIT(na);
+      bool r = parse_peer_from_string(na, pr_str);
+      CHECK_AND_ASSERT_MES(r, false, "Failed to parse address from string: " << pr_str);
+      container.push_back(na);
+    }
+
+    return true;
   }
-  //-----------------------------------------------------------------------------------
 }
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 2c4e82085..8779f73d8 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -395,7 +395,7 @@ namespace cryptonote
       return false;
     }
     res.blocktemplate_blob = string_tools::buff_to_hex_nodelimer(block_blob);
-
+    res.status = CORE_RPC_STATUS_OK;
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
@@ -423,7 +423,7 @@ namespace cryptonote
       error_resp.message = "Block not accepted";
       return false;
     }
-    res.status = "OK";
+    res.status = CORE_RPC_STATUS_OK;
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h
index 89d3c9885..b7763ffeb 100644
--- a/src/serialization/crypto.h
+++ b/src/serialization/crypto.h
@@ -2,6 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <vector>
+
 #include "serialization.h"
 #include "debug_archive.h"
 #include "crypto/chacha8.h"
diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h
index 2e69ea0a3..7024fdc03 100644
--- a/src/serialization/serialization.h
+++ b/src/serialization/serialization.h
@@ -10,6 +10,7 @@
 #include <vector>
 #include <string>
 #include <boost/type_traits/is_integral.hpp>
+#include <boost/type_traits/integral_constant.hpp>
 
 template <class T>
 struct is_blob_type { typedef boost::false_type type; };
@@ -79,8 +80,10 @@ inline bool do_serialize(Archive &ar, T &v)
     if (!r || !ar.stream().good()) return false; \
   } while(0);
 #define FIELDS(f) \
+  do { \
     bool r = ::do_serialize(ar, f); \
-    if (!r || !ar.stream().good()) return false;
+    if (!r || !ar.stream().good()) return false; \
+  } while(0);
 #define FIELD(f) \
   do { \
     ar.tag(#f); \
@@ -99,6 +102,7 @@ inline bool do_serialize(Archive &ar, T &v)
     ar.serialize_varint(f); \
     if (!ar.stream().good()) return false; \
   } while(0);
+
 namespace serialization {
   namespace detail
   {
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 0f84b81de..b1fdd2688 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -202,7 +202,7 @@ bool simple_wallet::set_log(const std::vector<std::string> &args)
     return true;
   }
   uint16_t l = 0;
-  if(!string_tools::get_xtype_from_string(l, args[0]))
+  if(!epee::string_tools::get_xtype_from_string(l, args[0]))
   {
     fail_msg_writer() << "wrong number format, use: set_log <log_level_number_0-4>";
     return true;
@@ -229,8 +229,8 @@ bool simple_wallet::ask_wallet_create_if_needed()
   wallet_path = string_tools::trim(wallet_path);
 
   bool keys_file_exists;
-  bool wallet_file_exitst;
-  tools::wallet2::wallet_exists(wallet_path, keys_file_exists, wallet_file_exitst);
+  bool wallet_file_exists;
+  tools::wallet2::wallet_exists(wallet_path, keys_file_exists, wallet_file_exists);
 
   bool r;
   if(keys_file_exists)
@@ -239,7 +239,7 @@ bool simple_wallet::ask_wallet_create_if_needed()
     r = true;
   }else
   {
-    if(!wallet_file_exitst)
+    if(!wallet_file_exists)
     {
       std::cout << "The wallet doesn't exist, generating new one" << std::endl;
       m_generate_new = wallet_path;
@@ -749,7 +749,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
   }
 
   size_t fake_outs_count;
-  if(!string_tools::get_xtype_from_string(fake_outs_count, local_args[0]))
+  if(!epee::string_tools::get_xtype_from_string(fake_outs_count, local_args[0]))
   {
     fail_msg_writer() << "mixin_count should be non-negative integer, got " << local_args[0];
     return true;
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index 3aa0789ae..3dcaaeaa0 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -132,7 +132,7 @@ namespace cryptonote
     epee::console_handlers_binder m_cmd_binder;
 
     std::unique_ptr<tools::wallet2> m_wallet;
-    net_utils::http::http_simple_client m_http_client;
+    epee::net_utils::http::http_simple_client m_http_client;
     refresh_progress_reporter_t m_refresh_progress_reporter;
   };
 }
diff --git a/src/version.h.in b/src/version.h.in
index 01d2994f8..f171a8e6b 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
-#define PROJECT_VERSION "0.8.8.2"
+#define PROJECT_VERSION "0.8.8"
 #define PROJECT_VERSION_BUILD_NO "1"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index e8d67eec2..111b76117 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -455,14 +455,14 @@ void wallet2::generate(const std::string& wallet_, const std::string& password)
   store();
 }
 //----------------------------------------------------------------------------------------------------
-void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exitst)
+void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists)
 {
   std::string keys_file, wallet_file;
   do_prepare_file_names(file_path, keys_file, wallet_file);
 
   boost::system::error_code ignore;
   keys_file_exists = boost::filesystem::exists(keys_file, ignore);
-  wallet_file_exitst = boost::filesystem::exists(wallet_file, ignore);
+  wallet_file_exists = boost::filesystem::exists(wallet_file, ignore);
 }
 //----------------------------------------------------------------------------------------------------
 bool wallet2::prepare_file_names(const std::string& file_path)
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index edbf31f2d..d2016f696 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -144,7 +144,7 @@ namespace tools
       a & m_payments;
     }
 
-    static void wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exitst);
+    static void wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists);
 
   private:
     bool store_keys(const std::string& keys_file_name, const std::string& password);
@@ -326,7 +326,7 @@ namespace tools
         req.amounts.push_back(it->amount());
       }
 
-      bool r = net_utils::invoke_http_bin_remote_command2(m_daemon_address + "/getrandom_outs.bin", req, daemon_resp, m_http_client, 200000);
+      bool r = epee::net_utils::invoke_http_bin_remote_command2(m_daemon_address + "/getrandom_outs.bin", req, daemon_resp, m_http_client, 200000);
       THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "getrandom_outs.bin");
       THROW_WALLET_EXCEPTION_IF(daemon_resp.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "getrandom_outs.bin");
       THROW_WALLET_EXCEPTION_IF(daemon_resp.status != CORE_RPC_STATUS_OK, error::get_random_outs_error, daemon_resp.status);
@@ -421,7 +421,7 @@ namespace tools
     COMMAND_RPC_SEND_RAW_TX::request req;
     req.tx_as_hex = epee::string_tools::buff_to_hex_nodelimer(tx_to_blob(tx));
     COMMAND_RPC_SEND_RAW_TX::response daemon_send_resp;
-    r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/sendrawtransaction", req, daemon_send_resp, m_http_client, 200000);
+    r = epee::net_utils::invoke_http_json_remote_command2(m_daemon_address + "/sendrawtransaction", req, daemon_send_resp, m_http_client, 200000);
     THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "sendrawtransaction");
     THROW_WALLET_EXCEPTION_IF(daemon_send_resp.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "sendrawtransaction");
     THROW_WALLET_EXCEPTION_IF(daemon_send_resp.status != CORE_RPC_STATUS_OK, error::tx_rejected, tx, daemon_send_resp.status);
diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp
index c575f9272..e6f287d74 100644
--- a/tests/core_tests/chaingen_main.cpp
+++ b/tests/core_tests/chaingen_main.cpp
@@ -21,15 +21,15 @@ namespace
 int main(int argc, char* argv[])
 {
   TRY_ENTRY();
-  string_tools::set_module_name_and_folder(argv[0]);
+  epee::string_tools::set_module_name_and_folder(argv[0]);
 
   //set up logging options
-  log_space::get_set_log_detalisation_level(true, LOG_LEVEL_3);
-  log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_2);
+  epee::log_space::get_set_log_detalisation_level(true, LOG_LEVEL_3);
+  epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_2);
   
-  log_space::log_singletone::add_logger(LOGGER_FILE, 
-    log_space::log_singletone::get_default_log_file().c_str(), 
-    log_space::log_singletone::get_default_log_folder().c_str());
+  epee::log_space::log_singletone::add_logger(LOGGER_FILE, 
+    epee::log_space::log_singletone::get_default_log_file().c_str(), 
+    epee::log_space::log_singletone::get_default_log_folder().c_str());
 
   po::options_description desc_options("Allowed options");
   command_line::add_arg(desc_options, command_line::arg_help);
diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index 2ad503b83..72ee2ca6c 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -8,6 +8,7 @@
 // tests
 #include "construct_tx.h"
 #include "check_ring_signature.h"
+#include "cn_slow_hash.h"
 #include "derive_public_key.h"
 #include "derive_secret_key.h"
 #include "generate_key_derivation.h"
@@ -56,6 +57,8 @@ int main(int argc, char** argv)
   TEST_PERFORMANCE0(test_derive_public_key);
   TEST_PERFORMANCE0(test_derive_secret_key);
 
+  TEST_PERFORMANCE0(test_cn_slow_hash);
+
   std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;
 
   return 0;

From f5a1c945b4e0be7f6217e3fce91eb2d2944259e1 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 13:11:56 -0400
Subject: [PATCH 24/76] fix releasenotes

---
 ReleaseNotes.txt | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 2edc278a9..6be441ea2 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -34,17 +34,13 @@ Release notes 0.8.4
 Release notes 0.8.3
 
 - JSON RPC for wallet
-- fixed bug with blockchain storing
-- fixed bug with correct display of transfer's change 
-- bug fix in simple wallet
+- Fixed bug with blockchain storing
+- Fixed bug with correct display of transfer's change 
+- Bug fix in simple wallet
 
 Release notes 0.8.2
 
-- now wallet is still working when daemon stores blockchain and can't serve clients; 
-- no-console option for a daemon; 
-- fixed problem with network synchronization; 
-- major bug fix in simple wallet. 
-
-Release notes 0.8.1
-
-Bytecoin project is moved to GitHub
+- Now wallet is still working when daemon stores blockchain and can't serve clients
+- No-console option for a daemon
+- Fixed problem with network synchronization
+- Major bug fix in simple wallet

From 0eba4e0442cfdb6c1819fbedf0de87027e3f0039 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 13:34:31 -0400
Subject: [PATCH 25/76] extra files

---
 .../include/net/jsonrpc_protocol_handler.h    | 167 ++++++++++++++++++
 .../include/net/jsonrpc_server_handlers_map.h |  86 +++++++++
 .../include/net/jsonrpc_server_impl_base.h    |  84 +++++++++
 contrib/epee/include/net/jsonrpc_structs.h    |  96 ++++++++++
 tests/performance_tests/cn_slow_hash.h        |  45 +++++
 5 files changed, 478 insertions(+)
 create mode 100644 contrib/epee/include/net/jsonrpc_protocol_handler.h
 create mode 100644 contrib/epee/include/net/jsonrpc_server_handlers_map.h
 create mode 100644 contrib/epee/include/net/jsonrpc_server_impl_base.h
 create mode 100644 contrib/epee/include/net/jsonrpc_structs.h
 create mode 100644 tests/performance_tests/cn_slow_hash.h

diff --git a/contrib/epee/include/net/jsonrpc_protocol_handler.h b/contrib/epee/include/net/jsonrpc_protocol_handler.h
new file mode 100644
index 000000000..b224c3429
--- /dev/null
+++ b/contrib/epee/include/net/jsonrpc_protocol_handler.h
@@ -0,0 +1,167 @@
+#ifndef JSONRPC_PROTOCOL_HANDLER_H
+#define	JSONRPC_PROTOCOL_HANDLER_H
+
+#include <cstdint>
+#include <string>
+
+#include "net/net_utils_base.h"
+#include "jsonrpc_structs.h"
+#include "storages/portable_storage.h"
+#include "storages/portable_storage_template_helper.h"
+
+namespace epee
+{
+namespace net_utils
+{
+  namespace jsonrpc2
+  {
+  inline
+  std::string& make_error_resp_json(int64_t code, const std::string& message,
+                                    std::string& response_data,
+                                    const epee::serialization::storage_entry& id = nullptr)
+  {
+    epee::json_rpc::error_response rsp;
+    rsp.id = id;
+    rsp.jsonrpc = "2.0";
+    rsp.error.code = code;
+    rsp.error.message = message;
+    epee::serialization::store_t_to_json(static_cast<epee::json_rpc::error_response&>(rsp), response_data, 0, false);
+    response_data += "\n";
+    return response_data;
+  }
+
+    template<class t_connection_context>
+    struct i_jsonrpc2_server_handler
+    {
+      virtual ~i_jsonrpc2_server_handler()
+      {}
+      virtual bool handle_rpc_request(const std::string& req_data,
+                                      std::string& resp_data,
+                                      t_connection_context& conn_context) = 0;
+      virtual bool init_server_thread()
+      { return true; }
+      virtual bool deinit_server_thread()
+      { return true; }
+    };
+    
+    template<class t_connection_context>
+    struct jsonrpc2_server_config
+    {
+      i_jsonrpc2_server_handler<t_connection_context>* m_phandler;
+      critical_section m_lock;
+    };
+    
+    template<class t_connection_context = net_utils::connection_context_base>
+    class jsonrpc2_connection_handler
+    {
+    public:
+      typedef t_connection_context connection_context;
+      typedef jsonrpc2_server_config<t_connection_context> config_type;
+
+      jsonrpc2_connection_handler(i_service_endpoint* psnd_hndlr,
+                                  config_type& config,
+                                  t_connection_context& conn_context)
+        : m_psnd_hndlr(psnd_hndlr),
+          m_config(config),
+          m_conn_context(conn_context),
+          m_is_stop_handling(false)
+      {}
+      virtual ~jsonrpc2_connection_handler()
+      {}
+
+      bool release_protocol()
+      {
+        return true;
+      }
+      virtual bool thread_init()
+      {
+        return true;
+      }
+      virtual bool thread_deinit()
+      {
+        return true;
+      }
+      void handle_qued_callback()   
+      {}
+      bool after_init_connection()
+      {
+        return true;
+      }
+      virtual bool handle_recv(const void* ptr, size_t cb)
+      {
+        std::string buf((const char*)ptr, cb);
+        LOG_PRINT_L0("JSONRPC2_RECV: " << ptr << "\r\n" << buf);
+
+        bool res = handle_buff_in(buf);
+        return res;
+      }
+    private:
+      bool handle_buff_in(std::string& buf)
+      {
+        if(m_cache.size())
+          m_cache += buf;
+        else
+          m_cache.swap(buf);
+
+        m_is_stop_handling = false;
+        while (!m_is_stop_handling) {
+          std::string::size_type pos = match_end_of_request(m_cache);
+          if (std::string::npos == pos) {
+            m_is_stop_handling = true;
+            if (m_cache.size() > 4096) {
+              LOG_ERROR("jsonrpc2_connection_handler::handle_buff_in: Too long request");
+              return false;
+            }
+            break;
+          } else {
+            extract_cached_request_and_handle(pos);
+          }
+
+          if (!m_cache.size()) {
+            m_is_stop_handling = true;
+          }
+        }
+
+        return true;
+      }
+      bool extract_cached_request_and_handle(std::string::size_type pos)
+      {
+        std::string request_data(m_cache.begin(), m_cache.begin() + pos);
+        m_cache.erase(0, pos);
+        return handle_request_and_send_response(request_data);
+      }
+      bool handle_request_and_send_response(const std::string& request_data)
+      {
+        CHECK_AND_ASSERT_MES(m_config.m_phandler, false, "m_config.m_phandler is NULL!!!!");
+        std::string response_data;
+
+        LOG_PRINT_L3("JSONRPC2_REQUEST: >> \r\n" << request_data);
+        bool rpc_result = m_config.m_phandler->handle_rpc_request(request_data, response_data, m_conn_context);
+        LOG_PRINT_L3("JSONRPC2_RESPONSE: << \r\n" << response_data);
+
+        m_psnd_hndlr->do_send((void*)response_data.data(), response_data.size());
+        return rpc_result;
+      }
+      std::string::size_type match_end_of_request(const std::string& buf)
+      {
+        std::string::size_type res = buf.find("\n");
+        if(std::string::npos != res) {
+          return res + 2;
+        }
+        return res;
+      }
+
+    protected:
+      i_service_endpoint* m_psnd_hndlr;
+
+    private:
+      config_type& m_config;
+      t_connection_context& m_conn_context;
+      std::string m_cache;
+      bool m_is_stop_handling;
+    };
+  }
+}
+}
+
+#endif	/* JSONRPC_PROTOCOL_HANDLER_H */
diff --git a/contrib/epee/include/net/jsonrpc_server_handlers_map.h b/contrib/epee/include/net/jsonrpc_server_handlers_map.h
new file mode 100644
index 000000000..8c747d1af
--- /dev/null
+++ b/contrib/epee/include/net/jsonrpc_server_handlers_map.h
@@ -0,0 +1,86 @@
+#ifndef JSONRPC_SERVER_HANDLERS_MAP_H
+#define	JSONRPC_SERVER_HANDLERS_MAP_H
+
+#include <string>
+#include "serialization/keyvalue_serialization.h"
+#include "storages/portable_storage_template_helper.h"
+#include "storages/portable_storage_base.h"
+#include "jsonrpc_structs.h"
+#include "jsonrpc_protocol_handler.h"
+
+#define BEGIN_JSONRPC2_MAP(t_connection_context) \
+bool handle_rpc_request(const std::string& req_data, \
+                        std::string& resp_data, \
+                        t_connection_context& m_conn_context) \
+{ \
+  bool handled = false; \
+  uint64_t ticks = epee::misc_utils::get_tick_count(); \
+  epee::serialization::portable_storage ps; \
+  if (!ps.load_from_json(req_data)) \
+  { \
+    epee::net_utils::jsonrpc2::make_error_resp_json(-32700, "Parse error", resp_data); \
+    return true; \
+  } \
+  epee::serialization::storage_entry id_; \
+  id_ = epee::serialization::storage_entry(std::string()); \
+  if (!ps.get_value("id", id_, nullptr)) \
+  { \
+    epee::net_utils::jsonrpc2::make_error_resp_json(-32600, "Invalid Request", resp_data); \
+    return true; \
+  } \
+  std::string callback_name; \
+  if (!ps.get_value("method", callback_name, nullptr)) \
+  { \
+    epee::net_utils::jsonrpc2::make_error_resp_json(-32600, "Invalid Request", resp_data, id_); \
+    return true; \
+  } \
+  if (false) return true; //just a stub to have "else if"
+
+
+
+#define PREPARE_JSONRPC2_OBJECTS_FROM_JSON(command_type) \
+  handled = true; \
+  boost::value_initialized<epee::json_rpc::request<command_type::request> > req_; \
+  epee::json_rpc::request<command_type::request>& req = static_cast<epee::json_rpc::request<command_type::request>&>(req_);\
+  if(!req.load(ps)) \
+  { \
+    epee::net_utils::jsonrpc2::make_error_resp_json(-32602, "Invalid params", resp_data, req.id); \
+    return true; \
+  } \
+  uint64_t ticks1 = epee::misc_utils::get_tick_count(); \
+  boost::value_initialized<epee::json_rpc::response<command_type::response, epee::json_rpc::dummy_error> > resp_; \
+  epee::json_rpc::response<command_type::response, epee::json_rpc::dummy_error>& resp =  static_cast<epee::json_rpc::response<command_type::response, epee::json_rpc::dummy_error> &>(resp_); \
+  resp.jsonrpc = "2.0"; \
+  resp.id = req.id;
+
+#define FINALIZE_JSONRPC2_OBJECTS_TO_JSON(method_name) \
+  uint64_t ticks2 = epee::misc_utils::get_tick_count(); \
+  epee::serialization::store_t_to_json(resp, resp_data, 0, false); \
+  resp_data += "\n"; \
+  uint64_t ticks3 = epee::misc_utils::get_tick_count(); \
+  LOG_PRINT("[" << method_name << "] processed with " << ticks1-ticks << "/"<< ticks2-ticks1 << "/" << ticks3-ticks2 << "ms", LOG_LEVEL_2);
+
+
+#define MAP_JSONRPC2_WE(method_name, callback_f, command_type) \
+  else if (callback_name == method_name) \
+  { \
+    PREPARE_JSONRPC2_OBJECTS_FROM_JSON(command_type) \
+    epee::json_rpc::error_response fail_resp = AUTO_VAL_INIT(fail_resp); \
+    fail_resp.jsonrpc = "2.0"; \
+    fail_resp.id = req.id; \
+    if(!callback_f(req.params, resp.result, fail_resp.error, m_conn_context)) \
+    { \
+      epee::serialization::store_t_to_json(static_cast<epee::json_rpc::error_response&>(fail_resp), resp_data, 0, false); \
+      resp_data += "\n"; \
+      return true; \
+    } \
+    FINALIZE_JSONRPC2_OBJECTS_TO_JSON(method_name) \
+    return true; \
+  }
+
+#define END_JSONRPC2_MAP() \
+  epee::net_utils::jsonrpc2::make_error_resp_json(-32601, "Method not found", resp_data, id_); \
+  return true; \
+}
+
+#endif	/* JSONRPC_SERVER_HANDLERS_MAP_H */
diff --git a/contrib/epee/include/net/jsonrpc_server_impl_base.h b/contrib/epee/include/net/jsonrpc_server_impl_base.h
new file mode 100644
index 000000000..8a5a9a5b6
--- /dev/null
+++ b/contrib/epee/include/net/jsonrpc_server_impl_base.h
@@ -0,0 +1,84 @@
+#ifndef JSONRPC_SERVER_IMPL_BASE_H
+#define	JSONRPC_SERVER_IMPL_BASE_H
+
+#include <boost/thread.hpp>
+#include <boost/bind.hpp> 
+
+#include "net/jsonrpc_protocol_handler.h"
+#include "net/jsonrpc_server_handlers_map.h"
+#include "net/abstract_tcp_server2.h"
+
+namespace epee
+{
+
+template<class t_child_class, class t_connection_context = epee::net_utils::connection_context_base>
+  class jsonrpc_server_impl_base: public net_utils::jsonrpc2::i_jsonrpc2_server_handler<t_connection_context>
+  {
+
+  public:
+    jsonrpc_server_impl_base()
+        : m_net_server()
+    {}
+
+    explicit jsonrpc_server_impl_base(boost::asio::io_service& external_io_service)
+        : m_net_server(external_io_service)
+    {}
+
+    bool init(const std::string& bind_port = "0", const std::string& bind_ip = "0.0.0.0")
+    {
+      //set self as callback handler
+      m_net_server.get_config_object().m_phandler = static_cast<t_child_class*>(this);
+
+      LOG_PRINT_L0("Binding on " << bind_ip << ":" << bind_port);
+      bool res = m_net_server.init_server(bind_port, bind_ip);
+      if (!res)
+      {
+        LOG_ERROR("Failed to bind server");
+        return false;
+      }
+      return true;
+    }
+
+    bool run(size_t threads_count, bool wait = true)
+    {
+      //go to loop
+      LOG_PRINT("Run net_service loop( " << threads_count << " threads)...", LOG_LEVEL_0);
+      if(!m_net_server.run_server(threads_count, wait))
+      {
+        LOG_ERROR("Failed to run net tcp server!");
+      }
+
+      if(wait)
+        LOG_PRINT("net_service loop stopped.", LOG_LEVEL_0);
+      return true;
+    }
+
+    bool deinit()
+    {
+      return m_net_server.deinit_server();
+    }
+
+    bool timed_wait_server_stop(uint64_t ms)
+    {
+      return m_net_server.timed_wait_server_stop(ms);
+    }
+
+    bool send_stop_signal()
+    {
+      m_net_server.send_stop_signal();
+      return true;
+    }
+
+    int get_binded_port()
+    {
+      return m_net_server.get_binded_port();
+    }
+
+  protected: 
+    net_utils::boosted_tcp_server<net_utils::jsonrpc2::jsonrpc2_connection_handler<t_connection_context> > m_net_server;
+  };
+
+}
+
+#endif	/* JSONRPC_SERVER_IMPL_BASE_H */
+
diff --git a/contrib/epee/include/net/jsonrpc_structs.h b/contrib/epee/include/net/jsonrpc_structs.h
new file mode 100644
index 000000000..9df9e2596
--- /dev/null
+++ b/contrib/epee/include/net/jsonrpc_structs.h
@@ -0,0 +1,96 @@
+#ifndef JSONRPC_STRUCTS_H
+#define	JSONRPC_STRUCTS_H
+
+#include <string>
+#include <cstdint>
+#include "serialization/keyvalue_serialization.h"
+#include "storages/portable_storage_base.h"
+
+namespace epee 
+{
+  namespace json_rpc
+  {
+    template<typename t_param>
+    struct request
+    {
+      std::string jsonrpc;
+      std::string method;
+      epee::serialization::storage_entry id;
+      t_param     params;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(jsonrpc)
+        KV_SERIALIZE(id)
+        KV_SERIALIZE(method)
+        KV_SERIALIZE(params)
+      END_KV_SERIALIZE_MAP()
+    };
+
+    struct error
+    {
+      int64_t code;
+      std::string message;
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(code)
+        KV_SERIALIZE(message)
+      END_KV_SERIALIZE_MAP()
+    };
+    
+    struct dummy_error
+    {
+      BEGIN_KV_SERIALIZE_MAP()
+      END_KV_SERIALIZE_MAP()
+    };
+
+    struct dummy_result
+    {
+      BEGIN_KV_SERIALIZE_MAP()
+      END_KV_SERIALIZE_MAP()
+    };
+
+    template<typename t_param, typename t_error>
+    struct response
+    {
+      std::string jsonrpc;
+      t_param     result;
+      epee::serialization::storage_entry id;
+      t_error     error;
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(jsonrpc)
+        KV_SERIALIZE(id)
+        KV_SERIALIZE(result)
+        KV_SERIALIZE(error)
+      END_KV_SERIALIZE_MAP()
+    };
+
+    template<typename t_param>
+    struct response<t_param, dummy_error>
+    {
+      std::string jsonrpc;
+      t_param     result;
+      epee::serialization::storage_entry id;
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(jsonrpc)
+        KV_SERIALIZE(id)
+        KV_SERIALIZE(result)
+      END_KV_SERIALIZE_MAP()
+    };
+
+    template<typename t_error>
+    struct response<dummy_result, t_error>
+    {
+      std::string jsonrpc;
+      t_error     error;
+      epee::serialization::storage_entry id;
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(jsonrpc)
+        KV_SERIALIZE(id)
+        KV_SERIALIZE(error)
+      END_KV_SERIALIZE_MAP()
+    };
+
+    typedef response<dummy_result, error> error_response;
+  }
+}
+
+#endif	/* JSONRPC_STRUCTS_H */
diff --git a/tests/performance_tests/cn_slow_hash.h b/tests/performance_tests/cn_slow_hash.h
new file mode 100644
index 000000000..ec001326e
--- /dev/null
+++ b/tests/performance_tests/cn_slow_hash.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2012-2013 The Cryptonote developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#pragma once
+
+#include "crypto/crypto.h"
+#include "cryptonote_core/cryptonote_basic.h"
+
+class test_cn_slow_hash
+{
+public:
+  static const size_t loop_count = 10;
+
+#pragma pack(push, 1)
+  struct data_t
+  {
+    char data[13];
+  };
+#pragma pack(pop)
+
+  static_assert(13 == sizeof(data_t), "Invalid structure size");
+
+  bool init()
+  {
+    if (!epee::string_tools::hex_to_pod("63617665617420656d70746f72", m_data))
+      return false;
+
+    if (!epee::string_tools::hex_to_pod("bbec2cacf69866a8e740380fe7b818fc78f8571221742d729d9d02d7f8989b87", m_expected_hash))
+      return false;
+
+    return true;
+  }
+
+  bool test()
+  {
+    crypto::hash hash;
+    crypto::cn_slow_hash(&m_data, sizeof(m_data), hash);
+    return hash == m_expected_hash;
+  }
+
+private:
+  data_t m_data;
+  crypto::hash m_expected_hash;
+};

From 8d4320b20170253f29803836fb633c88e1d7911f Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 13:35:54 -0400
Subject: [PATCH 26/76] add checkpoints.cpp in unit tests

---
 tests/unit_tests/checkpoints.cpp | 140 +++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 tests/unit_tests/checkpoints.cpp

diff --git a/tests/unit_tests/checkpoints.cpp b/tests/unit_tests/checkpoints.cpp
new file mode 100644
index 000000000..0d7bd4de9
--- /dev/null
+++ b/tests/unit_tests/checkpoints.cpp
@@ -0,0 +1,140 @@
+// Copyright (c) 2012-2013 The Cryptonote developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "gtest/gtest.h"
+
+#include "cryptonote_core/checkpoints.cpp"
+
+using namespace cryptonote;
+
+
+TEST(checkpoints_is_alternative_block_allowed, handles_empty_checkpoins)
+{
+  checkpoints cp;
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(0, 0));
+
+  ASSERT_TRUE(cp.is_alternative_block_allowed(1, 1));
+  ASSERT_TRUE(cp.is_alternative_block_allowed(1, 9));
+  ASSERT_TRUE(cp.is_alternative_block_allowed(9, 1));
+}
+
+TEST(checkpoints_is_alternative_block_allowed, handles_one_checkpoint)
+{
+  checkpoints cp;
+  cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000");
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(0, 0));
+
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 1));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 4));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 9));
+
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 1));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 4));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 9));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 9));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 9));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(9, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(9, 9));
+}
+
+TEST(checkpoints_is_alternative_block_allowed, handles_two_and_more_checkpoints)
+{
+  checkpoints cp;
+  cp.add_checkpoint(5, "0000000000000000000000000000000000000000000000000000000000000000");
+  cp.add_checkpoint(9, "0000000000000000000000000000000000000000000000000000000000000000");
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(0, 0));
+
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 1));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 4));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 8));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(1, 11));
+
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 1));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 4));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 8));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(4, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(5, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 8));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(5, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(6, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 8));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(6, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(8, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(8, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(8, 5));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(8, 6));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(8, 8));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(8, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(8, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(8, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 5));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 6));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 8));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(9, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(9, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(9, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 5));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 6));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 8));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(10, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(10, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(10, 11));
+
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 1));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 4));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 5));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 6));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 8));
+  ASSERT_FALSE(cp.is_alternative_block_allowed(11, 9));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(11, 10));
+  ASSERT_TRUE (cp.is_alternative_block_allowed(11, 11));
+}

From af5a28efe5b914e6154048384d82c4b0dbfdb0dc Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Sun, 25 May 2014 21:36:12 +0200
Subject: [PATCH 27/76] 'mining_status' Daemon RPC command

---
 src/cryptonote_core/miner.cpp           | 19 ++++++++++++----
 src/cryptonote_core/miner.h             |  6 +++--
 src/rpc/core_rpc_server.cpp             | 18 +++++++++++++++
 src/rpc/core_rpc_server.h               |  2 ++
 src/rpc/core_rpc_server_commands_defs.h | 29 +++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/cryptonote_core/miner.cpp b/src/cryptonote_core/miner.cpp
index 56b459d6e..2055bb15d 100644
--- a/src/cryptonote_core/miner.cpp
+++ b/src/cryptonote_core/miner.cpp
@@ -188,10 +188,19 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------------
-  bool miner::is_mining()
+  bool miner::is_mining() const
   {
     return !m_stop;
   }
+  //-----------------------------------------------------------------------------------------------------
+  const account_public_address& miner::get_mining_address() const
+  {
+    return m_mine_address;
+  }
+  //-----------------------------------------------------------------------------------------------------
+  uint32_t miner::get_threads_count() const {
+    return m_threads_total;
+  }
   //----------------------------------------------------------------------------------------------------- 
   bool miner::start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs)
   {
@@ -226,12 +235,14 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------------
-  uint64_t miner::get_speed()
+  uint64_t miner::get_speed() const
   {
-    if(is_mining())
+    if(is_mining()) {
       return m_current_hash_rate;
-    else
+    }
+    else {
       return 0;
+    }
   }
   //-----------------------------------------------------------------------------------------------------
   void miner::send_stop_signal()
diff --git a/src/cryptonote_core/miner.h b/src/cryptonote_core/miner.h
index da4578b06..f1e4e5dce 100644
--- a/src/cryptonote_core/miner.h
+++ b/src/cryptonote_core/miner.h
@@ -36,10 +36,12 @@ namespace cryptonote
     bool set_block_template(const block& bl, const difficulty_type& diffic, uint64_t height);
     bool on_block_chain_update();
     bool start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs);
-    uint64_t get_speed();
+    uint64_t get_speed() const;
+    uint32_t get_threads_count() const;
     void send_stop_signal();
     bool stop();
-    bool is_mining();
+    bool is_mining() const;
+    const account_public_address& get_mining_address() const;
     bool on_idle();
     void on_synchronized();
     //synchronous analog (for fast calls)
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 2c4e82085..e4208b0bb 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -275,6 +275,24 @@ namespace cryptonote
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
+  bool core_rpc_server::on_mining_status(const COMMAND_RPC_MINING_STATUS::request& req, COMMAND_RPC_MINING_STATUS::response& res, connection_context& cntx)
+  {
+    CHECK_CORE_READY();
+
+    const miner& lMiner = m_core.get_miner();
+    res.active = lMiner.is_mining();
+    
+    if ( lMiner.is_mining() ) {
+      res.speed = lMiner.get_speed();
+      res.threads_count = lMiner.get_threads_count();
+      const account_public_address& lMiningAdr = lMiner.get_mining_address();
+      res.address = get_account_address_as_str(lMiningAdr);
+    }
+
+    res.status = CORE_RPC_STATUS_OK;
+    return true;
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_save_bc(const COMMAND_RPC_SAVE_BC::request& req, COMMAND_RPC_SAVE_BC::response& res, connection_context& cntx)
   {
     CHECK_CORE_READY();
diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h
index ad0016c94..0f8f69b9d 100644
--- a/src/rpc/core_rpc_server.h
+++ b/src/rpc/core_rpc_server.h
@@ -40,6 +40,7 @@ namespace cryptonote
       MAP_URI_AUTO_JON2("/sendrawtransaction", on_send_raw_tx, COMMAND_RPC_SEND_RAW_TX)
       MAP_URI_AUTO_JON2("/start_mining", on_start_mining, COMMAND_RPC_START_MINING)
       MAP_URI_AUTO_JON2("/stop_mining", on_stop_mining, COMMAND_RPC_STOP_MINING)
+      MAP_URI_AUTO_JON2("/mining_status", on_mining_status, COMMAND_RPC_MINING_STATUS)
       MAP_URI_AUTO_JON2("/save_bc", on_save_bc, COMMAND_RPC_SAVE_BC)
       MAP_URI_AUTO_JON2("/getinfo", on_get_info, COMMAND_RPC_GET_INFO)
       BEGIN_JSON_RPC_MAP("/json_rpc")
@@ -60,6 +61,7 @@ namespace cryptonote
     bool on_send_raw_tx(const COMMAND_RPC_SEND_RAW_TX::request& req, COMMAND_RPC_SEND_RAW_TX::response& res, connection_context& cntx);
     bool on_start_mining(const COMMAND_RPC_START_MINING::request& req, COMMAND_RPC_START_MINING::response& res, connection_context& cntx);
     bool on_stop_mining(const COMMAND_RPC_STOP_MINING::request& req, COMMAND_RPC_STOP_MINING::response& res, connection_context& cntx);
+    bool on_mining_status(const COMMAND_RPC_MINING_STATUS::request& req, COMMAND_RPC_MINING_STATUS::response& res, connection_context& cntx);
     bool on_get_random_outs(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res, connection_context& cntx);        
     bool on_get_info(const COMMAND_RPC_GET_INFO::request& req, COMMAND_RPC_GET_INFO::response& res, connection_context& cntx);        
     bool on_save_bc(const COMMAND_RPC_SAVE_BC::request& req, COMMAND_RPC_SAVE_BC::response& res, connection_context& cntx);
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 1e8ebe8ff..48df16e59 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -260,6 +260,35 @@ namespace cryptonote
     };
   };
 
+  //-----------------------------------------------
+  struct COMMAND_RPC_MINING_STATUS
+  {
+    struct request
+    {
+
+      BEGIN_KV_SERIALIZE_MAP()
+      END_KV_SERIALIZE_MAP()
+    };
+
+
+    struct response
+    {
+      std::string status;
+      bool active;
+      uint64_t speed;
+      uint32_t threads_count;
+      std::string address;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(status)
+        KV_SERIALIZE(active)
+        KV_SERIALIZE(speed)
+        KV_SERIALIZE(threads_count)
+        KV_SERIALIZE(address)
+      END_KV_SERIALIZE_MAP()
+    };
+  };
+
   //-----------------------------------------------
   struct COMMAND_RPC_SAVE_BC
   {

From e7171250739790a5e5040264c4c1356ddeeea241 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 15:47:32 -0400
Subject: [PATCH 28/76] enable checkpointed block verification

---
 src/cryptonote_core/blockchain_storage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp
index 7123b7521..9e9c77e85 100644
--- a/src/cryptonote_core/blockchain_storage.cpp
+++ b/src/cryptonote_core/blockchain_storage.cpp
@@ -1526,7 +1526,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
 
   // If we're at a checkpoint, ensure that our hardcoded checkpoint hash
   // is correct.
-  if(!m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height()))
+  if(m_checkpoints.is_in_checkpoint_zone(get_current_blockchain_height()))
   {
     if(!m_checkpoints.check_block(get_current_blockchain_height(), id))
     {

From 31a59785b0b3f678ea29fcfb63902f051c4e7ce0 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Sun, 25 May 2014 20:25:37 -0400
Subject: [PATCH 29/76] temporary fix for block reward dos

---
 ReleaseNotes.txt                |  3 ++-
 src/cryptonote_core/tx_pool.cpp | 24 +++++++++++++++++++++++-
 src/wallet/wallet2.h            |  7 ++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 6be441ea2..78e8af157 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -7,7 +7,8 @@ Release notes 0.8.8
 - Fixed a bug with checkpoints behavior
 - UI improvements for daemon
 - Fixed COIN value (10^12)
-- Raised minimum fee to (1/2) * (10^10)
+- Raised minimum fee to 5 * (10^9)
+- Temporary fix for block reward DoS attack
 
 Release notes 0.8.7
 
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 24e5752ad..37f4632a9 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -355,13 +355,35 @@ namespace cryptonote
     total_size = 0;
     fee = 0;
 
-    size_t max_total_size = 2 * median_size - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+    size_t max_total_size = 2 * median_size - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE; // Max block size
     std::unordered_set<crypto::key_image> k_images;
     BOOST_FOREACH(transactions_container::value_type& tx, m_transactions)
     {
+      // Can not exceed maximum block size
       if (max_total_size < total_size + tx.second.blob_size)
         continue;
 
+      // Check to see if the minimum fee is included
+      if (tx.second.fee < DEFAULT_FEE)
+        continue;
+
+      // Skip transactions that are too large
+      // TODO: Correct upper_transactions_size_limit
+      // such that it is based on median block size;
+      // We need to make a similar patch for
+      // wallet2.h
+      uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+      if (tx.second.blob_size > upper_transaction_size_limit)
+        continue;
+
+      // If we've exceeded the penalty free size,
+      // stop including more tx
+      if (total_size > median_size)
+        continue;      
+
+      // Skip transactions that are not ready to be
+      // included into the blockchain or that are
+      // missing key images
       if (!is_transaction_ready_to_go(tx.second) || have_key_images(k_images, tx.second.tx))
         continue;
 
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index d2016f696..f90fc4fac 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -102,7 +102,12 @@ namespace tools
     void store();
     cryptonote::account_base& get_account(){return m_account;}
 
-    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE*2 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
+    // upper_transaction_size_limit as defined below is set to 
+    // approximately 125% of the fixed minimum allowable penalty
+    // free block size. TODO: fix this so that it actually takes
+    // into account the current median block size rather than
+    // the minimum block size.
+    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
     bool deinit();
 
     void stop() { m_run.store(false, std::memory_order_relaxed); }

From 785814cb1007f84da3a723c10d778206dbf2fb31 Mon Sep 17 00:00:00 2001
From: paybee <dev@payb.ee>
Date: Mon, 26 May 2014 11:46:09 +0200
Subject: [PATCH 30/76] simplewallet exits when COMMAND is given as a
 command-line argument

---
 src/simplewallet/simplewallet.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 0f84b81de..cc10de5cd 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1054,14 +1054,20 @@ int main(int argc, char* argv[])
 
     std::vector<std::string> command = command_line::get_arg(vm, arg_command);
     if (!command.empty())
+    {
       w.process_command(command);
-
-    tools::signal_handler::install([&w] {
       w.stop();
-    });
-    w.run();
+      w.deinit();
+    }
+    else
+    {
+      tools::signal_handler::install([&w] {
+        w.stop();
+      });
+      w.run();
 
-    w.deinit();
+      w.deinit();
+    }
   }
   return 1;
   //CATCH_ENTRY_L0("main", 1);

From f545fd8ff04d66667c10c7668c0529c578e29db0 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Mon, 26 May 2014 19:51:22 -0400
Subject: [PATCH 31/76] maximum block size 130% of median

---
 src/cryptonote_core/tx_pool.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 37f4632a9..a95002dc8 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -357,13 +357,18 @@ namespace cryptonote
 
     size_t max_total_size = 2 * median_size - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE; // Max block size
     std::unordered_set<crypto::key_image> k_images;
+
+    // Tx size limit as in wallet2.h
+    uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+
     BOOST_FOREACH(transactions_container::value_type& tx, m_transactions)
     {
       // Can not exceed maximum block size
       if (max_total_size < total_size + tx.second.blob_size)
         continue;
 
-      // Check to see if the minimum fee is included
+      // Check to see if the minimum fee is included;
+      // exclude tx missing minimum fee
       if (tx.second.fee < DEFAULT_FEE)
         continue;
 
@@ -372,14 +377,20 @@ namespace cryptonote
       // such that it is based on median block size;
       // We need to make a similar patch for
       // wallet2.h
-      uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
       if (tx.second.blob_size > upper_transaction_size_limit)
         continue;
 
+      // If adding this tx will make the block size
+      // greater than 130% of the median, reject the
+      // tx; this will keep down largely punitive tx
+      // from being included
+      if ( (total_size + tx.second.blob_size) > ((130 * median_size) / 100) )
+        continue;
+
       // If we've exceeded the penalty free size,
       // stop including more tx
       if (total_size > median_size)
-        continue;      
+        break;      
 
       // Skip transactions that are not ready to be
       // included into the blockchain or that are

From 328a52a5438435666ba3564afe73e866aae2b5c9 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Mon, 26 May 2014 20:57:50 -0400
Subject: [PATCH 32/76] dynamic tx size scaling for tx mempool

---
 src/cryptonote_core/tx_pool.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index a95002dc8..5eb99db40 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -361,6 +361,17 @@ namespace cryptonote
     // Tx size limit as in wallet2.h
     uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
 
+    // Calculate size limit based on median too; useful
+    // for when we actually fix wallet2.h's maximum
+    // allowable tx size
+    //
+    // Can be removed when wallet2.h calculates max
+    // tx size based on the median too; just use
+    // upper_transaction_size_limit_median in all cases
+    uint64_t upper_transaction_size_limit_median = ((median_size * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+    if (upper_transaction_size_limit_median > upper_transaction_size_limit)
+      upper_transaction_size_limit = upper_transaction_size_limit_median;
+
     BOOST_FOREACH(transactions_container::value_type& tx, m_transactions)
     {
       // Can not exceed maximum block size

From cf885350d95c24519cdf5788255f57d6eb425ff4 Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Mon, 26 May 2014 23:02:01 -0400
Subject: [PATCH 33/76] further restrict maximum tx size b/c of spam

---
 src/wallet/wallet2.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index edbf31f2d..4cbed2f9e 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -102,7 +102,12 @@ namespace tools
     void store();
     cryptonote::account_base& get_account(){return m_account;}
 
-    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE*2 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
+    // upper_transaction_size_limit as defined below is set to 
+    // approximately 125% of the fixed minimum allowable penalty
+    // free block size. TODO: fix this so that it actually takes
+    // into account the current median block size rather than
+    // the minimum block size.
+    void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE);
     bool deinit();
 
     void stop() { m_run.store(false, std::memory_order_relaxed); }

From 26292c5cd06c3ab4250729c38fbe68ffb179787d Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Mon, 26 May 2014 23:03:02 -0400
Subject: [PATCH 34/76] raise min fee and correct COIN value

---
 src/cryptonote_config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index 34d053aa8..a90473bd4 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -26,8 +26,8 @@
 #define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE          600
 #define CRYPTONOTE_DISPLAY_DECIMAL_POINT                12
 // COIN - number of smallest units in one coin
-#define COIN                                            ((uint64_t)100000000) // pow(10, 8)
-#define DEFAULT_FEE                                     ((uint64_t)1000000) // pow(10, 6)
+#define COIN                                            ((uint64_t)1000000000000) // pow(10, 12)
+#define DEFAULT_FEE                                     ((uint64_t)5000000000) // 5 * pow(10, 9)
 
 
 #define ORPHANED_BLOCKS_MAX_COUNT                       100

From feacdded6b48fcfe18bc3218b05b27e94db2fc92 Mon Sep 17 00:00:00 2001
From: paybee <dev@payb.ee>
Date: Tue, 27 May 2014 12:52:11 +0200
Subject: [PATCH 35/76] Added incoming_transfers RPC API method

---
 src/wallet/wallet_rpc_server.cpp            | 64 +++++++++++++++++++++
 src/wallet/wallet_rpc_server.h              | 10 ++--
 src/wallet/wallet_rpc_server_commans_defs.h | 36 ++++++++++++
 src/wallet/wallet_rpc_server_error_codes.h  |  2 +
 4 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index f1766c3b4..7dc73d8bf 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -166,4 +166,68 @@ namespace tools
     return true;
   }
   //------------------------------------------------------------------------------------------------------------------------------
+  bool wallet_rpc_server::on_incoming_transfers(const wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS::request& req, wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS::response& res, epee::json_rpc::error& er, connection_context& cntx)
+  {
+    if(req.transfer_type.compare("all") != 0 && req.transfer_type.compare("available") != 0 && req.transfer_type.compare("unavailable") != 0)
+    {
+      er.code = WALLET_RPC_ERROR_CODE_TRANSFER_TYPE;
+      er.message = "Transfer type must be one of: all, available, or unavailable; provided: "
+      return false;
+    }
+
+    bool filter = false;
+    bool available = false;
+    if (req.transfer_type.compare("available") == 0)
+    {
+      filter = true;
+      available = true;
+    }
+    else if (req.transfer_type.compare("unavailable") == 0)
+    {
+      filter = true;
+      available = false;
+    }
+
+    wallet2::transfer_container transfers;
+    m_wallet.get_transfers(transfers);
+
+    bool transfers_found = false;
+    for (const auto& td : transfers)
+    {
+      if (!filter || available != td.m_spent)
+      {
+        if (!transfers_found)
+        {
+          transfers_found = true;
+        }
+        wallet_rpc::transfer_details rpc_transfers;
+        rpc_transfers.amount       = td.amount();
+        rpc_transfers.spent        = td.m_spent;
+        rpc_transfers.global_index = td.m_global_output_index;
+        rpc_transfers.tx_hash      = boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(td.m_tx));
+        res.transfers.push_back(rpc_transfers);
+      }
+    }
+
+    if (!transfers_found)
+    {
+      er.code = WALLET_RPC_ERROR_CODE_NO_TRANSFERS;
+      if (!filter)
+      {
+        er.message = "No incoming transfers";
+      }
+      else if (available)
+      {
+        er.message = "No incoming available transfers";
+      }
+      else
+      {
+        er.message = "No incoming unavailable transfers";
+      }
+      return false;
+    }
+  
+    return true;
+  }
+  //------------------------------------------------------------------------------------------------------------------------------
 }
diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h
index db49df574..69cc9530a 100644
--- a/src/wallet/wallet_rpc_server.h
+++ b/src/wallet/wallet_rpc_server.h
@@ -35,10 +35,11 @@ namespace tools
 
     BEGIN_URI_MAP2()
       BEGIN_JSON_RPC_MAP("/json_rpc")
-        MAP_JON_RPC_WE("getbalance",   on_getbalance,   wallet_rpc::COMMAND_RPC_GET_BALANCE)
-        MAP_JON_RPC_WE("transfer",     on_transfer,     wallet_rpc::COMMAND_RPC_TRANSFER)
-        MAP_JON_RPC_WE("store",        on_store,        wallet_rpc::COMMAND_RPC_STORE)
-        MAP_JON_RPC_WE("get_payments", on_get_payments, wallet_rpc::COMMAND_RPC_GET_PAYMENTS)
+        MAP_JON_RPC_WE("getbalance",         on_getbalance,         wallet_rpc::COMMAND_RPC_GET_BALANCE)
+        MAP_JON_RPC_WE("transfer",           on_transfer,           wallet_rpc::COMMAND_RPC_TRANSFER)
+        MAP_JON_RPC_WE("store",              on_store,              wallet_rpc::COMMAND_RPC_STORE)
+        MAP_JON_RPC_WE("get_payments",       on_get_payments,       wallet_rpc::COMMAND_RPC_GET_PAYMENTS)
+        MAP_JON_RPC_WE("incoming_transfers", on_incoming_transfers, wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS)
       END_JSON_RPC_MAP()
     END_URI_MAP2()
 
@@ -47,6 +48,7 @@ namespace tools
       bool on_transfer(const wallet_rpc::COMMAND_RPC_TRANSFER::request& req, wallet_rpc::COMMAND_RPC_TRANSFER::response& res, epee::json_rpc::error& er, connection_context& cntx);
       bool on_store(const wallet_rpc::COMMAND_RPC_STORE::request& req, wallet_rpc::COMMAND_RPC_STORE::response& res, epee::json_rpc::error& er, connection_context& cntx);
       bool on_get_payments(const wallet_rpc::COMMAND_RPC_GET_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_PAYMENTS::response& res, epee::json_rpc::error& er, connection_context& cntx);
+      bool on_incoming_transfers(const wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS::request& req, wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS::response& res, epee::json_rpc::error& er, connection_context& cntx);
 
       bool handle_command_line(const boost::program_options::variables_map& vm);
 
diff --git a/src/wallet/wallet_rpc_server_commans_defs.h b/src/wallet/wallet_rpc_server_commans_defs.h
index b99d92ca2..7bdb49b2c 100644
--- a/src/wallet/wallet_rpc_server_commans_defs.h
+++ b/src/wallet/wallet_rpc_server_commans_defs.h
@@ -121,6 +121,42 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
   };
+  
+  struct transfer_details
+  {
+    uint64_t amount;
+    bool spent;
+    uint64_t global_index;
+    std::string tx_hash;
+
+    BEGIN_KV_SERIALIZE_MAP()
+      KV_SERIALIZE(amount)
+      KV_SERIALIZE(spent)
+      KV_SERIALIZE(global_index)
+      KV_SERIALIZE(tx_hash)
+    END_KV_SERIALIZE_MAP()
+  };
+
+  struct COMMAND_RPC_INCOMING_TRANSFERS
+  {
+    struct request
+    {
+      std::string transfer_type;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(transfer_type)
+      END_KV_SERIALIZE_MAP()
+    };
+
+    struct response
+    {
+      std::list<transfer_details> transfers;
+
+      BEGIN_KV_SERIALIZE_MAP()
+        KV_SERIALIZE(transfers)
+      END_KV_SERIALIZE_MAP()
+    };
+  };
 }
 }
 
diff --git a/src/wallet/wallet_rpc_server_error_codes.h b/src/wallet/wallet_rpc_server_error_codes.h
index 7fa536dac..fb3c1c1a9 100644
--- a/src/wallet/wallet_rpc_server_error_codes.h
+++ b/src/wallet/wallet_rpc_server_error_codes.h
@@ -10,3 +10,5 @@
 #define WALLET_RPC_ERROR_CODE_DAEMON_IS_BUSY          -3
 #define WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR  -4
 #define WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID        -5
+#define WALLET_RPC_ERROR_CODE_TRANSFER_TYPE           -6
+#define WALLET_RPC_ERROR_CODE_NO_TRANSFERS            -7

From 976152994135592bb37db3d8bee6189238c1c071 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Tue, 27 May 2014 16:45:50 -0400
Subject: [PATCH 36/76] fix typing mismatch

---
 src/cryptonote_core/tx_pool.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 5eb99db40..294cfc254 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -350,6 +350,10 @@ namespace cryptonote
   //---------------------------------------------------------------------------------
   bool tx_memory_pool::fill_block_template(block &bl, size_t median_size, uint64_t already_generated_coins, size_t &total_size, uint64_t &fee)
   {
+    // Warning: This function takes already_generated_
+    // coins as an argument and appears to do nothing
+    // with it.
+
     CRITICAL_REGION_LOCAL(m_transactions_lock);
 
     total_size = 0;
@@ -359,7 +363,10 @@ namespace cryptonote
     std::unordered_set<crypto::key_image> k_images;
 
     // Tx size limit as in wallet2.h
-    uint64_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+    // tx_pool.cpp uses uint64_t for tx sizes, whereas
+    // wallet2.h uses uint64_t; just use size_t here 
+    // for now
+    size_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
 
     // Calculate size limit based on median too; useful
     // for when we actually fix wallet2.h's maximum
@@ -368,7 +375,7 @@ namespace cryptonote
     // Can be removed when wallet2.h calculates max
     // tx size based on the median too; just use
     // upper_transaction_size_limit_median in all cases
-    uint64_t upper_transaction_size_limit_median = ((median_size * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
+    size_t upper_transaction_size_limit_median = ((median_size * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;
     if (upper_transaction_size_limit_median > upper_transaction_size_limit)
       upper_transaction_size_limit = upper_transaction_size_limit_median;
 

From 2475ec877fbd7e9d46bf94b3f847cbad062b64db Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Wed, 28 May 2014 13:19:24 -0400
Subject: [PATCH 37/76] typo in tx_pool.cpp

---
 src/cryptonote_core/tx_pool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 294cfc254..4c4c6aea1 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -363,7 +363,7 @@ namespace cryptonote
     std::unordered_set<crypto::key_image> k_images;
 
     // Tx size limit as in wallet2.h
-    // tx_pool.cpp uses uint64_t for tx sizes, whereas
+    // tx_pool.cpp uses size_t for tx sizes, whereas
     // wallet2.h uses uint64_t; just use size_t here 
     // for now
     size_t upper_transaction_size_limit = ((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;

From dfc092d3a973a184142fd9d86a2301f58b02396f Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Wed, 28 May 2014 21:58:38 +0200
Subject: [PATCH 38/76] Fixed return status for '--help'. Fixed wallet name
 (use macro instead of 'bytecoin wallet'

---
 src/simplewallet/simplewallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 0f84b81de..158fa1d4f 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -944,7 +944,7 @@ int main(int argc, char* argv[])
 
     if (command_line::get_arg(vm, command_line::arg_help))
     {
-      success_msg_writer() << "bytecoin wallet v" << PROJECT_VERSION_LONG;
+      success_msg_writer() << CRYPTONOTE_NAME << " wallet v" << PROJECT_VERSION_LONG;
       success_msg_writer() << "Usage: simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
       success_msg_writer() << desc_all << '\n' << w.get_commands_str();
       return false;
@@ -961,7 +961,7 @@ int main(int argc, char* argv[])
     return true;
   });
   if (!r)
-    return 1;
+    return 0;
 
   //set up logging options
   log_space::get_set_log_detalisation_level(true, LOG_LEVEL_2);

From d2f44503a7d3d9cbf37bc1b44686b0b6f076212b Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Wed, 28 May 2014 22:21:52 +0200
Subject: [PATCH 39/76] Added '--exit-after-cmd' option in simplewallet

---
 src/simplewallet/simplewallet.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 158fa1d4f..b5f4b7a6f 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -38,6 +38,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_daemon_address = {"daemon-address", "Use daemon instance at <host>:<port>", ""};
   const command_line::arg_descriptor<std::string> arg_daemon_host = {"daemon-host", "Use daemon instance at host <arg> instead of localhost", ""};
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
+  const command_line::arg_descriptor<std::string> arg_exit_after_cmd = {"exit-after-cmd", "Will not enter in the CLI console after command execution. Default: false", ""};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -928,6 +929,7 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_params, arg_daemon_host);
   command_line::add_arg(desc_params, arg_daemon_port);
   command_line::add_arg(desc_params, arg_command);
+  command_line::add_arg(desc_params, arg_exit_after_cmd);
   command_line::add_arg(desc_params, arg_log_level);
   tools::wallet_rpc_server::init_options(desc_params);
 
@@ -1059,7 +1061,13 @@ int main(int argc, char* argv[])
     tools::signal_handler::install([&w] {
       w.stop();
     });
-    w.run();
+
+    const std::string& exit_after_command = command_line::get_arg(vm, arg_exit_after_cmd);
+
+    /* Enters in CLI mode only if --exit-after-cmd is not set to true */
+    if ( !boost::iequals(exit_after_command,"true") && !boost::iequals(exit_after_command,"yes") ) {
+      w.run();
+    }
 
     w.deinit();
   }

From 506fd372ec78f3cb5c492fc981bbaac7936be8aa Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Wed, 28 May 2014 22:27:59 +0200
Subject: [PATCH 40/76] simplewallet returns 0 when no error

---
 src/simplewallet/simplewallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index b5f4b7a6f..7485f5cb1 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1071,6 +1071,6 @@ int main(int argc, char* argv[])
 
     w.deinit();
   }
-  return 1;
+  return 0;
   //CATCH_ENTRY_L0("main", 1);
 }

From 7f0b8465e7e7a3d917cd4252a67b99c77eb8328c Mon Sep 17 00:00:00 2001
From: artifexd <artifexd@outlook.com>
Date: Sun, 1 Jun 2014 17:53:44 -0400
Subject: [PATCH 41/76] Enable wallet refresh before blockchain is saved or
 completely sync'd.

---
 src/rpc/core_rpc_server.cpp | 42 ++++++++++++++++++++-----------------
 src/rpc/core_rpc_server.h   |  1 +
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 8779f73d8..ef569b3fe 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -48,24 +48,30 @@ namespace cryptonote
     return epee::http_server_impl_base<core_rpc_server, connection_context>::init(m_port, m_bind_ip);
   }
   //------------------------------------------------------------------------------------------------------------------------------
-  bool core_rpc_server::check_core_ready()
+  bool core_rpc_server::check_core_busy()
   {
-    if(!m_p2p.get_payload_object().is_synchronized())
-    {
-      return false;
-    }
     if(m_p2p.get_payload_object().get_core().get_blockchain_storage().is_storing_blockchain())
     {
       return false;
     }
     return true;
   }
+#define CHECK_CORE_BUSY() if(!check_core_busy()){res.status =  CORE_RPC_STATUS_BUSY;return true;}
+  //------------------------------------------------------------------------------------------------------------------------------
+  bool core_rpc_server::check_core_ready()
+  {
+    if(!m_p2p.get_payload_object().is_synchronized())
+    {
+      return false;
+    }
+    return check_core_busy();
+  }
 #define CHECK_CORE_READY() if(!check_core_ready()){res.status =  CORE_RPC_STATUS_BUSY;return true;}
 
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_height(const COMMAND_RPC_GET_HEIGHT::request& req, COMMAND_RPC_GET_HEIGHT::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     res.height = m_core.get_current_blockchain_height();
     res.status = CORE_RPC_STATUS_OK;
     return true;
@@ -73,7 +79,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_info(const COMMAND_RPC_GET_INFO::request& req, COMMAND_RPC_GET_INFO::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     res.height = m_core.get_current_blockchain_height();
     res.difficulty = m_core.get_blockchain_storage().get_difficulty_for_next_block();
     res.tx_count = m_core.get_blockchain_storage().get_total_transactions() - res.height; //without coinbase
@@ -90,7 +96,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_blocks(const COMMAND_RPC_GET_BLOCKS_FAST::request& req, COMMAND_RPC_GET_BLOCKS_FAST::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     std::list<std::pair<block, std::list<transaction> > > bs;
     if(!m_core.find_blockchain_supplement(req.block_ids, bs, res.current_height, res.start_height, COMMAND_RPC_GET_BLOCKS_FAST_MAX_COUNT))
     {
@@ -114,7 +120,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_random_outs(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     res.status = "Failed";
     if(!m_core.get_random_outs_for_amounts(req, res))
     {
@@ -143,7 +149,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_indexes(const COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::request& req, COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     bool r = m_core.get_tx_outputs_gindexs(req.txid, res.o_indexes);
     if(!r)
     {
@@ -157,7 +163,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_transactions(const COMMAND_RPC_GET_TRANSACTIONS::request& req, COMMAND_RPC_GET_TRANSACTIONS::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     std::vector<crypto::hash> vh;
     BOOST_FOREACH(const auto& tx_hex_str, req.txs_hashes)
     {
@@ -232,7 +238,6 @@ namespace cryptonote
       return true;
     }
 
-
     NOTIFY_NEW_TRANSACTIONS::request r;
     r.txs.push_back(tx_blob);
     m_core.get_protocol()->relay_transactions(r, fake_context);
@@ -265,7 +270,6 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_stop_mining(const COMMAND_RPC_STOP_MINING::request& req, COMMAND_RPC_STOP_MINING::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
     if(!m_core.get_miner().stop())
     {
       res.status = "Failed, mining not stopped";
@@ -277,7 +281,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_save_bc(const COMMAND_RPC_SAVE_BC::request& req, COMMAND_RPC_SAVE_BC::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     if( !m_core.get_blockchain_storage().store_blockchain() )
     {
       res.status = "Error while storing blockhain";
@@ -289,7 +293,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_getblockcount(const COMMAND_RPC_GETBLOCKCOUNT::request& req, COMMAND_RPC_GETBLOCKCOUNT::response& res, connection_context& cntx)
   {
-    CHECK_CORE_READY();
+    CHECK_CORE_BUSY();
     res.count = m_core.get_current_blockchain_height();
     res.status = CORE_RPC_STATUS_OK;
     return true;
@@ -297,7 +301,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_getblockhash(const COMMAND_RPC_GETBLOCKHASH::request& req, COMMAND_RPC_GETBLOCKHASH::response& res, epee::json_rpc::error& error_resp, connection_context& cntx)
   {
-    if(!check_core_ready())
+    if(!check_core_busy())
     {
       error_resp.code = CORE_RPC_ERROR_CODE_CORE_BUSY;
       error_resp.message = "Core is busy";
@@ -455,7 +459,7 @@ namespace cryptonote
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_last_block_header(const COMMAND_RPC_GET_LAST_BLOCK_HEADER::request& req, COMMAND_RPC_GET_LAST_BLOCK_HEADER::response& res, epee::json_rpc::error& error_resp, connection_context& cntx)
   {
-    if(!check_core_ready())
+    if(!check_core_busy())
     {
       error_resp.code = CORE_RPC_ERROR_CODE_CORE_BUSY;
       error_resp.message = "Core is busy.";
@@ -490,7 +494,7 @@ namespace cryptonote
   }
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_block_header_by_hash(const COMMAND_RPC_GET_BLOCK_HEADER_BY_HASH::request& req, COMMAND_RPC_GET_BLOCK_HEADER_BY_HASH::response& res, epee::json_rpc::error& error_resp, connection_context& cntx){
-    if(!check_core_ready())
+    if(!check_core_busy())
     {
       error_resp.code = CORE_RPC_ERROR_CODE_CORE_BUSY;
       error_resp.message = "Core is busy.";
@@ -531,7 +535,7 @@ namespace cryptonote
   }
   //------------------------------------------------------------------------------------------------------------------------------
   bool core_rpc_server::on_get_block_header_by_height(const COMMAND_RPC_GET_BLOCK_HEADER_BY_HEIGHT::request& req, COMMAND_RPC_GET_BLOCK_HEADER_BY_HEIGHT::response& res, epee::json_rpc::error& error_resp, connection_context& cntx){
-    if(!check_core_ready())
+    if(!check_core_busy())
     {
       error_resp.code = CORE_RPC_ERROR_CODE_CORE_BUSY;
       error_resp.message = "Core is busy.";
diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h
index ad0016c94..2516c8455 100644
--- a/src/rpc/core_rpc_server.h
+++ b/src/rpc/core_rpc_server.h
@@ -74,6 +74,7 @@ namespace cryptonote
     bool on_get_block_header_by_height(const COMMAND_RPC_GET_BLOCK_HEADER_BY_HEIGHT::request& req, COMMAND_RPC_GET_BLOCK_HEADER_BY_HEIGHT::response& res, epee::json_rpc::error& error_resp, connection_context& cntx);
     //-----------------------
     bool handle_command_line(const boost::program_options::variables_map& vm);
+    bool check_core_busy();
     bool check_core_ready();
     
     //utils

From 117393d562fc9782efed0e1b25f6470d9f8102b2 Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Mon, 2 Jun 2014 00:22:42 +0200
Subject: [PATCH 42/76] Added 'payment_id' optional argument to 'transfer'
 wallet RPC method

---
 src/simplewallet/simplewallet.cpp           | 17 ++----------
 src/wallet/wallet2.cpp                      | 14 ++++++++++
 src/wallet/wallet2.h                        |  2 ++
 src/wallet/wallet_rpc_server.cpp            | 29 ++++++++++++++++++++-
 src/wallet/wallet_rpc_server_commans_defs.h |  2 ++
 5 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index dc45d9d74..4cab12c22 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -64,19 +64,6 @@ namespace
     return err;
   }
 
-  bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id)
-  {
-    blobdata payment_id_data;
-    if(!string_tools::parse_hexstr_to_binbuff(payment_id_str, payment_id_data))
-      return false;
-
-    if(sizeof(crypto::hash) != payment_id_data.size())
-      return false;
-
-    payment_id = *reinterpret_cast<const crypto::hash*>(payment_id_data.data());
-    return true;
-  }
-
   class message_writer
   {
   public:
@@ -680,7 +667,7 @@ bool simple_wallet::show_payments(const std::vector<std::string> &args)
   for(std::string arg : args)
   {
     crypto::hash payment_id;
-    if(parse_payment_id(arg, payment_id))
+    if(tools::wallet2::parse_payment_id(arg, payment_id))
     {
       std::list<tools::wallet2::payment_details> payments;
       m_wallet->get_payments(payment_id, payments);
@@ -763,7 +750,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
     local_args.pop_back();
 
     crypto::hash payment_id;
-    bool r = parse_payment_id(payment_id_str, payment_id);
+    bool r = tools::wallet2::parse_payment_id(payment_id_str, payment_id);
     if(r)
     {
       std::string extra_nonce;
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 111b76117..fb1e5575b 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -19,6 +19,7 @@ using namespace epee;
 #include "profile_tools.h"
 #include "crypto/crypto.h"
 #include "serialization/binary_utils.h"
+#include "cryptonote_protocol/blobdatatype.h"
 
 using namespace cryptonote;
 
@@ -465,6 +466,19 @@ void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists
   wallet_file_exists = boost::filesystem::exists(wallet_file, ignore);
 }
 //----------------------------------------------------------------------------------------------------
+bool wallet2::parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id)
+{
+  cryptonote::blobdata payment_id_data;
+  if(!epee::string_tools::parse_hexstr_to_binbuff(payment_id_str, payment_id_data))
+    return false;
+
+  if(sizeof(crypto::hash) != payment_id_data.size())
+    return false;
+
+  payment_id = *reinterpret_cast<const crypto::hash*>(payment_id_data.data());
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
 bool wallet2::prepare_file_names(const std::string& file_path)
 {
   do_prepare_file_names(file_path, m_keys_file, m_wallet_file);
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index f90fc4fac..9ca586425 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -151,6 +151,8 @@ namespace tools
 
     static void wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists);
 
+    static bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id);
+
   private:
     bool store_keys(const std::string& keys_file_name, const std::string& password);
     void load_keys(const std::string& keys_file_name, const std::string& password);
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 55f81aacc..af195cfcc 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -102,10 +102,37 @@ namespace tools
       de.amount = it->amount;
       dsts.push_back(de);
     }
+
+    std::vector<uint8_t> extra;
+    if (!req.payment_id.empty()) {
+
+      /* Just to clarify */
+      const std::string& payment_id_str = req.payment_id;
+
+      crypto::hash payment_id;
+      /* Parse payment ID */
+      if (!wallet2::parse_payment_id(payment_id_str, payment_id)) {
+        er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
+        er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 64-character string";
+        return false;
+      }
+
+      std::string extra_nonce;
+      cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
+      
+      /* Append Payment ID data into extra */
+      if (!cryptonote::add_extra_nonce_to_tx_extra(extra, extra_nonce)) {
+        er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
+        er.message = "Something went wront with payment_id. Please check its format: \"" + payment_id_str + "\", expected 64-character string";
+        return false;
+      }
+
+    }
+
     try
     {
       cryptonote::transaction tx;
-      m_wallet.transfer(dsts, req.mixin, req.unlock_time, req.fee, std::vector<uint8_t>(), tx);
+      m_wallet.transfer(dsts, req.mixin, req.unlock_time, req.fee, extra, tx);
       res.tx_hash = boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(tx));
       return true;
     }
diff --git a/src/wallet/wallet_rpc_server_commans_defs.h b/src/wallet/wallet_rpc_server_commans_defs.h
index cc005b29c..df05b4e0a 100644
--- a/src/wallet/wallet_rpc_server_commans_defs.h
+++ b/src/wallet/wallet_rpc_server_commans_defs.h
@@ -70,12 +70,14 @@ namespace wallet_rpc
       uint64_t fee;
       uint64_t mixin;
       uint64_t unlock_time;
+      std::string payment_id;
 
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(destinations)
         KV_SERIALIZE(fee)
         KV_SERIALIZE(mixin)
         KV_SERIALIZE(unlock_time)
+        KV_SERIALIZE(payment_id)
       END_KV_SERIALIZE_MAP()
     };
 

From b09eea548a247c4455f9afd772f33c10491f140f Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Mon, 2 Jun 2014 22:03:04 +0200
Subject: [PATCH 43/76] Added Doxyfile for (uggly) documentation generation

---
 Doxyfile | 2310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2310 insertions(+)
 create mode 100644 Doxyfile

diff --git a/Doxyfile b/Doxyfile
new file mode 100644
index 000000000..a70ef812b
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,2310 @@
+# Doxyfile 1.8.7
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Bitmonero"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = src
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = $(HAVE_DOT)
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES

From 3fc22c2955722a9e39d87b205fcf5095f3807bb7 Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Mon, 2 Jun 2014 22:07:20 +0200
Subject: [PATCH 44/76] Updated README for documentation

---
 README | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 87a89c587..1ed19f898 100644
--- a/README
+++ b/README
@@ -29,4 +29,20 @@ cd build
 cmake -G "Visual Studio 11 Win64" ..
 
 And then do Build.
-Good luck!
\ No newline at end of file
+Good luck!
+
+
+Build documentation (Doxygen) :
+Pequired Packages:
+* doxygen
+* graphviz (optional)
+
+From root code directory, execute :
+
+    doxygen Doxyfile
+
+If you have installed *graphviz*, you can also generate in-doc diagrams :
+
+    HAVE_DOT=YES doxygen Doxyfile
+
+The output will go in **doc/html/**

From 295c284c3e4ea6a7ec36353b9b23bb6f5db497f8 Mon Sep 17 00:00:00 2001
From: paybee <dev@payb.ee>
Date: Mon, 2 Jun 2014 22:36:35 +0200
Subject: [PATCH 45/76] Added incoming_transfers RPC API method

---
 src/wallet/wallet_rpc_server.cpp           | 15 +--------------
 src/wallet/wallet_rpc_server_error_codes.h |  1 -
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 7dc73d8bf..b721a27ab 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -171,7 +171,7 @@ namespace tools
     if(req.transfer_type.compare("all") != 0 && req.transfer_type.compare("available") != 0 && req.transfer_type.compare("unavailable") != 0)
     {
       er.code = WALLET_RPC_ERROR_CODE_TRANSFER_TYPE;
-      er.message = "Transfer type must be one of: all, available, or unavailable; provided: "
+      er.message = "Transfer type must be one of: all, available, or unavailable";
       return false;
     }
 
@@ -211,19 +211,6 @@ namespace tools
 
     if (!transfers_found)
     {
-      er.code = WALLET_RPC_ERROR_CODE_NO_TRANSFERS;
-      if (!filter)
-      {
-        er.message = "No incoming transfers";
-      }
-      else if (available)
-      {
-        er.message = "No incoming available transfers";
-      }
-      else
-      {
-        er.message = "No incoming unavailable transfers";
-      }
       return false;
     }
   
diff --git a/src/wallet/wallet_rpc_server_error_codes.h b/src/wallet/wallet_rpc_server_error_codes.h
index fb3c1c1a9..a37bde795 100644
--- a/src/wallet/wallet_rpc_server_error_codes.h
+++ b/src/wallet/wallet_rpc_server_error_codes.h
@@ -11,4 +11,3 @@
 #define WALLET_RPC_ERROR_CODE_GENERIC_TRANSFER_ERROR  -4
 #define WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID        -5
 #define WALLET_RPC_ERROR_CODE_TRANSFER_TYPE           -6
-#define WALLET_RPC_ERROR_CODE_NO_TRANSFERS            -7

From 7fea5645e2e9da312d2b02a1e22087f4b9aba1ce Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Wed, 4 Jun 2014 22:50:13 +0200
Subject: [PATCH 46/76] 'getinfo' daemon HTTP-RPC returns 'target_height' for
 progress estimations

---
 src/cryptonote_core/cryptonote_core.cpp                | 10 +++++++++-
 src/cryptonote_core/cryptonote_core.h                  |  5 +++++
 .../cryptonote_protocol_handler.inl                    |  5 +++++
 src/rpc/core_rpc_server.cpp                            |  1 +
 src/rpc/core_rpc_server_commands_defs.h                |  2 ++
 tests/core_proxy/core_proxy.h                          |  1 +
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index b6bfa09c8..b2389fce2 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -28,7 +28,8 @@ namespace cryptonote
               m_blockchain_storage(m_mempool),
               m_miner(this),
               m_miner_address(boost::value_initialized<account_public_address>()), 
-              m_starter_message_showed(false)
+              m_starter_message_showed(false),
+              m_target_blockchain_height(0)
   {
     set_cryptonote_protocol(pprotocol);
   }
@@ -516,4 +517,11 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
+  void core::set_target_blockchain_height(uint64_t target_blockchain_height) {
+    m_target_blockchain_height = target_blockchain_height;
+  }
+  //-----------------------------------------------------------------------------------------------
+  uint64_t core::get_target_blockchain_height() const {
+    return m_target_blockchain_height;
+  }
 }
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index cde52d5a2..7ef0f8b1d 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -90,6 +90,9 @@ namespace cryptonote
      void print_blockchain_outs(const std::string& file);
      void on_synchronized();
 
+     void set_target_blockchain_height(uint64_t target_blockchain_height);
+     uint64_t get_target_blockchain_height() const;
+
    private:
      bool add_new_tx(const transaction& tx, const crypto::hash& tx_hash, const crypto::hash& tx_prefix_hash, size_t blob_size, tx_verification_context& tvc, bool keeped_by_block);
      bool add_new_tx(const transaction& tx, tx_verification_context& tvc, bool keeped_by_block);
@@ -124,6 +127,8 @@ namespace cryptonote
      epee::math_helper::once_a_time_seconds<60*60*12, false> m_store_blockchain_interval;
      friend class tx_validate_inputs;
      std::atomic<bool> m_starter_message_showed;
+
+     uint64_t m_target_blockchain_height;
    };
 }
 
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 2584f1097..b74a81586 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -108,6 +108,11 @@ namespace cryptonote
       return true;
     }
 
+    /* As I don't know if accessing hshd from core could be a good practice, 
+    I prefer pushing target height to the core at the same time it is pushed to the user.
+    Nz. */
+    m_core.set_target_blockchain_height(hshd.current_height);
+    
     int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height());
     LOG_PRINT_CCONTEXT_YELLOW("Sync data returned unknown top block: " << m_core.get_current_blockchain_height() << " -> " << hshd.current_height
       << " [" << std::abs(diff) << " blocks (" << diff / (24 * 60 * 60 / DIFFICULTY_TARGET) << " days) "
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index e4a7c9773..03af66f4f 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -81,6 +81,7 @@ namespace cryptonote
   {
     CHECK_CORE_BUSY();
     res.height = m_core.get_current_blockchain_height();
+    res.target_height = m_core.get_target_blockchain_height();
     res.difficulty = m_core.get_blockchain_storage().get_difficulty_for_next_block();
     res.tx_count = m_core.get_blockchain_storage().get_total_transactions() - res.height; //without coinbase
     res.tx_pool_size = m_core.get_pool_transactions_count();
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 48df16e59..6e87fb48c 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -214,6 +214,7 @@ namespace cryptonote
     {
       std::string status;
       uint64_t height;
+      uint64_t target_height;
       uint64_t difficulty;
       uint64_t tx_count;
       uint64_t tx_pool_size;
@@ -226,6 +227,7 @@ namespace cryptonote
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(status)
         KV_SERIALIZE(height)
+        KV_SERIALIZE(target_height)
         KV_SERIALIZE(difficulty)
         KV_SERIALIZE(tx_count)
         KV_SERIALIZE(tx_pool_size)
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h
index d5be53f1d..60f0b3c2d 100644
--- a/tests/core_proxy/core_proxy.h
+++ b/tests/core_proxy/core_proxy.h
@@ -41,6 +41,7 @@ namespace tests
   public:
     void on_synchronized(){}
     uint64_t get_current_blockchain_height(){return 1;}
+    void set_target_blockchain_height(uint64_t) {}
     bool init(const boost::program_options::variables_map& vm);
     bool deinit(){return true;}
     bool get_short_chain_history(std::list<crypto::hash>& ids);

From e0685d412a931520766ce4e1678760c1fb06a1e2 Mon Sep 17 00:00:00 2001
From: fluffypony <ric@spagni.net>
Date: Wed, 4 Jun 2014 22:53:54 +0200
Subject: [PATCH 47/76] don't fall apart if you can't get_line

---
 contrib/epee/include/console_handler.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index fcab35aaa..23184eea6 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -257,9 +257,8 @@ namespace epee
         std::string command;
         if(!m_stdin_reader.get_line(command))
         {
-          LOG_PRINT("Failed to read line. Stopping...", LOG_LEVEL_0);
-          continue_handle = false;
-          break;
+          LOG_PRINT("Failed to read line. Ignoring and continuing to run, exiting daemon may require a SIGTERM kill.", LOG_LEVEL_0);
+          continue;
         }
         string_tools::trim(command);
 

From de76efe9fe08cb649de661fe1a1211cf016cab87 Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Wed, 4 Jun 2014 23:10:33 +0200
Subject: [PATCH 48/76] Added static_cast to hshd.current_height

---
 src/cryptonote_protocol/cryptonote_protocol_handler.inl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index b74a81586..a2f0bb3ad 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -111,7 +111,7 @@ namespace cryptonote
     /* As I don't know if accessing hshd from core could be a good practice, 
     I prefer pushing target height to the core at the same time it is pushed to the user.
     Nz. */
-    m_core.set_target_blockchain_height(hshd.current_height);
+    m_core.set_target_blockchain_height(static_cast<int64_t>(hshd.current_height));
     
     int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height());
     LOG_PRINT_CCONTEXT_YELLOW("Sync data returned unknown top block: " << m_core.get_current_blockchain_height() << " -> " << hshd.current_height

From 240fce29d8a0f9aad5fcbdc7912bee44e0b9c161 Mon Sep 17 00:00:00 2001
From: fluffypony <ric@spagni.net>
Date: Fri, 6 Jun 2014 19:06:28 +0200
Subject: [PATCH 49/76] removed continue issue

---
 contrib/epee/include/console_handler.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 23184eea6..356ee7f9a 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -258,7 +258,6 @@ namespace epee
         if(!m_stdin_reader.get_line(command))
         {
           LOG_PRINT("Failed to read line. Ignoring and continuing to run, exiting daemon may require a SIGTERM kill.", LOG_LEVEL_0);
-          continue;
         }
         string_tools::trim(command);
 

From 8e0f20f77102c867f90e2fd9d178206e9c024328 Mon Sep 17 00:00:00 2001
From: fluffypony <ric@spagni.net>
Date: Tue, 10 Jun 2014 17:29:37 +0200
Subject: [PATCH 50/76] added new seed nodes

---
 src/p2p/net_node.inl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index e45e51b77..16140cf35 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -193,6 +193,15 @@ namespace nodetool
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::init(const boost::program_options::variables_map& vm)
   {
+    ADD_HARDCODED_SEED_NODE("62.210.78.186:18080");
+    ADD_HARDCODED_SEED_NODE("195.12.60.154:18080");
+    ADD_HARDCODED_SEED_NODE("54.241.246.125:18080");
+    ADD_HARDCODED_SEED_NODE("107.170.157.169:18080");
+    ADD_HARDCODED_SEED_NODE("54.207.112.216:18080");
+    ADD_HARDCODED_SEED_NODE("78.27.112.54:18080");
+    ADD_HARDCODED_SEED_NODE("209.222.30.57:18080");
+    ADD_HARDCODED_SEED_NODE("80.71.13.55:18080");
+    ADD_HARDCODED_SEED_NODE("107.178.112.126:18080");
     ADD_HARDCODED_SEED_NODE("107.158.233.98:18080");
     ADD_HARDCODED_SEED_NODE("64.22.111.2:18080");
 

From feac5a7b2ddce8f4612ecc459b176518061495b3 Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Wed, 11 Jun 2014 10:46:56 -0400
Subject: [PATCH 51/76] Correcting high orphan rate of blocks at pool

---
 src/rpc/core_rpc_server.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 03af66f4f..04ed2c687 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -438,9 +438,18 @@ namespace cryptonote
       error_resp.message = "Wrong block blob";
       return false;
     }
-    cryptonote::block_verification_context bvc = AUTO_VAL_INIT(bvc);
-    m_core.handle_incoming_block(blockblob, bvc);
-    if(!bvc.m_added_to_main_chain)
+    
+    // Fixing of high orphan issue for most pools
+    // Thanks Boolberry!
+    block b = AUTO_VAL_INIT(b);
+    if(!parse_and_validate_block_from_blob(blockblob, b))
+    {
+      error_resp.code = CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB;
+      error_resp.message = "Wrong block blob";
+      return false;
+    }
+
+    if(!m_core.handle_block_found(b))
     {
       error_resp.code = CORE_RPC_ERROR_CODE_BLOCK_NOT_ACCEPTED;
       error_resp.message = "Block not accepted";

From c8626dff3fedd86cf697e49aec00c9e17c9015d8 Mon Sep 17 00:00:00 2001
From: Zachary Michaels <mikezackles@gmail.com>
Date: Wed, 11 Jun 2014 13:13:43 -0400
Subject: [PATCH 52/76] Gcc 4.9 LTO fix

The new lto format requires use of the gcc-provided gcc-ar and
gcc-ranlib binaries.
---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28130e566..8b1e61a51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,11 @@ else()
   else()
     set(WARNINGS "${WARNINGS} -Wlogical-op -Wno-error=maybe-uninitialized")
   endif()
+  # Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0))
+    set(CMAKE_AR "gcc-ar")
+    set(CMAKE_RANLIB "gcc-ranlib")
+  endif()
   if(MINGW)
     set(WARNINGS "${WARNINGS} -Wno-error=unused-value")
     set(MINGW_FLAG "-DWIN32_LEAN_AND_MEAN")

From e84f39ae54f4f6715b2ef68d6a12b18d89df722d Mon Sep 17 00:00:00 2001
From: Zachary Michaels <mikezackles@gmail.com>
Date: Wed, 11 Jun 2014 13:15:23 -0400
Subject: [PATCH 53/76] Link to pthreads on non-apple unix

---
 CMakeLists.txt       |  7 ++++++-
 src/CMakeLists.txt   |  8 ++++----
 tests/CMakeLists.txt | 14 +++++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b1e61a51..86a5267b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ function(set_static_flags)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
   endif()
 endfunction(set_static_flags)
-  
+
 include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/version")
 
 if(APPLE)
@@ -21,6 +21,11 @@ endif()
 
 set(STATIC ${MSVC} CACHE BOOL "Link libraries statically")
 
+if (UNIX AND NOT APPLE)
+  # Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
+  find_package(Threads REQUIRED)
+endif()
+
 if(MSVC)
   add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
   # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Dinline=__inline")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61c04711b..e4e682b99 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,13 +30,13 @@ add_library(cryptonote_core ${CRYPTONOTE_CORE})
 add_executable(daemon ${DAEMON} ${P2P} ${CRYPTONOTE_PROTOCOL})
 add_executable(connectivity_tool ${CONN_TOOL})
 add_executable(simpleminer ${MINER})
-target_link_libraries(daemon rpc cryptonote_core crypto common upnpc-static ${Boost_LIBRARIES})
-target_link_libraries(connectivity_tool cryptonote_core crypto common ${Boost_LIBRARIES})
-target_link_libraries(simpleminer cryptonote_core crypto common ${Boost_LIBRARIES})
+target_link_libraries(daemon rpc cryptonote_core crypto common upnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(connectivity_tool cryptonote_core crypto common ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(simpleminer cryptonote_core crypto common ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 add_library(rpc ${RPC})
 add_library(wallet ${WALLET})
 add_executable(simplewallet ${SIMPLEWALLET} )
-target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common upnpc-static ${Boost_LIBRARIES})
+target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common upnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 add_dependencies(daemon version)
 add_dependencies(rpc version)
 add_dependencies(simplewallet version)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 855b4d808..1d0c91dc9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,16 +31,16 @@ add_executable(unit_tests ${UNIT_TESTS})
 add_executable(net_load_tests_clt net_load_tests/clt.cpp)
 add_executable(net_load_tests_srv net_load_tests/srv.cpp)
 
-target_link_libraries(core_proxy cryptonote_core common crypto upnpc-static ${Boost_LIBRARIES})
-target_link_libraries(coretests cryptonote_core common crypto ${Boost_LIBRARIES})
+target_link_libraries(core_proxy cryptonote_core common crypto upnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(coretests cryptonote_core common crypto ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 target_link_libraries(difficulty-tests cryptonote_core)
-target_link_libraries(functional_tests cryptonote_core wallet common crypto ${Boost_LIBRARIES})
+target_link_libraries(functional_tests cryptonote_core wallet common crypto ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 target_link_libraries(hash-tests crypto)
 target_link_libraries(hash-target-tests crypto cryptonote_core)
-target_link_libraries(performance_tests cryptonote_core common crypto ${Boost_LIBRARIES})
-target_link_libraries(unit_tests cryptonote_core common crypto gtest_main ${Boost_LIBRARIES})
-target_link_libraries(net_load_tests_clt cryptonote_core common crypto gtest_main ${Boost_LIBRARIES})
-target_link_libraries(net_load_tests_srv cryptonote_core common crypto gtest_main ${Boost_LIBRARIES})
+target_link_libraries(performance_tests cryptonote_core common crypto ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(unit_tests cryptonote_core common crypto gtest_main ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(net_load_tests_clt cryptonote_core common crypto gtest_main ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(net_load_tests_srv cryptonote_core common crypto gtest_main ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 
 if(NOT MSVC)
   set_property(TARGET gtest gtest_main unit_tests net_load_tests_clt net_load_tests_srv APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-sign-compare")

From 75fc3e90b15df3656c9eab6a83f71934a1194786 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Wed, 11 Jun 2014 17:32:53 -0400
Subject: [PATCH 54/76] Fix for orphan fix (check blocksize)

---
 src/cryptonote_core/cryptonote_core.cpp | 12 ++++++++++++
 src/cryptonote_core/cryptonote_core.h   |  1 +
 src/rpc/core_rpc_server.cpp             |  9 +++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index b2389fce2..50cbfd267 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -432,6 +432,18 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
+  // Used by the RPC server to check the size of an incoming
+  // block_blob
+  bool core::check_incoming_block_size(const blobdata& block_blob)
+  {
+    if(block_blob.size() > get_max_block_size())
+    {
+      LOG_PRINT_L0("WRONG BLOCK BLOB, too big size " << block_blob.size() << ", rejected");
+      return false;
+    }
+    return true;
+  }
+  //-----------------------------------------------------------------------------------------------
   crypto::hash core::get_tail_id()
   {
     return m_blockchain_storage.get_tail_id();
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index 7ef0f8b1d..1f1b6eec6 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -34,6 +34,7 @@ namespace cryptonote
      bool on_idle();
      bool handle_incoming_tx(const blobdata& tx_blob, tx_verification_context& tvc, bool keeped_by_block);
      bool handle_incoming_block(const blobdata& block_blob, block_verification_context& bvc, bool update_miner_blocktemplate = true);
+     bool check_incoming_block_size(const blobdata& block_blob);
      i_cryptonote_protocol* get_protocol(){return m_pprotocol;}
 
      //-------------------- i_miner_handler -----------------------
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 04ed2c687..c3f98563d 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -449,6 +449,15 @@ namespace cryptonote
       return false;
     }
 
+    // Fix from Boolberry neglects to check block
+    // size, do that with the function below
+    if(!m_core.check_incoming_block_size(blockblob))
+    {
+      error_resp.code = CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB_SIZE;
+      error_resp.message = "Block bloc size is too big, rejecting block";
+      return false;
+    }
+
     if(!m_core.handle_block_found(b))
     {
       error_resp.code = CORE_RPC_ERROR_CODE_BLOCK_NOT_ACCEPTED;

From ea99573f9905ee29e06df26779db265e98ce66a4 Mon Sep 17 00:00:00 2001
From: mydesktop <dev.mc2@gmail.com>
Date: Wed, 11 Jun 2014 17:39:59 -0400
Subject: [PATCH 55/76] new error code for rpc

---
 src/rpc/core_rpc_server_error_codes.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rpc/core_rpc_server_error_codes.h b/src/rpc/core_rpc_server_error_codes.h
index 10785f8ab..273a8b8cb 100644
--- a/src/rpc/core_rpc_server_error_codes.h
+++ b/src/rpc/core_rpc_server_error_codes.h
@@ -13,7 +13,6 @@
 #define CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB       -6
 #define CORE_RPC_ERROR_CODE_BLOCK_NOT_ACCEPTED    -7
 #define CORE_RPC_ERROR_CODE_CORE_BUSY             -9
-
-
+#define CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB_SIZE  -10
 
 

From 6bee34e4a67ee5c38b240e05a0f7c28d3ba4099f Mon Sep 17 00:00:00 2001
From: Zachary Michaels <mikezackles@gmail.com>
Date: Thu, 12 Jun 2014 15:38:28 -0400
Subject: [PATCH 56/76] Fix to disable LTO for Clang

The previous code was assuming Apple == Clang.  This change should both
enable LTO when using gcc on Apple and fix Clang when using it on other
platforms.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86a5267b2..6f084ba22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ else()
     set(DEBUG_FLAGS "-g3 -O0")
   endif()
   set(RELEASE_FLAGS "-Ofast -DNDEBUG -Wno-unused-variable")
-  if(NOT APPLE)
+  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     # There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled
     set(RELEASE_FLAGS "${RELEASE_FLAGS} -flto")
   endif()

From 105825b4ce4a70b82d2055354d32fa66dba4218d Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Mon, 2 Jun 2014 07:56:07 -0400
Subject: [PATCH 57/76] added vim swap files to .gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 20a3894a6..527864624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 .DS_Store
 /build
 /tags
+
+# vim swap files
+*.swp
+*.swo

From 4f382b383005d09f6056371d0fecdc8b6ce37a08 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Wed, 4 Jun 2014 18:59:47 -0400
Subject: [PATCH 58/76] most functions prototyped/modified for wallet recovery

---
 src/crypto/crypto.cpp             |    6 +
 src/crypto/electrum-words.cpp     |   29 +
 src/crypto/electrum-words.h       | 3276 +++++++++++++++++++++++++++++
 src/cryptonote_core/account.cpp   |    2 +-
 src/cryptonote_core/account.h     |    2 +-
 src/simplewallet/simplewallet.cpp |   35 +-
 src/simplewallet/simplewallet.h   |   10 +-
 src/wallet/wallet2.cpp            |    6 +-
 src/wallet/wallet2.h              |    3 +-
 src/wallet/wallet_errors.h        |   11 +
 10 files changed, 3371 insertions(+), 9 deletions(-)
 create mode 100644 src/crypto/electrum-words.cpp
 create mode 100644 src/crypto/electrum-words.h

diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp
index f5f525700..31fc31d5b 100644
--- a/src/crypto/crypto.cpp
+++ b/src/crypto/crypto.cpp
@@ -50,6 +50,7 @@ namespace crypto {
     return &reinterpret_cast<const unsigned char &>(scalar);
   }
 
+  /* generate a random 32-byte (256-bit) integer and copy it to res */
   static inline void random_scalar(ec_scalar &res) {
     unsigned char tmp[64];
     generate_random_bytes(64, tmp);
@@ -62,6 +63,11 @@ namespace crypto {
     sc_reduce32(&res);
   }
 
+  /* 
+   * generate public and secret keys from a random 256-bit integer
+   * TODO: allow specifiying random value (for wallet recovery)
+   * 
+   */
   void crypto_ops::generate_keys(public_key &pub, secret_key &sec) {
     lock_guard<mutex> lock(random_lock);
     ge_p3 point;
diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
new file mode 100644
index 000000000..cb01c9203
--- /dev/null
+++ b/src/crypto/electrum-words.cpp
@@ -0,0 +1,29 @@
+/*
+ * This file and its header file are for translating Electrum-style word lists
+ * into their equivalent byte representations for cross-compatibility with
+ * that method of "backing up" one's wallet keys.
+ */
+
+#include <string>
+#include <map>
+#include "crypto/crypto.h"  // for declaration of crypto::secret_key
+
+#include "crypto/electrum-words.h"
+
+namespace crypto
+{
+  namespace ElectrumWords
+  {
+
+    bool words_to_bytes(const std::string& words, crypto::secret_key& dst)
+    {
+      return false;
+    }
+    bool bytes_to_words(const crypto::secret_key& src, std::string& words)
+    {
+      return false;
+    }
+
+  }  // namespace ElectrumWords
+
+}  // namespace crypto
diff --git a/src/crypto/electrum-words.h b/src/crypto/electrum-words.h
new file mode 100644
index 000000000..6b8291047
--- /dev/null
+++ b/src/crypto/electrum-words.h
@@ -0,0 +1,3276 @@
+/*
+ * This file and its cpp file are for translating Electrum-style word lists
+ * into their equivalent byte representations for cross-compatibility with
+ * that method of "backing up" one's wallet keys.
+ */
+
+#include <string>
+#include <map>
+#include "crypto/crypto.h"  // for declaration of crypto::secret_key
+
+namespace crypto
+{
+  namespace ElectrumWords
+  {
+    bool words_to_bytes(const std::string& words, crypto::secret_key& dst);
+    bool bytes_to_words(const crypto::secret_key& src, std::string& words);
+
+    const std::map<std::string, int> wordsMap = {
+      {"like", 0},
+      {"just", 1},
+      {"love", 2},
+      {"know", 3},
+      {"never", 4},
+      {"want", 5},
+      {"time", 6},
+      {"out", 7},
+      {"there", 8},
+      {"make", 9},
+      {"look", 10},
+      {"eye", 11},
+      {"down", 12},
+      {"only", 13},
+      {"think", 14},
+      {"heart", 15},
+      {"back", 16},
+      {"then", 17},
+      {"into", 18},
+      {"about", 19},
+      {"more", 20},
+      {"away", 21},
+      {"still", 22},
+      {"them", 23},
+      {"take", 24},
+      {"thing", 25},
+      {"even", 26},
+      {"through", 27},
+      {"long", 28},
+      {"always", 29},
+      {"world", 30},
+      {"too", 31},
+      {"friend", 32},
+      {"tell", 33},
+      {"try", 34},
+      {"hand", 35},
+      {"thought", 36},
+      {"over", 37},
+      {"here", 38},
+      {"other", 39},
+      {"need", 40},
+      {"smile", 41},
+      {"again", 42},
+      {"much", 43},
+      {"cry", 44},
+      {"been", 45},
+      {"night", 46},
+      {"ever", 47},
+      {"little", 48},
+      {"said", 49},
+      {"end", 50},
+      {"some", 51},
+      {"those", 52},
+      {"around", 53},
+      {"mind", 54},
+      {"people", 55},
+      {"girl", 56},
+      {"leave", 57},
+      {"dream", 58},
+      {"left", 59},
+      {"turn", 60},
+      {"myself", 61},
+      {"give", 62},
+      {"nothing", 63},
+      {"really", 64},
+      {"off", 65},
+      {"before", 66},
+      {"something", 67},
+      {"find", 68},
+      {"walk", 69},
+      {"wish", 70},
+      {"good", 71},
+      {"once", 72},
+      {"place", 73},
+      {"ask", 74},
+      {"stop", 75},
+      {"keep", 76},
+      {"watch", 77},
+      {"seem", 78},
+      {"everything", 79},
+      {"wait", 80},
+      {"got", 81},
+      {"yet", 82},
+      {"made", 83},
+      {"remember", 84},
+      {"start", 85},
+      {"alone", 86},
+      {"run", 87},
+      {"hope", 88},
+      {"maybe", 89},
+      {"believe", 90},
+      {"body", 91},
+      {"hate", 92},
+      {"after", 93},
+      {"close", 94},
+      {"talk", 95},
+      {"stand", 96},
+      {"own", 97},
+      {"each", 98},
+      {"hurt", 99},
+      {"help", 100},
+      {"home", 101},
+      {"god", 102},
+      {"soul", 103},
+      {"new", 104},
+      {"many", 105},
+      {"two", 106},
+      {"inside", 107},
+      {"should", 108},
+      {"true", 109},
+      {"first", 110},
+      {"fear", 111},
+      {"mean", 112},
+      {"better", 113},
+      {"play", 114},
+      {"another", 115},
+      {"gone", 116},
+      {"change", 117},
+      {"use", 118},
+      {"wonder", 119},
+      {"someone", 120},
+      {"hair", 121},
+      {"cold", 122},
+      {"open", 123},
+      {"best", 124},
+      {"any", 125},
+      {"behind", 126},
+      {"happen", 127},
+      {"water", 128},
+      {"dark", 129},
+      {"laugh", 130},
+      {"stay", 131},
+      {"forever", 132},
+      {"name", 133},
+      {"work", 134},
+      {"show", 135},
+      {"sky", 136},
+      {"break", 137},
+      {"came", 138},
+      {"deep", 139},
+      {"door", 140},
+      {"put", 141},
+      {"black", 142},
+      {"together", 143},
+      {"upon", 144},
+      {"happy", 145},
+      {"such", 146},
+      {"great", 147},
+      {"white", 148},
+      {"matter", 149},
+      {"fill", 150},
+      {"past", 151},
+      {"please", 152},
+      {"burn", 153},
+      {"cause", 154},
+      {"enough", 155},
+      {"touch", 156},
+      {"moment", 157},
+      {"soon", 158},
+      {"voice", 159},
+      {"scream", 160},
+      {"anything", 161},
+      {"stare", 162},
+      {"sound", 163},
+      {"red", 164},
+      {"everyone", 165},
+      {"hide", 166},
+      {"kiss", 167},
+      {"truth", 168},
+      {"death", 169},
+      {"beautiful", 170},
+      {"mine", 171},
+      {"blood", 172},
+      {"broken", 173},
+      {"very", 174},
+      {"pass", 175},
+      {"next", 176},
+      {"forget", 177},
+      {"tree", 178},
+      {"wrong", 179},
+      {"air", 180},
+      {"mother", 181},
+      {"understand", 182},
+      {"lip", 183},
+      {"hit", 184},
+      {"wall", 185},
+      {"memory", 186},
+      {"sleep", 187},
+      {"free", 188},
+      {"high", 189},
+      {"realize", 190},
+      {"school", 191},
+      {"might", 192},
+      {"skin", 193},
+      {"sweet", 194},
+      {"perfect", 195},
+      {"blue", 196},
+      {"kill", 197},
+      {"breath", 198},
+      {"dance", 199},
+      {"against", 200},
+      {"fly", 201},
+      {"between", 202},
+      {"grow", 203},
+      {"strong", 204},
+      {"under", 205},
+      {"listen", 206},
+      {"bring", 207},
+      {"sometimes", 208},
+      {"speak", 209},
+      {"pull", 210},
+      {"person", 211},
+      {"become", 212},
+      {"family", 213},
+      {"begin", 214},
+      {"ground", 215},
+      {"real", 216},
+      {"small", 217},
+      {"father", 218},
+      {"sure", 219},
+      {"feet", 220},
+      {"rest", 221},
+      {"young", 222},
+      {"finally", 223},
+      {"land", 224},
+      {"across", 225},
+      {"today", 226},
+      {"different", 227},
+      {"guy", 228},
+      {"line", 229},
+      {"fire", 230},
+      {"reason", 231},
+      {"reach", 232},
+      {"second", 233},
+      {"slowly", 234},
+      {"write", 235},
+      {"eat", 236},
+      {"smell", 237},
+      {"mouth", 238},
+      {"step", 239},
+      {"learn", 240},
+      {"three", 241},
+      {"floor", 242},
+      {"promise", 243},
+      {"breathe", 244},
+      {"darkness", 245},
+      {"push", 246},
+      {"earth", 247},
+      {"guess", 248},
+      {"save", 249},
+      {"song", 250},
+      {"above", 251},
+      {"along", 252},
+      {"both", 253},
+      {"color", 254},
+      {"house", 255},
+      {"almost", 256},
+      {"sorry", 257},
+      {"anymore", 258},
+      {"brother", 259},
+      {"okay", 260},
+      {"dear", 261},
+      {"game", 262},
+      {"fade", 263},
+      {"already", 264},
+      {"apart", 265},
+      {"warm", 266},
+      {"beauty", 267},
+      {"heard", 268},
+      {"notice", 269},
+      {"question", 270},
+      {"shine", 271},
+      {"began", 272},
+      {"piece", 273},
+      {"whole", 274},
+      {"shadow", 275},
+      {"secret", 276},
+      {"street", 277},
+      {"within", 278},
+      {"finger", 279},
+      {"point", 280},
+      {"morning", 281},
+      {"whisper", 282},
+      {"child", 283},
+      {"moon", 284},
+      {"green", 285},
+      {"story", 286},
+      {"glass", 287},
+      {"kid", 288},
+      {"silence", 289},
+      {"since", 290},
+      {"soft", 291},
+      {"yourself", 292},
+      {"empty", 293},
+      {"shall", 294},
+      {"angel", 295},
+      {"answer", 296},
+      {"baby", 297},
+      {"bright", 298},
+      {"dad", 299},
+      {"path", 300},
+      {"worry", 301},
+      {"hour", 302},
+      {"drop", 303},
+      {"follow", 304},
+      {"power", 305},
+      {"war", 306},
+      {"half", 307},
+      {"flow", 308},
+      {"heaven", 309},
+      {"act", 310},
+      {"chance", 311},
+      {"fact", 312},
+      {"least", 313},
+      {"tired", 314},
+      {"children", 315},
+      {"near", 316},
+      {"quite", 317},
+      {"afraid", 318},
+      {"rise", 319},
+      {"sea", 320},
+      {"taste", 321},
+      {"window", 322},
+      {"cover", 323},
+      {"nice", 324},
+      {"trust", 325},
+      {"lot", 326},
+      {"sad", 327},
+      {"cool", 328},
+      {"force", 329},
+      {"peace", 330},
+      {"return", 331},
+      {"blind", 332},
+      {"easy", 333},
+      {"ready", 334},
+      {"roll", 335},
+      {"rose", 336},
+      {"drive", 337},
+      {"held", 338},
+      {"music", 339},
+      {"beneath", 340},
+      {"hang", 341},
+      {"mom", 342},
+      {"paint", 343},
+      {"emotion", 344},
+      {"quiet", 345},
+      {"clear", 346},
+      {"cloud", 347},
+      {"few", 348},
+      {"pretty", 349},
+      {"bird", 350},
+      {"outside", 351},
+      {"paper", 352},
+      {"picture", 353},
+      {"front", 354},
+      {"rock", 355},
+      {"simple", 356},
+      {"anyone", 357},
+      {"meant", 358},
+      {"reality", 359},
+      {"road", 360},
+      {"sense", 361},
+      {"waste", 362},
+      {"bit", 363},
+      {"leaf", 364},
+      {"thank", 365},
+      {"happiness", 366},
+      {"meet", 367},
+      {"men", 368},
+      {"smoke", 369},
+      {"truly", 370},
+      {"decide", 371},
+      {"self", 372},
+      {"age", 373},
+      {"book", 374},
+      {"form", 375},
+      {"alive", 376},
+      {"carry", 377},
+      {"escape", 378},
+      {"damn", 379},
+      {"instead", 380},
+      {"able", 381},
+      {"ice", 382},
+      {"minute", 383},
+      {"throw", 384},
+      {"catch", 385},
+      {"leg", 386},
+      {"ring", 387},
+      {"course", 388},
+      {"goodbye", 389},
+      {"lead", 390},
+      {"poem", 391},
+      {"sick", 392},
+      {"corner", 393},
+      {"desire", 394},
+      {"known", 395},
+      {"problem", 396},
+      {"remind", 397},
+      {"shoulder", 398},
+      {"suppose", 399},
+      {"toward", 400},
+      {"wave", 401},
+      {"drink", 402},
+      {"jump", 403},
+      {"woman", 404},
+      {"pretend", 405},
+      {"sister", 406},
+      {"week", 407},
+      {"human", 408},
+      {"joy", 409},
+      {"crack", 410},
+      {"grey", 411},
+      {"pray", 412},
+      {"surprise", 413},
+      {"dry", 414},
+      {"knee", 415},
+      {"less", 416},
+      {"search", 417},
+      {"bleed", 418},
+      {"caught", 419},
+      {"clean", 420},
+      {"embrace", 421},
+      {"future", 422},
+      {"king", 423},
+      {"son", 424},
+      {"sorrow", 425},
+      {"chest", 426},
+      {"hug", 427},
+      {"remain", 428},
+      {"sat", 429},
+      {"worth", 430},
+      {"blow", 431},
+      {"daddy", 432},
+      {"final", 433},
+      {"parent", 434},
+      {"tight", 435},
+      {"also", 436},
+      {"create", 437},
+      {"lonely", 438},
+      {"safe", 439},
+      {"cross", 440},
+      {"dress", 441},
+      {"evil", 442},
+      {"silent", 443},
+      {"bone", 444},
+      {"fate", 445},
+      {"perhaps", 446},
+      {"anger", 447},
+      {"class", 448},
+      {"scar", 449},
+      {"snow", 450},
+      {"tiny", 451},
+      {"tonight", 452},
+      {"continue", 453},
+      {"control", 454},
+      {"dog", 455},
+      {"edge", 456},
+      {"mirror", 457},
+      {"month", 458},
+      {"suddenly", 459},
+      {"comfort", 460},
+      {"given", 461},
+      {"loud", 462},
+      {"quickly", 463},
+      {"gaze", 464},
+      {"plan", 465},
+      {"rush", 466},
+      {"stone", 467},
+      {"town", 468},
+      {"battle", 469},
+      {"ignore", 470},
+      {"spirit", 471},
+      {"stood", 472},
+      {"stupid", 473},
+      {"yours", 474},
+      {"brown", 475},
+      {"build", 476},
+      {"dust", 477},
+      {"hey", 478},
+      {"kept", 479},
+      {"pay", 480},
+      {"phone", 481},
+      {"twist", 482},
+      {"although", 483},
+      {"ball", 484},
+      {"beyond", 485},
+      {"hidden", 486},
+      {"nose", 487},
+      {"taken", 488},
+      {"fail", 489},
+      {"float", 490},
+      {"pure", 491},
+      {"somehow", 492},
+      {"wash", 493},
+      {"wrap", 494},
+      {"angry", 495},
+      {"cheek", 496},
+      {"creature", 497},
+      {"forgotten", 498},
+      {"heat", 499},
+      {"rip", 500},
+      {"single", 501},
+      {"space", 502},
+      {"special", 503},
+      {"weak", 504},
+      {"whatever", 505},
+      {"yell", 506},
+      {"anyway", 507},
+      {"blame", 508},
+      {"job", 509},
+      {"choose", 510},
+      {"country", 511},
+      {"curse", 512},
+      {"drift", 513},
+      {"echo", 514},
+      {"figure", 515},
+      {"grew", 516},
+      {"laughter", 517},
+      {"neck", 518},
+      {"suffer", 519},
+      {"worse", 520},
+      {"yeah", 521},
+      {"disappear", 522},
+      {"foot", 523},
+      {"forward", 524},
+      {"knife", 525},
+      {"mess", 526},
+      {"somewhere", 527},
+      {"stomach", 528},
+      {"storm", 529},
+      {"beg", 530},
+      {"idea", 531},
+      {"lift", 532},
+      {"offer", 533},
+      {"breeze", 534},
+      {"field", 535},
+      {"five", 536},
+      {"often", 537},
+      {"simply", 538},
+      {"stuck", 539},
+      {"win", 540},
+      {"allow", 541},
+      {"confuse", 542},
+      {"enjoy", 543},
+      {"except", 544},
+      {"flower", 545},
+      {"seek", 546},
+      {"strength", 547},
+      {"calm", 548},
+      {"grin", 549},
+      {"gun", 550},
+      {"heavy", 551},
+      {"hill", 552},
+      {"large", 553},
+      {"ocean", 554},
+      {"shoe", 555},
+      {"sigh", 556},
+      {"straight", 557},
+      {"summer", 558},
+      {"tongue", 559},
+      {"accept", 560},
+      {"crazy", 561},
+      {"everyday", 562},
+      {"exist", 563},
+      {"grass", 564},
+      {"mistake", 565},
+      {"sent", 566},
+      {"shut", 567},
+      {"surround", 568},
+      {"table", 569},
+      {"ache", 570},
+      {"brain", 571},
+      {"destroy", 572},
+      {"heal", 573},
+      {"nature", 574},
+      {"shout", 575},
+      {"sign", 576},
+      {"stain", 577},
+      {"choice", 578},
+      {"doubt", 579},
+      {"glance", 580},
+      {"glow", 581},
+      {"mountain", 582},
+      {"queen", 583},
+      {"stranger", 584},
+      {"throat", 585},
+      {"tomorrow", 586},
+      {"city", 587},
+      {"either", 588},
+      {"fish", 589},
+      {"flame", 590},
+      {"rather", 591},
+      {"shape", 592},
+      {"spin", 593},
+      {"spread", 594},
+      {"ash", 595},
+      {"distance", 596},
+      {"finish", 597},
+      {"image", 598},
+      {"imagine", 599},
+      {"important", 600},
+      {"nobody", 601},
+      {"shatter", 602},
+      {"warmth", 603},
+      {"became", 604},
+      {"feed", 605},
+      {"flesh", 606},
+      {"funny", 607},
+      {"lust", 608},
+      {"shirt", 609},
+      {"trouble", 610},
+      {"yellow", 611},
+      {"attention", 612},
+      {"bare", 613},
+      {"bite", 614},
+      {"money", 615},
+      {"protect", 616},
+      {"amaze", 617},
+      {"appear", 618},
+      {"born", 619},
+      {"choke", 620},
+      {"completely", 621},
+      {"daughter", 622},
+      {"fresh", 623},
+      {"friendship", 624},
+      {"gentle", 625},
+      {"probably", 626},
+      {"six", 627},
+      {"deserve", 628},
+      {"expect", 629},
+      {"grab", 630},
+      {"middle", 631},
+      {"nightmare", 632},
+      {"river", 633},
+      {"thousand", 634},
+      {"weight", 635},
+      {"worst", 636},
+      {"wound", 637},
+      {"barely", 638},
+      {"bottle", 639},
+      {"cream", 640},
+      {"regret", 641},
+      {"relationship", 642},
+      {"stick", 643},
+      {"test", 644},
+      {"crush", 645},
+      {"endless", 646},
+      {"fault", 647},
+      {"itself", 648},
+      {"rule", 649},
+      {"spill", 650},
+      {"art", 651},
+      {"circle", 652},
+      {"join", 653},
+      {"kick", 654},
+      {"mask", 655},
+      {"master", 656},
+      {"passion", 657},
+      {"quick", 658},
+      {"raise", 659},
+      {"smooth", 660},
+      {"unless", 661},
+      {"wander", 662},
+      {"actually", 663},
+      {"broke", 664},
+      {"chair", 665},
+      {"deal", 666},
+      {"favorite", 667},
+      {"gift", 668},
+      {"note", 669},
+      {"number", 670},
+      {"sweat", 671},
+      {"box", 672},
+      {"chill", 673},
+      {"clothes", 674},
+      {"lady", 675},
+      {"mark", 676},
+      {"park", 677},
+      {"poor", 678},
+      {"sadness", 679},
+      {"tie", 680},
+      {"animal", 681},
+      {"belong", 682},
+      {"brush", 683},
+      {"consume", 684},
+      {"dawn", 685},
+      {"forest", 686},
+      {"innocent", 687},
+      {"pen", 688},
+      {"pride", 689},
+      {"stream", 690},
+      {"thick", 691},
+      {"clay", 692},
+      {"complete", 693},
+      {"count", 694},
+      {"draw", 695},
+      {"faith", 696},
+      {"press", 697},
+      {"silver", 698},
+      {"struggle", 699},
+      {"surface", 700},
+      {"taught", 701},
+      {"teach", 702},
+      {"wet", 703},
+      {"bless", 704},
+      {"chase", 705},
+      {"climb", 706},
+      {"enter", 707},
+      {"letter", 708},
+      {"melt", 709},
+      {"metal", 710},
+      {"movie", 711},
+      {"stretch", 712},
+      {"swing", 713},
+      {"vision", 714},
+      {"wife", 715},
+      {"beside", 716},
+      {"crash", 717},
+      {"forgot", 718},
+      {"guide", 719},
+      {"haunt", 720},
+      {"joke", 721},
+      {"knock", 722},
+      {"plant", 723},
+      {"pour", 724},
+      {"prove", 725},
+      {"reveal", 726},
+      {"steal", 727},
+      {"stuff", 728},
+      {"trip", 729},
+      {"wood", 730},
+      {"wrist", 731},
+      {"bother", 732},
+      {"bottom", 733},
+      {"crawl", 734},
+      {"crowd", 735},
+      {"fix", 736},
+      {"forgive", 737},
+      {"frown", 738},
+      {"grace", 739},
+      {"loose", 740},
+      {"lucky", 741},
+      {"party", 742},
+      {"release", 743},
+      {"surely", 744},
+      {"survive", 745},
+      {"teacher", 746},
+      {"gently", 747},
+      {"grip", 748},
+      {"speed", 749},
+      {"suicide", 750},
+      {"travel", 751},
+      {"treat", 752},
+      {"vein", 753},
+      {"written", 754},
+      {"cage", 755},
+      {"chain", 756},
+      {"conversation", 757},
+      {"date", 758},
+      {"enemy", 759},
+      {"however", 760},
+      {"interest", 761},
+      {"million", 762},
+      {"page", 763},
+      {"pink", 764},
+      {"proud", 765},
+      {"sway", 766},
+      {"themselves", 767},
+      {"winter", 768},
+      {"church", 769},
+      {"cruel", 770},
+      {"cup", 771},
+      {"demon", 772},
+      {"experience", 773},
+      {"freedom", 774},
+      {"pair", 775},
+      {"pop", 776},
+      {"purpose", 777},
+      {"respect", 778},
+      {"shoot", 779},
+      {"softly", 780},
+      {"state", 781},
+      {"strange", 782},
+      {"bar", 783},
+      {"birth", 784},
+      {"curl", 785},
+      {"dirt", 786},
+      {"excuse", 787},
+      {"lord", 788},
+      {"lovely", 789},
+      {"monster", 790},
+      {"order", 791},
+      {"pack", 792},
+      {"pants", 793},
+      {"pool", 794},
+      {"scene", 795},
+      {"seven", 796},
+      {"shame", 797},
+      {"slide", 798},
+      {"ugly", 799},
+      {"among", 800},
+      {"blade", 801},
+      {"blonde", 802},
+      {"closet", 803},
+      {"creek", 804},
+      {"deny", 805},
+      {"drug", 806},
+      {"eternity", 807},
+      {"gain", 808},
+      {"grade", 809},
+      {"handle", 810},
+      {"key", 811},
+      {"linger", 812},
+      {"pale", 813},
+      {"prepare", 814},
+      {"swallow", 815},
+      {"swim", 816},
+      {"tremble", 817},
+      {"wheel", 818},
+      {"won", 819},
+      {"cast", 820},
+      {"cigarette", 821},
+      {"claim", 822},
+      {"college", 823},
+      {"direction", 824},
+      {"dirty", 825},
+      {"gather", 826},
+      {"ghost", 827},
+      {"hundred", 828},
+      {"loss", 829},
+      {"lung", 830},
+      {"orange", 831},
+      {"present", 832},
+      {"swear", 833},
+      {"swirl", 834},
+      {"twice", 835},
+      {"wild", 836},
+      {"bitter", 837},
+      {"blanket", 838},
+      {"doctor", 839},
+      {"everywhere", 840},
+      {"flash", 841},
+      {"grown", 842},
+      {"knowledge", 843},
+      {"numb", 844},
+      {"pressure", 845},
+      {"radio", 846},
+      {"repeat", 847},
+      {"ruin", 848},
+      {"spend", 849},
+      {"unknown", 850},
+      {"buy", 851},
+      {"clock", 852},
+      {"devil", 853},
+      {"early", 854},
+      {"false", 855},
+      {"fantasy", 856},
+      {"pound", 857},
+      {"precious", 858},
+      {"refuse", 859},
+      {"sheet", 860},
+      {"teeth", 861},
+      {"welcome", 862},
+      {"add", 863},
+      {"ahead", 864},
+      {"block", 865},
+      {"bury", 866},
+      {"caress", 867},
+      {"content", 868},
+      {"depth", 869},
+      {"despite", 870},
+      {"distant", 871},
+      {"marry", 872},
+      {"purple", 873},
+      {"threw", 874},
+      {"whenever", 875},
+      {"bomb", 876},
+      {"dull", 877},
+      {"easily", 878},
+      {"grasp", 879},
+      {"hospital", 880},
+      {"innocence", 881},
+      {"normal", 882},
+      {"receive", 883},
+      {"reply", 884},
+      {"rhyme", 885},
+      {"shade", 886},
+      {"someday", 887},
+      {"sword", 888},
+      {"toe", 889},
+      {"visit", 890},
+      {"asleep", 891},
+      {"bought", 892},
+      {"center", 893},
+      {"consider", 894},
+      {"flat", 895},
+      {"hero", 896},
+      {"history", 897},
+      {"ink", 898},
+      {"insane", 899},
+      {"muscle", 900},
+      {"mystery", 901},
+      {"pocket", 902},
+      {"reflection", 903},
+      {"shove", 904},
+      {"silently", 905},
+      {"smart", 906},
+      {"soldier", 907},
+      {"spot", 908},
+      {"stress", 909},
+      {"train", 910},
+      {"type", 911},
+      {"view", 912},
+      {"whether", 913},
+      {"bus", 914},
+      {"energy", 915},
+      {"explain", 916},
+      {"holy", 917},
+      {"hunger", 918},
+      {"inch", 919},
+      {"magic", 920},
+      {"mix", 921},
+      {"noise", 922},
+      {"nowhere", 923},
+      {"prayer", 924},
+      {"presence", 925},
+      {"shock", 926},
+      {"snap", 927},
+      {"spider", 928},
+      {"study", 929},
+      {"thunder", 930},
+      {"trail", 931},
+      {"admit", 932},
+      {"agree", 933},
+      {"bag", 934},
+      {"bang", 935},
+      {"bound", 936},
+      {"butterfly", 937},
+      {"cute", 938},
+      {"exactly", 939},
+      {"explode", 940},
+      {"familiar", 941},
+      {"fold", 942},
+      {"further", 943},
+      {"pierce", 944},
+      {"reflect", 945},
+      {"scent", 946},
+      {"selfish", 947},
+      {"sharp", 948},
+      {"sink", 949},
+      {"spring", 950},
+      {"stumble", 951},
+      {"universe", 952},
+      {"weep", 953},
+      {"women", 954},
+      {"wonderful", 955},
+      {"action", 956},
+      {"ancient", 957},
+      {"attempt", 958},
+      {"avoid", 959},
+      {"birthday", 960},
+      {"branch", 961},
+      {"chocolate", 962},
+      {"core", 963},
+      {"depress", 964},
+      {"drunk", 965},
+      {"especially", 966},
+      {"focus", 967},
+      {"fruit", 968},
+      {"honest", 969},
+      {"match", 970},
+      {"palm", 971},
+      {"perfectly", 972},
+      {"pillow", 973},
+      {"pity", 974},
+      {"poison", 975},
+      {"roar", 976},
+      {"shift", 977},
+      {"slightly", 978},
+      {"thump", 979},
+      {"truck", 980},
+      {"tune", 981},
+      {"twenty", 982},
+      {"unable", 983},
+      {"wipe", 984},
+      {"wrote", 985},
+      {"coat", 986},
+      {"constant", 987},
+      {"dinner", 988},
+      {"drove", 989},
+      {"egg", 990},
+      {"eternal", 991},
+      {"flight", 992},
+      {"flood", 993},
+      {"frame", 994},
+      {"freak", 995},
+      {"gasp", 996},
+      {"glad", 997},
+      {"hollow", 998},
+      {"motion", 999},
+      {"peer", 1000},
+      {"plastic", 1001},
+      {"root", 1002},
+      {"screen", 1003},
+      {"season", 1004},
+      {"sting", 1005},
+      {"strike", 1006},
+      {"team", 1007},
+      {"unlike", 1008},
+      {"victim", 1009},
+      {"volume", 1010},
+      {"warn", 1011},
+      {"weird", 1012},
+      {"attack", 1013},
+      {"await", 1014},
+      {"awake", 1015},
+      {"built", 1016},
+      {"charm", 1017},
+      {"crave", 1018},
+      {"despair", 1019},
+      {"fought", 1020},
+      {"grant", 1021},
+      {"grief", 1022},
+      {"horse", 1023},
+      {"limit", 1024},
+      {"message", 1025},
+      {"ripple", 1026},
+      {"sanity", 1027},
+      {"scatter", 1028},
+      {"serve", 1029},
+      {"split", 1030},
+      {"string", 1031},
+      {"trick", 1032},
+      {"annoy", 1033},
+      {"blur", 1034},
+      {"boat", 1035},
+      {"brave", 1036},
+      {"clearly", 1037},
+      {"cling", 1038},
+      {"connect", 1039},
+      {"fist", 1040},
+      {"forth", 1041},
+      {"imagination", 1042},
+      {"iron", 1043},
+      {"jock", 1044},
+      {"judge", 1045},
+      {"lesson", 1046},
+      {"milk", 1047},
+      {"misery", 1048},
+      {"nail", 1049},
+      {"naked", 1050},
+      {"ourselves", 1051},
+      {"poet", 1052},
+      {"possible", 1053},
+      {"princess", 1054},
+      {"sail", 1055},
+      {"size", 1056},
+      {"snake", 1057},
+      {"society", 1058},
+      {"stroke", 1059},
+      {"torture", 1060},
+      {"toss", 1061},
+      {"trace", 1062},
+      {"wise", 1063},
+      {"bloom", 1064},
+      {"bullet", 1065},
+      {"cell", 1066},
+      {"check", 1067},
+      {"cost", 1068},
+      {"darling", 1069},
+      {"during", 1070},
+      {"footstep", 1071},
+      {"fragile", 1072},
+      {"hallway", 1073},
+      {"hardly", 1074},
+      {"horizon", 1075},
+      {"invisible", 1076},
+      {"journey", 1077},
+      {"midnight", 1078},
+      {"mud", 1079},
+      {"nod", 1080},
+      {"pause", 1081},
+      {"relax", 1082},
+      {"shiver", 1083},
+      {"sudden", 1084},
+      {"value", 1085},
+      {"youth", 1086},
+      {"abuse", 1087},
+      {"admire", 1088},
+      {"blink", 1089},
+      {"breast", 1090},
+      {"bruise", 1091},
+      {"constantly", 1092},
+      {"couple", 1093},
+      {"creep", 1094},
+      {"curve", 1095},
+      {"difference", 1096},
+      {"dumb", 1097},
+      {"emptiness", 1098},
+      {"gotta", 1099},
+      {"honor", 1100},
+      {"plain", 1101},
+      {"planet", 1102},
+      {"recall", 1103},
+      {"rub", 1104},
+      {"ship", 1105},
+      {"slam", 1106},
+      {"soar", 1107},
+      {"somebody", 1108},
+      {"tightly", 1109},
+      {"weather", 1110},
+      {"adore", 1111},
+      {"approach", 1112},
+      {"bond", 1113},
+      {"bread", 1114},
+      {"burst", 1115},
+      {"candle", 1116},
+      {"coffee", 1117},
+      {"cousin", 1118},
+      {"crime", 1119},
+      {"desert", 1120},
+      {"flutter", 1121},
+      {"frozen", 1122},
+      {"grand", 1123},
+      {"heel", 1124},
+      {"hello", 1125},
+      {"language", 1126},
+      {"level", 1127},
+      {"movement", 1128},
+      {"pleasure", 1129},
+      {"powerful", 1130},
+      {"random", 1131},
+      {"rhythm", 1132},
+      {"settle", 1133},
+      {"silly", 1134},
+      {"slap", 1135},
+      {"sort", 1136},
+      {"spoken", 1137},
+      {"steel", 1138},
+      {"threaten", 1139},
+      {"tumble", 1140},
+      {"upset", 1141},
+      {"aside", 1142},
+      {"awkward", 1143},
+      {"bee", 1144},
+      {"blank", 1145},
+      {"board", 1146},
+      {"button", 1147},
+      {"card", 1148},
+      {"carefully", 1149},
+      {"complain", 1150},
+      {"crap", 1151},
+      {"deeply", 1152},
+      {"discover", 1153},
+      {"drag", 1154},
+      {"dread", 1155},
+      {"effort", 1156},
+      {"entire", 1157},
+      {"fairy", 1158},
+      {"giant", 1159},
+      {"gotten", 1160},
+      {"greet", 1161},
+      {"illusion", 1162},
+      {"jeans", 1163},
+      {"leap", 1164},
+      {"liquid", 1165},
+      {"march", 1166},
+      {"mend", 1167},
+      {"nervous", 1168},
+      {"nine", 1169},
+      {"replace", 1170},
+      {"rope", 1171},
+      {"spine", 1172},
+      {"stole", 1173},
+      {"terror", 1174},
+      {"accident", 1175},
+      {"apple", 1176},
+      {"balance", 1177},
+      {"boom", 1178},
+      {"childhood", 1179},
+      {"collect", 1180},
+      {"demand", 1181},
+      {"depression", 1182},
+      {"eventually", 1183},
+      {"faint", 1184},
+      {"glare", 1185},
+      {"goal", 1186},
+      {"group", 1187},
+      {"honey", 1188},
+      {"kitchen", 1189},
+      {"laid", 1190},
+      {"limb", 1191},
+      {"machine", 1192},
+      {"mere", 1193},
+      {"mold", 1194},
+      {"murder", 1195},
+      {"nerve", 1196},
+      {"painful", 1197},
+      {"poetry", 1198},
+      {"prince", 1199},
+      {"rabbit", 1200},
+      {"shelter", 1201},
+      {"shore", 1202},
+      {"shower", 1203},
+      {"soothe", 1204},
+      {"stair", 1205},
+      {"steady", 1206},
+      {"sunlight", 1207},
+      {"tangle", 1208},
+      {"tease", 1209},
+      {"treasure", 1210},
+      {"uncle", 1211},
+      {"begun", 1212},
+      {"bliss", 1213},
+      {"canvas", 1214},
+      {"cheer", 1215},
+      {"claw", 1216},
+      {"clutch", 1217},
+      {"commit", 1218},
+      {"crimson", 1219},
+      {"crystal", 1220},
+      {"delight", 1221},
+      {"doll", 1222},
+      {"existence", 1223},
+      {"express", 1224},
+      {"fog", 1225},
+      {"football", 1226},
+      {"gay", 1227},
+      {"goose", 1228},
+      {"guard", 1229},
+      {"hatred", 1230},
+      {"illuminate", 1231},
+      {"mass", 1232},
+      {"math", 1233},
+      {"mourn", 1234},
+      {"rich", 1235},
+      {"rough", 1236},
+      {"skip", 1237},
+      {"stir", 1238},
+      {"student", 1239},
+      {"style", 1240},
+      {"support", 1241},
+      {"thorn", 1242},
+      {"tough", 1243},
+      {"yard", 1244},
+      {"yearn", 1245},
+      {"yesterday", 1246},
+      {"advice", 1247},
+      {"appreciate", 1248},
+      {"autumn", 1249},
+      {"bank", 1250},
+      {"beam", 1251},
+      {"bowl", 1252},
+      {"capture", 1253},
+      {"carve", 1254},
+      {"collapse", 1255},
+      {"confusion", 1256},
+      {"creation", 1257},
+      {"dove", 1258},
+      {"feather", 1259},
+      {"girlfriend", 1260},
+      {"glory", 1261},
+      {"government", 1262},
+      {"harsh", 1263},
+      {"hop", 1264},
+      {"inner", 1265},
+      {"loser", 1266},
+      {"moonlight", 1267},
+      {"neighbor", 1268},
+      {"neither", 1269},
+      {"peach", 1270},
+      {"pig", 1271},
+      {"praise", 1272},
+      {"screw", 1273},
+      {"shield", 1274},
+      {"shimmer", 1275},
+      {"sneak", 1276},
+      {"stab", 1277},
+      {"subject", 1278},
+      {"throughout", 1279},
+      {"thrown", 1280},
+      {"tower", 1281},
+      {"twirl", 1282},
+      {"wow", 1283},
+      {"army", 1284},
+      {"arrive", 1285},
+      {"bathroom", 1286},
+      {"bump", 1287},
+      {"cease", 1288},
+      {"cookie", 1289},
+      {"couch", 1290},
+      {"courage", 1291},
+      {"dim", 1292},
+      {"guilt", 1293},
+      {"howl", 1294},
+      {"hum", 1295},
+      {"husband", 1296},
+      {"insult", 1297},
+      {"led", 1298},
+      {"lunch", 1299},
+      {"mock", 1300},
+      {"mostly", 1301},
+      {"natural", 1302},
+      {"nearly", 1303},
+      {"needle", 1304},
+      {"nerd", 1305},
+      {"peaceful", 1306},
+      {"perfection", 1307},
+      {"pile", 1308},
+      {"price", 1309},
+      {"remove", 1310},
+      {"roam", 1311},
+      {"sanctuary", 1312},
+      {"serious", 1313},
+      {"shiny", 1314},
+      {"shook", 1315},
+      {"sob", 1316},
+      {"stolen", 1317},
+      {"tap", 1318},
+      {"vain", 1319},
+      {"void", 1320},
+      {"warrior", 1321},
+      {"wrinkle", 1322},
+      {"affection", 1323},
+      {"apologize", 1324},
+      {"blossom", 1325},
+      {"bounce", 1326},
+      {"bridge", 1327},
+      {"cheap", 1328},
+      {"crumble", 1329},
+      {"decision", 1330},
+      {"descend", 1331},
+      {"desperately", 1332},
+      {"dig", 1333},
+      {"dot", 1334},
+      {"flip", 1335},
+      {"frighten", 1336},
+      {"heartbeat", 1337},
+      {"huge", 1338},
+      {"lazy", 1339},
+      {"lick", 1340},
+      {"odd", 1341},
+      {"opinion", 1342},
+      {"process", 1343},
+      {"puzzle", 1344},
+      {"quietly", 1345},
+      {"retreat", 1346},
+      {"score", 1347},
+      {"sentence", 1348},
+      {"separate", 1349},
+      {"situation", 1350},
+      {"skill", 1351},
+      {"soak", 1352},
+      {"square", 1353},
+      {"stray", 1354},
+      {"taint", 1355},
+      {"task", 1356},
+      {"tide", 1357},
+      {"underneath", 1358},
+      {"veil", 1359},
+      {"whistle", 1360},
+      {"anywhere", 1361},
+      {"bedroom", 1362},
+      {"bid", 1363},
+      {"bloody", 1364},
+      {"burden", 1365},
+      {"careful", 1366},
+      {"compare", 1367},
+      {"concern", 1368},
+      {"curtain", 1369},
+      {"decay", 1370},
+      {"defeat", 1371},
+      {"describe", 1372},
+      {"double", 1373},
+      {"dreamer", 1374},
+      {"driver", 1375},
+      {"dwell", 1376},
+      {"evening", 1377},
+      {"flare", 1378},
+      {"flicker", 1379},
+      {"grandma", 1380},
+      {"guitar", 1381},
+      {"harm", 1382},
+      {"horrible", 1383},
+      {"hungry", 1384},
+      {"indeed", 1385},
+      {"lace", 1386},
+      {"melody", 1387},
+      {"monkey", 1388},
+      {"nation", 1389},
+      {"object", 1390},
+      {"obviously", 1391},
+      {"rainbow", 1392},
+      {"salt", 1393},
+      {"scratch", 1394},
+      {"shown", 1395},
+      {"shy", 1396},
+      {"stage", 1397},
+      {"stun", 1398},
+      {"third", 1399},
+      {"tickle", 1400},
+      {"useless", 1401},
+      {"weakness", 1402},
+      {"worship", 1403},
+      {"worthless", 1404},
+      {"afternoon", 1405},
+      {"beard", 1406},
+      {"boyfriend", 1407},
+      {"bubble", 1408},
+      {"busy", 1409},
+      {"certain", 1410},
+      {"chin", 1411},
+      {"concrete", 1412},
+      {"desk", 1413},
+      {"diamond", 1414},
+      {"doom", 1415},
+      {"drawn", 1416},
+      {"due", 1417},
+      {"felicity", 1418},
+      {"freeze", 1419},
+      {"frost", 1420},
+      {"garden", 1421},
+      {"glide", 1422},
+      {"harmony", 1423},
+      {"hopefully", 1424},
+      {"hunt", 1425},
+      {"jealous", 1426},
+      {"lightning", 1427},
+      {"mama", 1428},
+      {"mercy", 1429},
+      {"peel", 1430},
+      {"physical", 1431},
+      {"position", 1432},
+      {"pulse", 1433},
+      {"punch", 1434},
+      {"quit", 1435},
+      {"rant", 1436},
+      {"respond", 1437},
+      {"salty", 1438},
+      {"sane", 1439},
+      {"satisfy", 1440},
+      {"savior", 1441},
+      {"sheep", 1442},
+      {"slept", 1443},
+      {"social", 1444},
+      {"sport", 1445},
+      {"tuck", 1446},
+      {"utter", 1447},
+      {"valley", 1448},
+      {"wolf", 1449},
+      {"aim", 1450},
+      {"alas", 1451},
+      {"alter", 1452},
+      {"arrow", 1453},
+      {"awaken", 1454},
+      {"beaten", 1455},
+      {"belief", 1456},
+      {"brand", 1457},
+      {"ceiling", 1458},
+      {"cheese", 1459},
+      {"clue", 1460},
+      {"confidence", 1461},
+      {"connection", 1462},
+      {"daily", 1463},
+      {"disguise", 1464},
+      {"eager", 1465},
+      {"erase", 1466},
+      {"essence", 1467},
+      {"everytime", 1468},
+      {"expression", 1469},
+      {"fan", 1470},
+      {"flag", 1471},
+      {"flirt", 1472},
+      {"foul", 1473},
+      {"fur", 1474},
+      {"giggle", 1475},
+      {"glorious", 1476},
+      {"ignorance", 1477},
+      {"law", 1478},
+      {"lifeless", 1479},
+      {"measure", 1480},
+      {"mighty", 1481},
+      {"muse", 1482},
+      {"north", 1483},
+      {"opposite", 1484},
+      {"paradise", 1485},
+      {"patience", 1486},
+      {"patient", 1487},
+      {"pencil", 1488},
+      {"petal", 1489},
+      {"plate", 1490},
+      {"ponder", 1491},
+      {"possibly", 1492},
+      {"practice", 1493},
+      {"slice", 1494},
+      {"spell", 1495},
+      {"stock", 1496},
+      {"strife", 1497},
+      {"strip", 1498},
+      {"suffocate", 1499},
+      {"suit", 1500},
+      {"tender", 1501},
+      {"tool", 1502},
+      {"trade", 1503},
+      {"velvet", 1504},
+      {"verse", 1505},
+      {"waist", 1506},
+      {"witch", 1507},
+      {"aunt", 1508},
+      {"bench", 1509},
+      {"bold", 1510},
+      {"cap", 1511},
+      {"certainly", 1512},
+      {"click", 1513},
+      {"companion", 1514},
+      {"creator", 1515},
+      {"dart", 1516},
+      {"delicate", 1517},
+      {"determine", 1518},
+      {"dish", 1519},
+      {"dragon", 1520},
+      {"drama", 1521},
+      {"drum", 1522},
+      {"dude", 1523},
+      {"everybody", 1524},
+      {"feast", 1525},
+      {"forehead", 1526},
+      {"former", 1527},
+      {"fright", 1528},
+      {"fully", 1529},
+      {"gas", 1530},
+      {"hook", 1531},
+      {"hurl", 1532},
+      {"invite", 1533},
+      {"juice", 1534},
+      {"manage", 1535},
+      {"moral", 1536},
+      {"possess", 1537},
+      {"raw", 1538},
+      {"rebel", 1539},
+      {"royal", 1540},
+      {"scale", 1541},
+      {"scary", 1542},
+      {"several", 1543},
+      {"slight", 1544},
+      {"stubborn", 1545},
+      {"swell", 1546},
+      {"talent", 1547},
+      {"tea", 1548},
+      {"terrible", 1549},
+      {"thread", 1550},
+      {"torment", 1551},
+      {"trickle", 1552},
+      {"usually", 1553},
+      {"vast", 1554},
+      {"violence", 1555},
+      {"weave", 1556},
+      {"acid", 1557},
+      {"agony", 1558},
+      {"ashamed", 1559},
+      {"awe", 1560},
+      {"belly", 1561},
+      {"blend", 1562},
+      {"blush", 1563},
+      {"character", 1564},
+      {"cheat", 1565},
+      {"common", 1566},
+      {"company", 1567},
+      {"coward", 1568},
+      {"creak", 1569},
+      {"danger", 1570},
+      {"deadly", 1571},
+      {"defense", 1572},
+      {"define", 1573},
+      {"depend", 1574},
+      {"desperate", 1575},
+      {"destination", 1576},
+      {"dew", 1577},
+      {"duck", 1578},
+      {"dusty", 1579},
+      {"embarrass", 1580},
+      {"engine", 1581},
+      {"example", 1582},
+      {"explore", 1583},
+      {"foe", 1584},
+      {"freely", 1585},
+      {"frustrate", 1586},
+      {"generation", 1587},
+      {"glove", 1588},
+      {"guilty", 1589},
+      {"health", 1590},
+      {"hurry", 1591},
+      {"idiot", 1592},
+      {"impossible", 1593},
+      {"inhale", 1594},
+      {"jaw", 1595},
+      {"kingdom", 1596},
+      {"mention", 1597},
+      {"mist", 1598},
+      {"moan", 1599},
+      {"mumble", 1600},
+      {"mutter", 1601},
+      {"observe", 1602},
+      {"ode", 1603},
+      {"pathetic", 1604},
+      {"pattern", 1605},
+      {"pie", 1606},
+      {"prefer", 1607},
+      {"puff", 1608},
+      {"rape", 1609},
+      {"rare", 1610},
+      {"revenge", 1611},
+      {"rude", 1612},
+      {"scrape", 1613},
+      {"spiral", 1614},
+      {"squeeze", 1615},
+      {"strain", 1616},
+      {"sunset", 1617},
+      {"suspend", 1618},
+      {"sympathy", 1619},
+      {"thigh", 1620},
+      {"throne", 1621},
+      {"total", 1622},
+      {"unseen", 1623},
+      {"weapon", 1624},
+      {"weary", 1625}
+    };
+
+    const std::string wordsArray[] = {
+      "like",
+      "just",
+      "love",
+      "know",
+      "never",
+      "want",
+      "time",
+      "out",
+      "there",
+      "make",
+      "look",
+      "eye",
+      "down",
+      "only",
+      "think",
+      "heart",
+      "back",
+      "then",
+      "into",
+      "about",
+      "more",
+      "away",
+      "still",
+      "them",
+      "take",
+      "thing",
+      "even",
+      "through",
+      "long",
+      "always",
+      "world",
+      "too",
+      "friend",
+      "tell",
+      "try",
+      "hand",
+      "thought",
+      "over",
+      "here",
+      "other",
+      "need",
+      "smile",
+      "again",
+      "much",
+      "cry",
+      "been",
+      "night",
+      "ever",
+      "little",
+      "said",
+      "end",
+      "some",
+      "those",
+      "around",
+      "mind",
+      "people",
+      "girl",
+      "leave",
+      "dream",
+      "left",
+      "turn",
+      "myself",
+      "give",
+      "nothing",
+      "really",
+      "off",
+      "before",
+      "something",
+      "find",
+      "walk",
+      "wish",
+      "good",
+      "once",
+      "place",
+      "ask",
+      "stop",
+      "keep",
+      "watch",
+      "seem",
+      "everything",
+      "wait",
+      "got",
+      "yet",
+      "made",
+      "remember",
+      "start",
+      "alone",
+      "run",
+      "hope",
+      "maybe",
+      "believe",
+      "body",
+      "hate",
+      "after",
+      "close",
+      "talk",
+      "stand",
+      "own",
+      "each",
+      "hurt",
+      "help",
+      "home",
+      "god",
+      "soul",
+      "new",
+      "many",
+      "two",
+      "inside",
+      "should",
+      "true",
+      "first",
+      "fear",
+      "mean",
+      "better",
+      "play",
+      "another",
+      "gone",
+      "change",
+      "use",
+      "wonder",
+      "someone",
+      "hair",
+      "cold",
+      "open",
+      "best",
+      "any",
+      "behind",
+      "happen",
+      "water",
+      "dark",
+      "laugh",
+      "stay",
+      "forever",
+      "name",
+      "work",
+      "show",
+      "sky",
+      "break",
+      "came",
+      "deep",
+      "door",
+      "put",
+      "black",
+      "together",
+      "upon",
+      "happy",
+      "such",
+      "great",
+      "white",
+      "matter",
+      "fill",
+      "past",
+      "please",
+      "burn",
+      "cause",
+      "enough",
+      "touch",
+      "moment",
+      "soon",
+      "voice",
+      "scream",
+      "anything",
+      "stare",
+      "sound",
+      "red",
+      "everyone",
+      "hide",
+      "kiss",
+      "truth",
+      "death",
+      "beautiful",
+      "mine",
+      "blood",
+      "broken",
+      "very",
+      "pass",
+      "next",
+      "forget",
+      "tree",
+      "wrong",
+      "air",
+      "mother",
+      "understand",
+      "lip",
+      "hit",
+      "wall",
+      "memory",
+      "sleep",
+      "free",
+      "high",
+      "realize",
+      "school",
+      "might",
+      "skin",
+      "sweet",
+      "perfect",
+      "blue",
+      "kill",
+      "breath",
+      "dance",
+      "against",
+      "fly",
+      "between",
+      "grow",
+      "strong",
+      "under",
+      "listen",
+      "bring",
+      "sometimes",
+      "speak",
+      "pull",
+      "person",
+      "become",
+      "family",
+      "begin",
+      "ground",
+      "real",
+      "small",
+      "father",
+      "sure",
+      "feet",
+      "rest",
+      "young",
+      "finally",
+      "land",
+      "across",
+      "today",
+      "different",
+      "guy",
+      "line",
+      "fire",
+      "reason",
+      "reach",
+      "second",
+      "slowly",
+      "write",
+      "eat",
+      "smell",
+      "mouth",
+      "step",
+      "learn",
+      "three",
+      "floor",
+      "promise",
+      "breathe",
+      "darkness",
+      "push",
+      "earth",
+      "guess",
+      "save",
+      "song",
+      "above",
+      "along",
+      "both",
+      "color",
+      "house",
+      "almost",
+      "sorry",
+      "anymore",
+      "brother",
+      "okay",
+      "dear",
+      "game",
+      "fade",
+      "already",
+      "apart",
+      "warm",
+      "beauty",
+      "heard",
+      "notice",
+      "question",
+      "shine",
+      "began",
+      "piece",
+      "whole",
+      "shadow",
+      "secret",
+      "street",
+      "within",
+      "finger",
+      "point",
+      "morning",
+      "whisper",
+      "child",
+      "moon",
+      "green",
+      "story",
+      "glass",
+      "kid",
+      "silence",
+      "since",
+      "soft",
+      "yourself",
+      "empty",
+      "shall",
+      "angel",
+      "answer",
+      "baby",
+      "bright",
+      "dad",
+      "path",
+      "worry",
+      "hour",
+      "drop",
+      "follow",
+      "power",
+      "war",
+      "half",
+      "flow",
+      "heaven",
+      "act",
+      "chance",
+      "fact",
+      "least",
+      "tired",
+      "children",
+      "near",
+      "quite",
+      "afraid",
+      "rise",
+      "sea",
+      "taste",
+      "window",
+      "cover",
+      "nice",
+      "trust",
+      "lot",
+      "sad",
+      "cool",
+      "force",
+      "peace",
+      "return",
+      "blind",
+      "easy",
+      "ready",
+      "roll",
+      "rose",
+      "drive",
+      "held",
+      "music",
+      "beneath",
+      "hang",
+      "mom",
+      "paint",
+      "emotion",
+      "quiet",
+      "clear",
+      "cloud",
+      "few",
+      "pretty",
+      "bird",
+      "outside",
+      "paper",
+      "picture",
+      "front",
+      "rock",
+      "simple",
+      "anyone",
+      "meant",
+      "reality",
+      "road",
+      "sense",
+      "waste",
+      "bit",
+      "leaf",
+      "thank",
+      "happiness",
+      "meet",
+      "men",
+      "smoke",
+      "truly",
+      "decide",
+      "self",
+      "age",
+      "book",
+      "form",
+      "alive",
+      "carry",
+      "escape",
+      "damn",
+      "instead",
+      "able",
+      "ice",
+      "minute",
+      "throw",
+      "catch",
+      "leg",
+      "ring",
+      "course",
+      "goodbye",
+      "lead",
+      "poem",
+      "sick",
+      "corner",
+      "desire",
+      "known",
+      "problem",
+      "remind",
+      "shoulder",
+      "suppose",
+      "toward",
+      "wave",
+      "drink",
+      "jump",
+      "woman",
+      "pretend",
+      "sister",
+      "week",
+      "human",
+      "joy",
+      "crack",
+      "grey",
+      "pray",
+      "surprise",
+      "dry",
+      "knee",
+      "less",
+      "search",
+      "bleed",
+      "caught",
+      "clean",
+      "embrace",
+      "future",
+      "king",
+      "son",
+      "sorrow",
+      "chest",
+      "hug",
+      "remain",
+      "sat",
+      "worth",
+      "blow",
+      "daddy",
+      "final",
+      "parent",
+      "tight",
+      "also",
+      "create",
+      "lonely",
+      "safe",
+      "cross",
+      "dress",
+      "evil",
+      "silent",
+      "bone",
+      "fate",
+      "perhaps",
+      "anger",
+      "class",
+      "scar",
+      "snow",
+      "tiny",
+      "tonight",
+      "continue",
+      "control",
+      "dog",
+      "edge",
+      "mirror",
+      "month",
+      "suddenly",
+      "comfort",
+      "given",
+      "loud",
+      "quickly",
+      "gaze",
+      "plan",
+      "rush",
+      "stone",
+      "town",
+      "battle",
+      "ignore",
+      "spirit",
+      "stood",
+      "stupid",
+      "yours",
+      "brown",
+      "build",
+      "dust",
+      "hey",
+      "kept",
+      "pay",
+      "phone",
+      "twist",
+      "although",
+      "ball",
+      "beyond",
+      "hidden",
+      "nose",
+      "taken",
+      "fail",
+      "float",
+      "pure",
+      "somehow",
+      "wash",
+      "wrap",
+      "angry",
+      "cheek",
+      "creature",
+      "forgotten",
+      "heat",
+      "rip",
+      "single",
+      "space",
+      "special",
+      "weak",
+      "whatever",
+      "yell",
+      "anyway",
+      "blame",
+      "job",
+      "choose",
+      "country",
+      "curse",
+      "drift",
+      "echo",
+      "figure",
+      "grew",
+      "laughter",
+      "neck",
+      "suffer",
+      "worse",
+      "yeah",
+      "disappear",
+      "foot",
+      "forward",
+      "knife",
+      "mess",
+      "somewhere",
+      "stomach",
+      "storm",
+      "beg",
+      "idea",
+      "lift",
+      "offer",
+      "breeze",
+      "field",
+      "five",
+      "often",
+      "simply",
+      "stuck",
+      "win",
+      "allow",
+      "confuse",
+      "enjoy",
+      "except",
+      "flower",
+      "seek",
+      "strength",
+      "calm",
+      "grin",
+      "gun",
+      "heavy",
+      "hill",
+      "large",
+      "ocean",
+      "shoe",
+      "sigh",
+      "straight",
+      "summer",
+      "tongue",
+      "accept",
+      "crazy",
+      "everyday",
+      "exist",
+      "grass",
+      "mistake",
+      "sent",
+      "shut",
+      "surround",
+      "table",
+      "ache",
+      "brain",
+      "destroy",
+      "heal",
+      "nature",
+      "shout",
+      "sign",
+      "stain",
+      "choice",
+      "doubt",
+      "glance",
+      "glow",
+      "mountain",
+      "queen",
+      "stranger",
+      "throat",
+      "tomorrow",
+      "city",
+      "either",
+      "fish",
+      "flame",
+      "rather",
+      "shape",
+      "spin",
+      "spread",
+      "ash",
+      "distance",
+      "finish",
+      "image",
+      "imagine",
+      "important",
+      "nobody",
+      "shatter",
+      "warmth",
+      "became",
+      "feed",
+      "flesh",
+      "funny",
+      "lust",
+      "shirt",
+      "trouble",
+      "yellow",
+      "attention",
+      "bare",
+      "bite",
+      "money",
+      "protect",
+      "amaze",
+      "appear",
+      "born",
+      "choke",
+      "completely",
+      "daughter",
+      "fresh",
+      "friendship",
+      "gentle",
+      "probably",
+      "six",
+      "deserve",
+      "expect",
+      "grab",
+      "middle",
+      "nightmare",
+      "river",
+      "thousand",
+      "weight",
+      "worst",
+      "wound",
+      "barely",
+      "bottle",
+      "cream",
+      "regret",
+      "relationship",
+      "stick",
+      "test",
+      "crush",
+      "endless",
+      "fault",
+      "itself",
+      "rule",
+      "spill",
+      "art",
+      "circle",
+      "join",
+      "kick",
+      "mask",
+      "master",
+      "passion",
+      "quick",
+      "raise",
+      "smooth",
+      "unless",
+      "wander",
+      "actually",
+      "broke",
+      "chair",
+      "deal",
+      "favorite",
+      "gift",
+      "note",
+      "number",
+      "sweat",
+      "box",
+      "chill",
+      "clothes",
+      "lady",
+      "mark",
+      "park",
+      "poor",
+      "sadness",
+      "tie",
+      "animal",
+      "belong",
+      "brush",
+      "consume",
+      "dawn",
+      "forest",
+      "innocent",
+      "pen",
+      "pride",
+      "stream",
+      "thick",
+      "clay",
+      "complete",
+      "count",
+      "draw",
+      "faith",
+      "press",
+      "silver",
+      "struggle",
+      "surface",
+      "taught",
+      "teach",
+      "wet",
+      "bless",
+      "chase",
+      "climb",
+      "enter",
+      "letter",
+      "melt",
+      "metal",
+      "movie",
+      "stretch",
+      "swing",
+      "vision",
+      "wife",
+      "beside",
+      "crash",
+      "forgot",
+      "guide",
+      "haunt",
+      "joke",
+      "knock",
+      "plant",
+      "pour",
+      "prove",
+      "reveal",
+      "steal",
+      "stuff",
+      "trip",
+      "wood",
+      "wrist",
+      "bother",
+      "bottom",
+      "crawl",
+      "crowd",
+      "fix",
+      "forgive",
+      "frown",
+      "grace",
+      "loose",
+      "lucky",
+      "party",
+      "release",
+      "surely",
+      "survive",
+      "teacher",
+      "gently",
+      "grip",
+      "speed",
+      "suicide",
+      "travel",
+      "treat",
+      "vein",
+      "written",
+      "cage",
+      "chain",
+      "conversation",
+      "date",
+      "enemy",
+      "however",
+      "interest",
+      "million",
+      "page",
+      "pink",
+      "proud",
+      "sway",
+      "themselves",
+      "winter",
+      "church",
+      "cruel",
+      "cup",
+      "demon",
+      "experience",
+      "freedom",
+      "pair",
+      "pop",
+      "purpose",
+      "respect",
+      "shoot",
+      "softly",
+      "state",
+      "strange",
+      "bar",
+      "birth",
+      "curl",
+      "dirt",
+      "excuse",
+      "lord",
+      "lovely",
+      "monster",
+      "order",
+      "pack",
+      "pants",
+      "pool",
+      "scene",
+      "seven",
+      "shame",
+      "slide",
+      "ugly",
+      "among",
+      "blade",
+      "blonde",
+      "closet",
+      "creek",
+      "deny",
+      "drug",
+      "eternity",
+      "gain",
+      "grade",
+      "handle",
+      "key",
+      "linger",
+      "pale",
+      "prepare",
+      "swallow",
+      "swim",
+      "tremble",
+      "wheel",
+      "won",
+      "cast",
+      "cigarette",
+      "claim",
+      "college",
+      "direction",
+      "dirty",
+      "gather",
+      "ghost",
+      "hundred",
+      "loss",
+      "lung",
+      "orange",
+      "present",
+      "swear",
+      "swirl",
+      "twice",
+      "wild",
+      "bitter",
+      "blanket",
+      "doctor",
+      "everywhere",
+      "flash",
+      "grown",
+      "knowledge",
+      "numb",
+      "pressure",
+      "radio",
+      "repeat",
+      "ruin",
+      "spend",
+      "unknown",
+      "buy",
+      "clock",
+      "devil",
+      "early",
+      "false",
+      "fantasy",
+      "pound",
+      "precious",
+      "refuse",
+      "sheet",
+      "teeth",
+      "welcome",
+      "add",
+      "ahead",
+      "block",
+      "bury",
+      "caress",
+      "content",
+      "depth",
+      "despite",
+      "distant",
+      "marry",
+      "purple",
+      "threw",
+      "whenever",
+      "bomb",
+      "dull",
+      "easily",
+      "grasp",
+      "hospital",
+      "innocence",
+      "normal",
+      "receive",
+      "reply",
+      "rhyme",
+      "shade",
+      "someday",
+      "sword",
+      "toe",
+      "visit",
+      "asleep",
+      "bought",
+      "center",
+      "consider",
+      "flat",
+      "hero",
+      "history",
+      "ink",
+      "insane",
+      "muscle",
+      "mystery",
+      "pocket",
+      "reflection",
+      "shove",
+      "silently",
+      "smart",
+      "soldier",
+      "spot",
+      "stress",
+      "train",
+      "type",
+      "view",
+      "whether",
+      "bus",
+      "energy",
+      "explain",
+      "holy",
+      "hunger",
+      "inch",
+      "magic",
+      "mix",
+      "noise",
+      "nowhere",
+      "prayer",
+      "presence",
+      "shock",
+      "snap",
+      "spider",
+      "study",
+      "thunder",
+      "trail",
+      "admit",
+      "agree",
+      "bag",
+      "bang",
+      "bound",
+      "butterfly",
+      "cute",
+      "exactly",
+      "explode",
+      "familiar",
+      "fold",
+      "further",
+      "pierce",
+      "reflect",
+      "scent",
+      "selfish",
+      "sharp",
+      "sink",
+      "spring",
+      "stumble",
+      "universe",
+      "weep",
+      "women",
+      "wonderful",
+      "action",
+      "ancient",
+      "attempt",
+      "avoid",
+      "birthday",
+      "branch",
+      "chocolate",
+      "core",
+      "depress",
+      "drunk",
+      "especially",
+      "focus",
+      "fruit",
+      "honest",
+      "match",
+      "palm",
+      "perfectly",
+      "pillow",
+      "pity",
+      "poison",
+      "roar",
+      "shift",
+      "slightly",
+      "thump",
+      "truck",
+      "tune",
+      "twenty",
+      "unable",
+      "wipe",
+      "wrote",
+      "coat",
+      "constant",
+      "dinner",
+      "drove",
+      "egg",
+      "eternal",
+      "flight",
+      "flood",
+      "frame",
+      "freak",
+      "gasp",
+      "glad",
+      "hollow",
+      "motion",
+      "peer",
+      "plastic",
+      "root",
+      "screen",
+      "season",
+      "sting",
+      "strike",
+      "team",
+      "unlike",
+      "victim",
+      "volume",
+      "warn",
+      "weird",
+      "attack",
+      "await",
+      "awake",
+      "built",
+      "charm",
+      "crave",
+      "despair",
+      "fought",
+      "grant",
+      "grief",
+      "horse",
+      "limit",
+      "message",
+      "ripple",
+      "sanity",
+      "scatter",
+      "serve",
+      "split",
+      "string",
+      "trick",
+      "annoy",
+      "blur",
+      "boat",
+      "brave",
+      "clearly",
+      "cling",
+      "connect",
+      "fist",
+      "forth",
+      "imagination",
+      "iron",
+      "jock",
+      "judge",
+      "lesson",
+      "milk",
+      "misery",
+      "nail",
+      "naked",
+      "ourselves",
+      "poet",
+      "possible",
+      "princess",
+      "sail",
+      "size",
+      "snake",
+      "society",
+      "stroke",
+      "torture",
+      "toss",
+      "trace",
+      "wise",
+      "bloom",
+      "bullet",
+      "cell",
+      "check",
+      "cost",
+      "darling",
+      "during",
+      "footstep",
+      "fragile",
+      "hallway",
+      "hardly",
+      "horizon",
+      "invisible",
+      "journey",
+      "midnight",
+      "mud",
+      "nod",
+      "pause",
+      "relax",
+      "shiver",
+      "sudden",
+      "value",
+      "youth",
+      "abuse",
+      "admire",
+      "blink",
+      "breast",
+      "bruise",
+      "constantly",
+      "couple",
+      "creep",
+      "curve",
+      "difference",
+      "dumb",
+      "emptiness",
+      "gotta",
+      "honor",
+      "plain",
+      "planet",
+      "recall",
+      "rub",
+      "ship",
+      "slam",
+      "soar",
+      "somebody",
+      "tightly",
+      "weather",
+      "adore",
+      "approach",
+      "bond",
+      "bread",
+      "burst",
+      "candle",
+      "coffee",
+      "cousin",
+      "crime",
+      "desert",
+      "flutter",
+      "frozen",
+      "grand",
+      "heel",
+      "hello",
+      "language",
+      "level",
+      "movement",
+      "pleasure",
+      "powerful",
+      "random",
+      "rhythm",
+      "settle",
+      "silly",
+      "slap",
+      "sort",
+      "spoken",
+      "steel",
+      "threaten",
+      "tumble",
+      "upset",
+      "aside",
+      "awkward",
+      "bee",
+      "blank",
+      "board",
+      "button",
+      "card",
+      "carefully",
+      "complain",
+      "crap",
+      "deeply",
+      "discover",
+      "drag",
+      "dread",
+      "effort",
+      "entire",
+      "fairy",
+      "giant",
+      "gotten",
+      "greet",
+      "illusion",
+      "jeans",
+      "leap",
+      "liquid",
+      "march",
+      "mend",
+      "nervous",
+      "nine",
+      "replace",
+      "rope",
+      "spine",
+      "stole",
+      "terror",
+      "accident",
+      "apple",
+      "balance",
+      "boom",
+      "childhood",
+      "collect",
+      "demand",
+      "depression",
+      "eventually",
+      "faint",
+      "glare",
+      "goal",
+      "group",
+      "honey",
+      "kitchen",
+      "laid",
+      "limb",
+      "machine",
+      "mere",
+      "mold",
+      "murder",
+      "nerve",
+      "painful",
+      "poetry",
+      "prince",
+      "rabbit",
+      "shelter",
+      "shore",
+      "shower",
+      "soothe",
+      "stair",
+      "steady",
+      "sunlight",
+      "tangle",
+      "tease",
+      "treasure",
+      "uncle",
+      "begun",
+      "bliss",
+      "canvas",
+      "cheer",
+      "claw",
+      "clutch",
+      "commit",
+      "crimson",
+      "crystal",
+      "delight",
+      "doll",
+      "existence",
+      "express",
+      "fog",
+      "football",
+      "gay",
+      "goose",
+      "guard",
+      "hatred",
+      "illuminate",
+      "mass",
+      "math",
+      "mourn",
+      "rich",
+      "rough",
+      "skip",
+      "stir",
+      "student",
+      "style",
+      "support",
+      "thorn",
+      "tough",
+      "yard",
+      "yearn",
+      "yesterday",
+      "advice",
+      "appreciate",
+      "autumn",
+      "bank",
+      "beam",
+      "bowl",
+      "capture",
+      "carve",
+      "collapse",
+      "confusion",
+      "creation",
+      "dove",
+      "feather",
+      "girlfriend",
+      "glory",
+      "government",
+      "harsh",
+      "hop",
+      "inner",
+      "loser",
+      "moonlight",
+      "neighbor",
+      "neither",
+      "peach",
+      "pig",
+      "praise",
+      "screw",
+      "shield",
+      "shimmer",
+      "sneak",
+      "stab",
+      "subject",
+      "throughout",
+      "thrown",
+      "tower",
+      "twirl",
+      "wow",
+      "army",
+      "arrive",
+      "bathroom",
+      "bump",
+      "cease",
+      "cookie",
+      "couch",
+      "courage",
+      "dim",
+      "guilt",
+      "howl",
+      "hum",
+      "husband",
+      "insult",
+      "led",
+      "lunch",
+      "mock",
+      "mostly",
+      "natural",
+      "nearly",
+      "needle",
+      "nerd",
+      "peaceful",
+      "perfection",
+      "pile",
+      "price",
+      "remove",
+      "roam",
+      "sanctuary",
+      "serious",
+      "shiny",
+      "shook",
+      "sob",
+      "stolen",
+      "tap",
+      "vain",
+      "void",
+      "warrior",
+      "wrinkle",
+      "affection",
+      "apologize",
+      "blossom",
+      "bounce",
+      "bridge",
+      "cheap",
+      "crumble",
+      "decision",
+      "descend",
+      "desperately",
+      "dig",
+      "dot",
+      "flip",
+      "frighten",
+      "heartbeat",
+      "huge",
+      "lazy",
+      "lick",
+      "odd",
+      "opinion",
+      "process",
+      "puzzle",
+      "quietly",
+      "retreat",
+      "score",
+      "sentence",
+      "separate",
+      "situation",
+      "skill",
+      "soak",
+      "square",
+      "stray",
+      "taint",
+      "task",
+      "tide",
+      "underneath",
+      "veil",
+      "whistle",
+      "anywhere",
+      "bedroom",
+      "bid",
+      "bloody",
+      "burden",
+      "careful",
+      "compare",
+      "concern",
+      "curtain",
+      "decay",
+      "defeat",
+      "describe",
+      "double",
+      "dreamer",
+      "driver",
+      "dwell",
+      "evening",
+      "flare",
+      "flicker",
+      "grandma",
+      "guitar",
+      "harm",
+      "horrible",
+      "hungry",
+      "indeed",
+      "lace",
+      "melody",
+      "monkey",
+      "nation",
+      "object",
+      "obviously",
+      "rainbow",
+      "salt",
+      "scratch",
+      "shown",
+      "shy",
+      "stage",
+      "stun",
+      "third",
+      "tickle",
+      "useless",
+      "weakness",
+      "worship",
+      "worthless",
+      "afternoon",
+      "beard",
+      "boyfriend",
+      "bubble",
+      "busy",
+      "certain",
+      "chin",
+      "concrete",
+      "desk",
+      "diamond",
+      "doom",
+      "drawn",
+      "due",
+      "felicity",
+      "freeze",
+      "frost",
+      "garden",
+      "glide",
+      "harmony",
+      "hopefully",
+      "hunt",
+      "jealous",
+      "lightning",
+      "mama",
+      "mercy",
+      "peel",
+      "physical",
+      "position",
+      "pulse",
+      "punch",
+      "quit",
+      "rant",
+      "respond",
+      "salty",
+      "sane",
+      "satisfy",
+      "savior",
+      "sheep",
+      "slept",
+      "social",
+      "sport",
+      "tuck",
+      "utter",
+      "valley",
+      "wolf",
+      "aim",
+      "alas",
+      "alter",
+      "arrow",
+      "awaken",
+      "beaten",
+      "belief",
+      "brand",
+      "ceiling",
+      "cheese",
+      "clue",
+      "confidence",
+      "connection",
+      "daily",
+      "disguise",
+      "eager",
+      "erase",
+      "essence",
+      "everytime",
+      "expression",
+      "fan",
+      "flag",
+      "flirt",
+      "foul",
+      "fur",
+      "giggle",
+      "glorious",
+      "ignorance",
+      "law",
+      "lifeless",
+      "measure",
+      "mighty",
+      "muse",
+      "north",
+      "opposite",
+      "paradise",
+      "patience",
+      "patient",
+      "pencil",
+      "petal",
+      "plate",
+      "ponder",
+      "possibly",
+      "practice",
+      "slice",
+      "spell",
+      "stock",
+      "strife",
+      "strip",
+      "suffocate",
+      "suit",
+      "tender",
+      "tool",
+      "trade",
+      "velvet",
+      "verse",
+      "waist",
+      "witch",
+      "aunt",
+      "bench",
+      "bold",
+      "cap",
+      "certainly",
+      "click",
+      "companion",
+      "creator",
+      "dart",
+      "delicate",
+      "determine",
+      "dish",
+      "dragon",
+      "drama",
+      "drum",
+      "dude",
+      "everybody",
+      "feast",
+      "forehead",
+      "former",
+      "fright",
+      "fully",
+      "gas",
+      "hook",
+      "hurl",
+      "invite",
+      "juice",
+      "manage",
+      "moral",
+      "possess",
+      "raw",
+      "rebel",
+      "royal",
+      "scale",
+      "scary",
+      "several",
+      "slight",
+      "stubborn",
+      "swell",
+      "talent",
+      "tea",
+      "terrible",
+      "thread",
+      "torment",
+      "trickle",
+      "usually",
+      "vast",
+      "violence",
+      "weave",
+      "acid",
+      "agony",
+      "ashamed",
+      "awe",
+      "belly",
+      "blend",
+      "blush",
+      "character",
+      "cheat",
+      "common",
+      "company",
+      "coward",
+      "creak",
+      "danger",
+      "deadly",
+      "defense",
+      "define",
+      "depend",
+      "desperate",
+      "destination",
+      "dew",
+      "duck",
+      "dusty",
+      "embarrass",
+      "engine",
+      "example",
+      "explore",
+      "foe",
+      "freely",
+      "frustrate",
+      "generation",
+      "glove",
+      "guilty",
+      "health",
+      "hurry",
+      "idiot",
+      "impossible",
+      "inhale",
+      "jaw",
+      "kingdom",
+      "mention",
+      "mist",
+      "moan",
+      "mumble",
+      "mutter",
+      "observe",
+      "ode",
+      "pathetic",
+      "pattern",
+      "pie",
+      "prefer",
+      "puff",
+      "rape",
+      "rare",
+      "revenge",
+      "rude",
+      "scrape",
+      "spiral",
+      "squeeze",
+      "strain",
+      "sunset",
+      "suspend",
+      "sympathy",
+      "thigh",
+      "throne",
+      "total",
+      "unseen",
+      "weapon",
+      "weary"
+    };
+  }
+}
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index ba39b9b77..9a96de2f0 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -29,7 +29,7 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_keys = account_keys();
   }
   //-----------------------------------------------------------------
-  void account_base::generate()
+  void account_base::generate(const crypto::secret_key& recovery_key, bool recover)
   {
     generate_keys(m_keys.m_account_address.m_spend_public_key, m_keys.m_spend_secret_key);
     generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key);
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h
index 8b525da97..96125eb27 100644
--- a/src/cryptonote_core/account.h
+++ b/src/cryptonote_core/account.h
@@ -31,7 +31,7 @@ namespace cryptonote
   {
   public:
     account_base();
-    void generate();
+    void generate(const crypto::secret_key& recovery_key, bool recover);
     const account_keys& get_keys() const;
     std::string get_public_address_str();
 
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 4cab12c22..3cea02bf1 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -17,6 +17,8 @@
 #include "rpc/core_rpc_server_commands_defs.h"
 #include "wallet/wallet_rpc_server.h"
 #include "version.h"
+#include "crypto/crypto.h"  // for crypto::secret_key definition
+#include "crypto/electrum-words.h"
 
 #if defined(WIN32)
 #include <crtdbg.h>
@@ -38,6 +40,8 @@ namespace
   const command_line::arg_descriptor<std::string> arg_daemon_address = {"daemon-address", "Use daemon instance at <host>:<port>", ""};
   const command_line::arg_descriptor<std::string> arg_daemon_host = {"daemon-host", "Use daemon instance at host <arg> instead of localhost", ""};
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
+  const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", "Specify electrum seed for wallet recovery/creation", ""};
+  const command_line::arg_descriptor<bool> arg_recover = {"recover", "Recover wallet using mnemonic generator (e.g. electrum word list)", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -284,7 +288,24 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
 
   if (!m_generate_new.empty())
   {
-    bool r = new_wallet(m_generate_new, pwd_container.password());
+    // check for recover flag.  if present, require electrum word list (only recovery option for now).
+    if (m_recover)
+    {
+      if (m_electrum_seed.empty())
+      {
+        fail_msg_writer() << "specify a recovery parameter (e.g. electrum word list) with the recover option";
+        return false;
+      }
+      else  // verify recovery param (electrum word list) and convert to byte representation
+      {
+        CHECK_AND_ASSERT_MES(
+            crypto::ElectrumWords::words_to_bytes(m_electrum_seed, m_recovery_key),
+            false,
+            "electrum-style word list failed verification"
+        );
+      }
+    }
+    bool r = new_wallet(m_generate_new, pwd_container.password(), m_recovery_key, m_recover);
     CHECK_AND_ASSERT_MES(r, false, "account creation failed");
   }
   else
@@ -311,6 +332,8 @@ void simple_wallet::handle_command_line(const boost::program_options::variables_
   m_daemon_address = command_line::get_arg(vm, arg_daemon_address);
   m_daemon_host    = command_line::get_arg(vm, arg_daemon_host);
   m_daemon_port    = command_line::get_arg(vm, arg_daemon_port);
+  m_electrum_seed  = command_line::get_arg(vm, arg_electrum_seed);
+  m_recover        = command_line::get_arg(vm, arg_recover);
 }
 //----------------------------------------------------------------------------------------------------
 bool simple_wallet::try_connect_to_daemon()
@@ -324,8 +347,14 @@ bool simple_wallet::try_connect_to_daemon()
   }
   return true;
 }
+
+bool simple_wallet::parse_electrum()
+{
+  return false;
+}
+
 //----------------------------------------------------------------------------------------------------
-bool simple_wallet::new_wallet(const string &wallet_file, const std::string& password)
+bool simple_wallet::new_wallet(const string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key, bool recover)
 {
   m_wallet_file = wallet_file;
 
@@ -333,7 +362,7 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
   m_wallet->callback(this);
   try
   {
-    m_wallet->generate(wallet_file, password);
+    m_wallet->generate(wallet_file, password, recovery_key, recover);
     message_writer(epee::log_space::console_color_white, true) << "Generated new wallet: " << m_wallet->get_account().get_public_address_str() << std::endl << "view key: " << string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_view_secret_key);
   }
   catch (const std::exception& e)
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index 3dcaaeaa0..d1f9fe98b 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -13,6 +13,7 @@
 #include "wallet/wallet2.h"
 #include "console_handler.h"
 #include "password_container.h"
+#include "crypto/crypto.h"  // for definition of crypto::secret_key
 
 
 namespace cryptonote
@@ -39,7 +40,9 @@ namespace cryptonote
 
     bool run_console_handler();
 
-    bool new_wallet(const std::string &wallet_file, const std::string& password);
+    bool parse_electrum();
+
+    bool new_wallet(const std::string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
     bool open_wallet(const std::string &wallet_file, const std::string& password);
     bool close_wallet();
 
@@ -125,6 +128,11 @@ namespace cryptonote
     std::string m_generate_new;
     std::string m_import_path;
 
+    std::string m_electrum_seed;  // electrum-style seed parameter
+
+    crypto::secret_key m_recovery_key;  // recovery key (used as random for wallet gen)
+    bool m_recover;  // recover flag
+
     std::string m_daemon_address;
     std::string m_daemon_host;
     int m_daemon_port;
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index fb1e5575b..b0c341615 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -38,6 +38,7 @@ void do_prepare_file_names(const std::string& file_path, std::string& keys_file,
     keys_file += ".keys";
   }
 }
+
 } //namespace
 
 namespace tools
@@ -435,7 +436,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
   THROW_WALLET_EXCEPTION_IF(!r, error::invalid_password);
 }
 //----------------------------------------------------------------------------------------------------
-void wallet2::generate(const std::string& wallet_, const std::string& password)
+void wallet2::generate(const std::string& wallet_, const std::string& password, const crypto::secret_key& recovery_param, bool recover)
 {
   clear();
   prepare_file_names(wallet_);
@@ -444,7 +445,8 @@ void wallet2::generate(const std::string& wallet_, const std::string& password)
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_wallet_file, ignored_ec), error::file_exists, m_wallet_file);
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_keys_file,   ignored_ec), error::file_exists, m_keys_file);
 
-  m_account.generate();
+  m_account.generate(recovery_param, recover);
+
   m_account_public_address = m_account.get_keys().m_account_address;
 
   bool r = store_keys(m_keys_file, password);
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 9ca586425..87e1dcbd4 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -97,7 +97,7 @@ namespace tools
       END_SERIALIZE()
     };
 
-    void generate(const std::string& wallet, const std::string& password);
+    void generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param, bool recover = false);
     void load(const std::string& wallet, const std::string& password);
     void store();
     cryptonote::account_base& get_account(){return m_account;}
@@ -227,6 +227,7 @@ namespace boost
 
 namespace tools
 {
+
   namespace detail
   {
     //----------------------------------------------------------------------------------------------------
diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h
index 0d42dbaf4..71c946545 100644
--- a/src/wallet/wallet_errors.h
+++ b/src/wallet/wallet_errors.h
@@ -188,6 +188,17 @@ namespace tools
 
       std::string to_string() const { return wallet_logic_error::to_string(); }
     };
+
+    //----------------------------------------------------------------------------------------------------
+    struct invalid_pregenerated_random : public wallet_logic_error
+    {
+      explicit invalid_pregenerated_random (std::string&& loc)
+        : wallet_logic_error(std::move(loc), "invalid pregenerated random for wallet creation/recovery")
+      {
+      }
+
+      std::string to_string() const { return wallet_logic_error::to_string(); }
+    };
     //----------------------------------------------------------------------------------------------------
     struct refresh_error : public wallet_logic_error
     {

From f70bc3a345ea11190e5b40c0606bb222d7825ea8 Mon Sep 17 00:00:00 2001
From: tom <tewinget@gmail.com>
Date: Wed, 4 Jun 2014 21:11:19 -0400
Subject: [PATCH 59/76] defaulted new parameters in modified functions

---
 src/cryptonote_core/account.h | 2 +-
 src/wallet/wallet2.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h
index 96125eb27..745da0897 100644
--- a/src/cryptonote_core/account.h
+++ b/src/cryptonote_core/account.h
@@ -31,7 +31,7 @@ namespace cryptonote
   {
   public:
     account_base();
-    void generate(const crypto::secret_key& recovery_key, bool recover);
+    void generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
     const account_keys& get_keys() const;
     std::string get_public_address_str();
 
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 87e1dcbd4..85ed344c3 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -97,7 +97,7 @@ namespace tools
       END_SERIALIZE()
     };
 
-    void generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param, bool recover = false);
+    void generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false);
     void load(const std::string& wallet, const std::string& password);
     void store();
     cryptonote::account_base& get_account(){return m_account;}

From cd631325029bf8df53e2ec813a3d340a841f73e2 Mon Sep 17 00:00:00 2001
From: tom <tewinget@gmail.com>
Date: Wed, 4 Jun 2014 23:08:35 -0400
Subject: [PATCH 60/76] compile issues, resolve later.  commiting because
 switching machines

---
 src/crypto/crypto.h           |  5 ++-
 src/crypto/electrum-words.cpp | 77 ++++++++++++++++++++++++++++++++++-
 src/crypto/electrum-words.h   |  3 ++
 3 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 61641fbcf..1d92647f6 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -26,7 +26,10 @@ namespace crypto {
   };
 
   POD_CLASS ec_scalar {
-    char data[32];
+    // FIXME: temporary to get wallet recovery to work.  Need to
+    // discuss proper solution with team
+    public:
+      char data[32];
   };
 
   POD_CLASS public_key: ec_point {
diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index cb01c9203..9818791b9 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -6,6 +6,9 @@
 
 #include <string>
 #include <map>
+#include <cstdint>
+#include <vector>
+#include <boost/algorithm/string.hpp>
 #include "crypto/crypto.h"  // for declaration of crypto::secret_key
 
 #include "crypto/electrum-words.h"
@@ -15,12 +18,84 @@ namespace crypto
   namespace ElectrumWords
   {
 
+    /* convert words to bytes, 3 words -> 4 bytes
+     * returns:
+     *    false if not a multiple of 3 words, or if a words is not in the
+     *    words list
+     *
+     *    true otherwise
+     */
     bool words_to_bytes(const std::string& words, crypto::secret_key& dst)
     {
-      return false;
+      int n = NUMWORDS; // hardcoded because this is what electrum uses
+
+      std::vector<std::string> wlist;
+
+      boost::split(wlist, words, boost::is_any_of(" "));
+
+      // error on non-compliant word list
+      if (wlist.size() != 12 && wlist.size() != 24) return false;
+
+      for (int i=0; i < wlist.size() / 3; i++)
+      {
+        uint32_t val;
+        uint32_t w1, w2, w3;
+
+        // verify all three words exist in the word list
+        if (wordsMap.count(wlist[i*3]) == 0 ||
+            wordsMap.count(wlist[i*3 + 1]) == 0 ||
+            wordsMap.count(wlist[i*3 + 2]) == 0)
+        {
+          return false;
+        }
+
+        w1 = wordsMap.at(wlist[i*3]);
+        w2 = wordsMap(wlist[i*3 + 1]);
+        w3 = wordsMap(wlist[i*3 + 2]);
+
+        val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
+
+        memcpy(dst.data + i * 4, val, 4);  // copy 4 bytes to position
+      }
+
+      if (wlist.size() == 12)
+      {
+        memcpy(dst.data, dst.data + 16, 16);  // if electrum 12-word seed, duplicate
+      }
+
+      return true;
     }
+
+    /* convert bytes to words, 4 bytes-> 3 words
+     * returns:
+     *    false if wrong number of bytes (shouldn't be possible)
+     *    true otherwise
+     */
     bool bytes_to_words(const crypto::secret_key& src, std::string& words)
     {
+      int n = NUMWORDS; // hardcoded because this is what electrum uses
+
+      if (sizeof(src.data) % 4 != 0) return false;
+
+      // 8 bytes -> 3 words.  8 digits base 16 -> 3 digits base 1626
+      for (int i=0; i < sizeof(src.data)/4; i++, words += ' ')
+      {
+        uint32_t w1, w2, w3;
+        
+        uint32_t val;
+
+        memcpy(val, src, 4);
+
+        w1 = val % n;
+        w2 = ((val / n) + w1) % n;
+        w3 = (((val / n) / n) + w2) % n;
+
+        words += wordsArray[w1];
+        words += ' ';
+        words += wordsArray[w2];
+        words += ' ';
+        words += wordsArray[w3];
+      }
       return false;
     }
 
diff --git a/src/crypto/electrum-words.h b/src/crypto/electrum-words.h
index 6b8291047..f5f8d1d95 100644
--- a/src/crypto/electrum-words.h
+++ b/src/crypto/electrum-words.h
@@ -12,6 +12,9 @@ namespace crypto
 {
   namespace ElectrumWords
   {
+
+    const int NUMWORDS = 1626;
+
     bool words_to_bytes(const std::string& words, crypto::secret_key& dst);
     bool bytes_to_words(const crypto::secret_key& src, std::string& words);
 

From e89949c766f2f98671b24893beedc48a47447a6f Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 06:55:41 -0400
Subject: [PATCH 61/76] revert 'dirty hack' change to crypto.h.  need a better
 way for sure.

---
 src/crypto/crypto.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 1d92647f6..61641fbcf 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -26,10 +26,7 @@ namespace crypto {
   };
 
   POD_CLASS ec_scalar {
-    // FIXME: temporary to get wallet recovery to work.  Need to
-    // discuss proper solution with team
-    public:
-      char data[32];
+    char data[32];
   };
 
   POD_CLASS public_key: ec_point {

From 8661f9a970aca5812d0838bc3fb33fbae0ec4cd2 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 08:20:54 -0400
Subject: [PATCH 62/76] missing '.at' on two map calls.  built on some
 machines, very strange...

---
 src/crypto/electrum-words.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index 9818791b9..b4580e01f 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -50,8 +50,8 @@ namespace crypto
         }
 
         w1 = wordsMap.at(wlist[i*3]);
-        w2 = wordsMap(wlist[i*3 + 1]);
-        w3 = wordsMap(wlist[i*3 + 2]);
+        w2 = wordsMap.at(wlist[i*3 + 1]);
+        w3 = wordsMap.at(wlist[i*3 + 2]);
 
         val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
 

From d22e458c6c680f4b5dcf56a58a37a5f79912e65c Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 14:18:11 -0400
Subject: [PATCH 63/76] builds, but doesn't link.  other than that,
 electrum-style recovery implemented (but not tested\!)

---
 src/common/pod-class.h            |  6 ++++++
 src/crypto/crypto.cpp             | 19 +++++++++++++++++--
 src/crypto/crypto.h               |  8 ++++----
 src/crypto/electrum-words.cpp     | 10 +++++-----
 src/cryptonote_core/account.cpp   | 13 ++++++++++---
 src/cryptonote_core/account.h     |  2 +-
 src/simplewallet/simplewallet.cpp | 10 +++++++++-
 src/wallet/wallet2.cpp            |  5 +++--
 src/wallet/wallet2.h              |  2 +-
 9 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/src/common/pod-class.h b/src/common/pod-class.h
index c07edb208..10d680484 100644
--- a/src/common/pod-class.h
+++ b/src/common/pod-class.h
@@ -4,8 +4,14 @@
 
 #pragma once
 
+// FIXME: Why is this ifdef needed?  Hopefully making it struct won't break things.
+
+/*
 #if defined(_MSC_VER)
 #define POD_CLASS struct
 #else
 #define POD_CLASS class
 #endif
+*/
+
+#define POD_CLASS struct
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp
index 31fc31d5b..98a17a3e4 100644
--- a/src/crypto/crypto.cpp
+++ b/src/crypto/crypto.cpp
@@ -68,12 +68,27 @@ namespace crypto {
    * TODO: allow specifiying random value (for wallet recovery)
    * 
    */
-  void crypto_ops::generate_keys(public_key &pub, secret_key &sec) {
+  secret_key crypto_ops::generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover) {
     lock_guard<mutex> lock(random_lock);
     ge_p3 point;
-    random_scalar(sec);
+
+    secret_key rng;
+
+    if (recover)
+    {
+      rng = recovery_key;
+    }
+    else
+    {
+      random_scalar(rng);
+    }
+    sec = rng;
+    sc_reduce32(&sec);  // reduce in case second round of keys (sendkeys)
+
     ge_scalarmult_base(&point, &sec);
     ge_p3_tobytes(&pub, &point);
+
+    return rng;
   }
 
   bool crypto_ops::check_key(const public_key &key) {
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 61641fbcf..024713df1 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -62,8 +62,8 @@ namespace crypto {
     void operator=(const crypto_ops &);
     ~crypto_ops();
 
-    static void generate_keys(public_key &, secret_key &);
-    friend void generate_keys(public_key &, secret_key &);
+    static secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false);
+    friend secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover);
     static bool check_key(const public_key &);
     friend bool check_key(const public_key &);
     static bool secret_key_to_public_key(const secret_key &, public_key &);
@@ -102,8 +102,8 @@ namespace crypto {
 
   /* Generate a new key pair
    */
-  inline void generate_keys(public_key &pub, secret_key &sec) {
-    crypto_ops::generate_keys(pub, sec);
+  inline secret_key generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key = secret_key(), bool recover = false) {
+    return crypto_ops::generate_keys(pub, sec, recovery_key, recover);
   }
 
   /* Check a public key. Returns true if it is valid, false otherwise.
diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index b4580e01f..048aa403f 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -36,7 +36,7 @@ namespace crypto
       // error on non-compliant word list
       if (wlist.size() != 12 && wlist.size() != 24) return false;
 
-      for (int i=0; i < wlist.size() / 3; i++)
+      for (unsigned int i=0; i < wlist.size() / 3; i++)
       {
         uint32_t val;
         uint32_t w1, w2, w3;
@@ -55,12 +55,12 @@ namespace crypto
 
         val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
 
-        memcpy(dst.data + i * 4, val, 4);  // copy 4 bytes to position
+        memcpy(&dst.data + i * 4, &val, 4);  // copy 4 bytes to position
       }
 
       if (wlist.size() == 12)
       {
-        memcpy(dst.data, dst.data + 16, 16);  // if electrum 12-word seed, duplicate
+        memcpy(&dst.data, &dst.data + 16, 16);  // if electrum 12-word seed, duplicate
       }
 
       return true;
@@ -78,13 +78,13 @@ namespace crypto
       if (sizeof(src.data) % 4 != 0) return false;
 
       // 8 bytes -> 3 words.  8 digits base 16 -> 3 digits base 1626
-      for (int i=0; i < sizeof(src.data)/4; i++, words += ' ')
+      for (unsigned int i=0; i < sizeof(src.data)/4; i++, words += ' ')
       {
         uint32_t w1, w2, w3;
         
         uint32_t val;
 
-        memcpy(val, src, 4);
+        memcpy(&val, &src.data, 4);
 
         w1 = val % n;
         w2 = ((val / n) + w1) % n;
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index 9a96de2f0..bd47c8ba4 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -10,6 +10,7 @@
 #include "account.h"
 #include "warnings.h"
 #include "crypto/crypto.h"
+#include "crypto/blake256.h"
 #include "cryptonote_core/cryptonote_basic_impl.h"
 #include "cryptonote_core/cryptonote_format_utils.h"
 using namespace std;
@@ -29,11 +30,17 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_keys = account_keys();
   }
   //-----------------------------------------------------------------
-  void account_base::generate(const crypto::secret_key& recovery_key, bool recover)
+  crypto::secret_key account_base::generate(const crypto::secret_key& recovery_key, bool recover)
   {
-    generate_keys(m_keys.m_account_address.m_spend_public_key, m_keys.m_spend_secret_key);
-    generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key);
+    crypto::secret_key first = generate_keys(m_keys.m_account_address.m_spend_public_key, m_keys.m_spend_secret_key, recovery_key, recover);
+
+    // 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;
+    blake256_hash((uint8_t *)&second, (uint8_t *)&first, sizeof(crypto::secret_key));
+
+    generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key, second, true);
     m_creation_timestamp = time(NULL);
+    return first;
   }
   //-----------------------------------------------------------------
   const account_keys& account_base::get_keys() const
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h
index 745da0897..f07d4dd79 100644
--- a/src/cryptonote_core/account.h
+++ b/src/cryptonote_core/account.h
@@ -31,7 +31,7 @@ namespace cryptonote
   {
   public:
     account_base();
-    void generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
+    crypto::secret_key generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
     const account_keys& get_keys() const;
     std::string get_public_address_str();
 
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 3cea02bf1..261c150e9 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -360,9 +360,11 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
 
   m_wallet.reset(new tools::wallet2());
   m_wallet->callback(this);
+
+  crypto::secret_key recovery_val;
   try
   {
-    m_wallet->generate(wallet_file, password, recovery_key, recover);
+    recovery_val = m_wallet->generate(wallet_file, password, recovery_key, recover);
     message_writer(epee::log_space::console_color_white, true) << "Generated new wallet: " << m_wallet->get_account().get_public_address_str() << std::endl << "view key: " << string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_view_secret_key);
   }
   catch (const std::exception& e)
@@ -373,6 +375,10 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
 
   m_wallet->init(m_daemon_address);
 
+  // convert rng value to electrum-style word list
+  std::string electrum_words;
+  crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words);
+
   success_msg_writer() <<
     "**********************************************************************\n" <<
     "Your wallet has been generated.\n" <<
@@ -381,6 +387,8 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
     "Always use \"exit\" command when closing simplewallet to save\n" <<
     "current session's state. Otherwise, you will possibly need to synchronize \n" <<
     "your wallet again. Your wallet key is NOT under risk anyway.\n" <<
+    "\nYour wallet can be recovered using the following electrum-style word list:\n" <<
+    electrum_words << "\n" <<
     "**********************************************************************";
   return true;
 }
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index b0c341615..59e1b0fa4 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -436,7 +436,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
   THROW_WALLET_EXCEPTION_IF(!r, error::invalid_password);
 }
 //----------------------------------------------------------------------------------------------------
-void wallet2::generate(const std::string& wallet_, const std::string& password, const crypto::secret_key& recovery_param, bool recover)
+crypto::secret_key wallet2::generate(const std::string& wallet_, const std::string& password, const crypto::secret_key& recovery_param, bool recover)
 {
   clear();
   prepare_file_names(wallet_);
@@ -445,7 +445,7 @@ void wallet2::generate(const std::string& wallet_, const std::string& password,
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_wallet_file, ignored_ec), error::file_exists, m_wallet_file);
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_keys_file,   ignored_ec), error::file_exists, m_keys_file);
 
-  m_account.generate(recovery_param, recover);
+  crypto::secret_key retval = m_account.generate(recovery_param, recover);
 
   m_account_public_address = m_account.get_keys().m_account_address;
 
@@ -456,6 +456,7 @@ void wallet2::generate(const std::string& wallet_, const std::string& password,
   if(!r) LOG_PRINT_RED_L0("String with address text not saved");
 
   store();
+  return retval;
 }
 //----------------------------------------------------------------------------------------------------
 void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists)
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 85ed344c3..f54045b3a 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -97,7 +97,7 @@ namespace tools
       END_SERIALIZE()
     };
 
-    void generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false);
+    crypto::secret_key generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false);
     void load(const std::string& wallet, const std::string& password);
     void store();
     cryptonote::account_base& get_account(){return m_account;}

From 72c3f36ca44a4be4d237095fd14e1ff862af5864 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 15:45:21 -0400
Subject: [PATCH 64/76] fixed some pointer- and loop-based derps

---
 src/crypto/electrum-words.cpp     | 2 +-
 src/cryptonote_core/account.cpp   | 3 +++
 src/simplewallet/simplewallet.cpp | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index 048aa403f..5489d5034 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -84,7 +84,7 @@ namespace crypto
         
         uint32_t val;
 
-        memcpy(&val, &src.data, 4);
+        memcpy(&val, (src.data) + (i * 4), 4);
 
         w1 = val % n;
         w2 = ((val / n) + w1) % n;
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index bd47c8ba4..f4de36738 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -10,7 +10,10 @@
 #include "account.h"
 #include "warnings.h"
 #include "crypto/crypto.h"
+extern "C"
+{
 #include "crypto/blake256.h"
+}
 #include "cryptonote_core/cryptonote_basic_impl.h"
 #include "cryptonote_core/cryptonote_format_utils.h"
 using namespace std;
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 261c150e9..ef96d7b96 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -953,6 +953,8 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_params, arg_daemon_port);
   command_line::add_arg(desc_params, arg_command);
   command_line::add_arg(desc_params, arg_log_level);
+  command_line::add_arg(desc_params, arg_recover );
+  command_line::add_arg(desc_params, arg_electrum_seed );
   tools::wallet_rpc_server::init_options(desc_params);
 
   po::positional_options_description positional_options;

From 8bc032ed092e65e944e9032bc6042ae118346fa9 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 16:31:04 -0400
Subject: [PATCH 65/76] more pointer-based derp

---
 src/crypto/electrum-words.cpp     | 13 +++++++++++--
 src/crypto/electrum-words.h       |  3 ++-
 src/simplewallet/simplewallet.cpp | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index 5489d5034..a11d287b2 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <string>
+#include <cassert>
 #include <map>
 #include <cstdint>
 #include <vector>
@@ -55,14 +56,22 @@ namespace crypto
 
         val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
 
-        memcpy(&dst.data + i * 4, &val, 4);  // copy 4 bytes to position
+        memcpy(dst.data + i * 4, &val, 4);  // copy 4 bytes to position
       }
 
+      std::string wlist_copy = words;
       if (wlist.size() == 12)
       {
-        memcpy(&dst.data, &dst.data + 16, 16);  // if electrum 12-word seed, duplicate
+        memcpy(dst.data, dst.data + 16, 16);  // if electrum 12-word seed, duplicate
+        wlist_copy += ' ';
+        wlist_copy += words;
       }
 
+      std::string back_to_words;
+      bytes_to_words(dst, back_to_words);
+
+      assert(wlist_copy == back_to_words);  // sanity check
+
       return true;
     }
 
diff --git a/src/crypto/electrum-words.h b/src/crypto/electrum-words.h
index f5f8d1d95..a533299bd 100644
--- a/src/crypto/electrum-words.h
+++ b/src/crypto/electrum-words.h
@@ -5,6 +5,7 @@
  */
 
 #include <string>
+#include <cstdint>
 #include <map>
 #include "crypto/crypto.h"  // for declaration of crypto::secret_key
 
@@ -18,7 +19,7 @@ namespace crypto
     bool words_to_bytes(const std::string& words, crypto::secret_key& dst);
     bool bytes_to_words(const crypto::secret_key& src, std::string& words);
 
-    const std::map<std::string, int> wordsMap = {
+    const std::map<std::string,uint32_t> wordsMap = {
       {"like", 0},
       {"just", 1},
       {"love", 2},
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index ef96d7b96..55099199d 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -255,10 +255,15 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     return false;
   }
 
-  size_t c = 0;
-  if(!m_generate_new.empty()) ++c;
-  if(!m_wallet_file.empty()) ++c;
-  if (1 != c)
+  if(m_recover)
+  {
+    if (m_generate_new.empty())
+    {
+      fail_msg_writer() << "You must specify a wallet file name to recover to using either --generate-new-wallet=\"name\"";
+      return false;
+    }
+  }
+  else if(!m_generate_new.empty() ^ !m_wallet_file.empty())
   {
     if(!ask_wallet_create_if_needed())
       return false;
@@ -286,7 +291,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     }
   }
 
-  if (!m_generate_new.empty())
+  if (!m_generate_new.empty() || m_recover)
   {
     // check for recover flag.  if present, require electrum word list (only recovery option for now).
     if (m_recover)

From 537b911af1db1258a6db226de3b7c55cb5779e21 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 6 Jun 2014 17:18:57 -0400
Subject: [PATCH 66/76] stupid signed arithmetic.

---
 src/crypto/electrum-words.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/crypto/electrum-words.cpp b/src/crypto/electrum-words.cpp
index a11d287b2..96a392d04 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/crypto/electrum-words.cpp
@@ -54,7 +54,9 @@ namespace crypto
         w2 = wordsMap.at(wlist[i*3 + 1]);
         w3 = wordsMap.at(wlist[i*3 + 2]);
 
-        val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
+        val = w1 + n * (((n - w1) + w2) % n) + n * n * (((n - w2) + w3) % n);
+
+        if (!(val % n == w1)) return false;
 
         memcpy(dst.data + i * 4, &val, 4);  // copy 4 bytes to position
       }
@@ -67,11 +69,6 @@ namespace crypto
         wlist_copy += words;
       }
 
-      std::string back_to_words;
-      bytes_to_words(dst, back_to_words);
-
-      assert(wlist_copy == back_to_words);  // sanity check
-
       return true;
     }
 

From ce352392d53fd2679ba2671349543528207a923e Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Sun, 8 Jun 2014 18:12:38 -0400
Subject: [PATCH 67/76] DRY cin input_line (and test replacement of non-DRY
 usage)

---
 src/common/command_line.cpp       | 12 ++++++++++++
 src/common/command_line.h         |  3 +++
 src/simplewallet/simplewallet.cpp | 10 ++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp
index 0b90345d9..d507f36a7 100644
--- a/src/common/command_line.cpp
+++ b/src/common/command_line.cpp
@@ -3,9 +3,21 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "command_line.h"
+#include "string_tools.h"
 
 namespace command_line
 {
+  std::string input_line(const std::string& prompt)
+  {
+    std::cout << prompt;
+
+    std::string buf;
+    std::getline(std::cin, buf);
+
+    return epee::string_tools::trim(buf);
+
+  }
+
   const arg_descriptor<bool> arg_help = {"help", "Produce help message"};
   const arg_descriptor<bool> arg_version = {"version", "Output version information"};
   const arg_descriptor<std::string> arg_data_dir = {"data-dir", "Specify data directory"};
diff --git a/src/common/command_line.h b/src/common/command_line.h
index 860653772..a6f78569c 100644
--- a/src/common/command_line.h
+++ b/src/common/command_line.h
@@ -14,6 +14,9 @@
 
 namespace command_line
 {
+
+  std::string input_line(const std::string& prompt);
+
   template<typename T, bool required = false>
   struct arg_descriptor;
 
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 55099199d..24ecb4504 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -212,12 +212,10 @@ bool simple_wallet::ask_wallet_create_if_needed()
 {
   std::string wallet_path;
 
-  std::cout << "Specify wallet file name (e.g., wallet.bin). If the wallet doesn't exist, it will be created.\n";
-  std::cout << "Wallet file name: ";
-
-  std::getline(std::cin, wallet_path);
-
-  wallet_path = string_tools::trim(wallet_path);
+  wallet_path = command_line::input_line(
+      "Specify wallet file name (e.g., wallet.bin). If the wallet doesn't exist, it will be created.\n"
+      "Wallet file name: "
+  );
 
   bool keys_file_exists;
   bool wallet_file_exists;

From b6a475119731d88aec017fa1d69128c20da6b303 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Sun, 8 Jun 2014 18:59:02 -0400
Subject: [PATCH 68/76] reworked command line args for simplewallet.

--generate-new-wallet and --wallet-file are now properly mutually-exclusive.
---
 src/simplewallet/simplewallet.cpp | 47 +++++++++++++++++++------------
 src/simplewallet/simplewallet.h   |  2 +-
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 24ecb4504..4131638ac 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -41,7 +41,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_daemon_host = {"daemon-host", "Use daemon instance at host <arg> instead of localhost", ""};
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
   const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", "Specify electrum seed for wallet recovery/creation", ""};
-  const command_line::arg_descriptor<bool> arg_recover = {"recover", "Recover wallet using mnemonic generator (e.g. electrum word list)", false};
+  const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", "Recover wallet using electrum-style mnemonic", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -253,18 +253,23 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     return false;
   }
 
-  if(m_recover)
+  if(m_restore_deterministic_wallet)
   {
     if (m_generate_new.empty())
     {
-      fail_msg_writer() << "You must specify a wallet file name to recover to using either --generate-new-wallet=\"name\"";
+      fail_msg_writer() << "You must specify a wallet file name to recover to using --wallet-file=\"name\"";
       return false;
     }
   }
-  else if(!m_generate_new.empty() ^ !m_wallet_file.empty())
+
+  if(!m_generate_new.empty() && !m_wallet_file.empty())
   {
-    if(!ask_wallet_create_if_needed())
-      return false;
+    fail_msg_writer() << "Specifying both --generate-new-wallet=\"wallet_name\" and --wallet-file=\"wallet_name\" doesn't make sense!";
+    return false;
+  }
+  else if (m_generate_new.empty() && m_wallet_file.empty())
+  {
+    if(!ask_wallet_create_if_needed()) return false;
   }
 
   if (m_daemon_host.empty())
@@ -289,26 +294,32 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     }
   }
 
-  if (!m_generate_new.empty() || m_recover)
+  if (!m_generate_new.empty() || m_restore_deterministic_wallet)
   {
+    if (m_wallet_file.empty()) m_wallet_file = m_generate_new;  // alias for simplicity later
+
     // check for recover flag.  if present, require electrum word list (only recovery option for now).
-    if (m_recover)
+    if (m_restore_deterministic_wallet)
     {
       if (m_electrum_seed.empty())
       {
-        fail_msg_writer() << "specify a recovery parameter (e.g. electrum word list) with the recover option";
-        return false;
+        m_electrum_seed = command_line::input_line("Specify electrum seed: ");
+        if (m_electrum_seed.empty())
+        {
+          fail_msg_writer() << "specify a recovery parameter (e.g. electrum word list) with the --electrum-seed=\"words list here\"";
+          return false;
+        }
       }
       else  // verify recovery param (electrum word list) and convert to byte representation
       {
-        CHECK_AND_ASSERT_MES(
-            crypto::ElectrumWords::words_to_bytes(m_electrum_seed, m_recovery_key),
-            false,
-            "electrum-style word list failed verification"
-        );
+        if (!crypto::ElectrumWords::words_to_bytes(m_electrum_seed, m_recovery_key))
+        {
+            fail_msg_writer() << "electrum-style word list failed verification";
+            return false;
+        }
       }
     }
-    bool r = new_wallet(m_generate_new, pwd_container.password(), m_recovery_key, m_recover);
+    bool r = new_wallet(m_wallet_file, pwd_container.password(), m_recovery_key, m_restore_deterministic_wallet);
     CHECK_AND_ASSERT_MES(r, false, "account creation failed");
   }
   else
@@ -336,7 +347,7 @@ void simple_wallet::handle_command_line(const boost::program_options::variables_
   m_daemon_host    = command_line::get_arg(vm, arg_daemon_host);
   m_daemon_port    = command_line::get_arg(vm, arg_daemon_port);
   m_electrum_seed  = command_line::get_arg(vm, arg_electrum_seed);
-  m_recover        = command_line::get_arg(vm, arg_recover);
+  m_restore_deterministic_wallet        = command_line::get_arg(vm, arg_restore_deterministic_wallet);
 }
 //----------------------------------------------------------------------------------------------------
 bool simple_wallet::try_connect_to_daemon()
@@ -956,7 +967,7 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_params, arg_daemon_port);
   command_line::add_arg(desc_params, arg_command);
   command_line::add_arg(desc_params, arg_log_level);
-  command_line::add_arg(desc_params, arg_recover );
+  command_line::add_arg(desc_params, arg_restore_deterministic_wallet );
   command_line::add_arg(desc_params, arg_electrum_seed );
   tools::wallet_rpc_server::init_options(desc_params);
 
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index d1f9fe98b..37ccfe895 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -131,7 +131,7 @@ namespace cryptonote
     std::string m_electrum_seed;  // electrum-style seed parameter
 
     crypto::secret_key m_recovery_key;  // recovery key (used as random for wallet gen)
-    bool m_recover;  // recover flag
+    bool m_restore_deterministic_wallet;  // recover flag
 
     std::string m_daemon_address;
     std::string m_daemon_host;

From da37b6f15b6eb1f7b4ac9802a3350413d303a5c9 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Sun, 8 Jun 2014 20:04:32 -0400
Subject: [PATCH 69/76] allow two-random-numbers wallet generation (but not as
 default)

---
 src/cryptonote_core/account.cpp   |  4 +-
 src/cryptonote_core/account.h     |  2 +-
 src/simplewallet/simplewallet.cpp | 77 ++++++++++++++++++-------------
 src/simplewallet/simplewallet.h   |  5 +-
 src/wallet/wallet2.cpp            |  4 +-
 src/wallet/wallet2.h              |  2 +-
 6 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index f4de36738..7da1c6745 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -33,7 +33,7 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_keys = account_keys();
   }
   //-----------------------------------------------------------------
-  crypto::secret_key account_base::generate(const crypto::secret_key& recovery_key, bool recover)
+  crypto::secret_key account_base::generate(const crypto::secret_key& recovery_key, bool recover, bool two_random)
   {
     crypto::secret_key first = generate_keys(m_keys.m_account_address.m_spend_public_key, m_keys.m_spend_secret_key, recovery_key, recover);
 
@@ -41,7 +41,7 @@ DISABLE_VS_WARNINGS(4244 4345)
     crypto::secret_key second;
     blake256_hash((uint8_t *)&second, (uint8_t *)&first, sizeof(crypto::secret_key));
 
-    generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key, second, true);
+    generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key, second, two_random ? false : true);
     m_creation_timestamp = time(NULL);
     return first;
   }
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h
index f07d4dd79..cb77d7c4e 100644
--- a/src/cryptonote_core/account.h
+++ b/src/cryptonote_core/account.h
@@ -31,7 +31,7 @@ namespace cryptonote
   {
   public:
     account_base();
-    crypto::secret_key generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
+    crypto::secret_key generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false, bool two_random = false);
     const account_keys& get_keys() const;
     std::string get_public_address_str();
 
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 4131638ac..95d163f2e 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -42,6 +42,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
   const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", "Specify electrum seed for wallet recovery/creation", ""};
   const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", "Recover wallet using electrum-style mnemonic", false};
+  const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "requires --generate-new-wallet, uses old generation method", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -221,6 +222,16 @@ bool simple_wallet::ask_wallet_create_if_needed()
   bool wallet_file_exists;
   tools::wallet2::wallet_exists(wallet_path, keys_file_exists, wallet_file_exists);
 
+  // add logic to error out if new wallet requested but named wallet file exists
+  if (keys_file_exists || wallet_file_exists)
+  {
+    if (!m_generate_new.empty() || m_restore_deterministic_wallet)
+    {
+      fail_msg_writer() << "Attempting to generate or restore wallet, but specified file(s) exist.  Exiting to not risk overwriting.";
+      return false;
+    }
+  }
+
   bool r;
   if(keys_file_exists)
   {
@@ -253,15 +264,6 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     return false;
   }
 
-  if(m_restore_deterministic_wallet)
-  {
-    if (m_generate_new.empty())
-    {
-      fail_msg_writer() << "You must specify a wallet file name to recover to using --wallet-file=\"name\"";
-      return false;
-    }
-  }
-
   if(!m_generate_new.empty() && !m_wallet_file.empty())
   {
     fail_msg_writer() << "Specifying both --generate-new-wallet=\"wallet_name\" and --wallet-file=\"wallet_name\" doesn't make sense!";
@@ -301,25 +303,29 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     // check for recover flag.  if present, require electrum word list (only recovery option for now).
     if (m_restore_deterministic_wallet)
     {
+      if (m_non_deterministic)
+      {
+        fail_msg_writer() << "Cannot specify both --restore-deterministic-wallet and --non-deterministic";
+        return false;
+      }
+
       if (m_electrum_seed.empty())
       {
         m_electrum_seed = command_line::input_line("Specify electrum seed: ");
         if (m_electrum_seed.empty())
         {
-          fail_msg_writer() << "specify a recovery parameter (e.g. electrum word list) with the --electrum-seed=\"words list here\"";
+          fail_msg_writer() << "specify a recovery parameter with the --electrum-seed=\"words list here\"";
           return false;
         }
       }
-      else  // verify recovery param (electrum word list) and convert to byte representation
+
+      if (!crypto::ElectrumWords::words_to_bytes(m_electrum_seed, m_recovery_key))
       {
-        if (!crypto::ElectrumWords::words_to_bytes(m_electrum_seed, m_recovery_key))
-        {
-            fail_msg_writer() << "electrum-style word list failed verification";
-            return false;
-        }
+          fail_msg_writer() << "electrum-style word list failed verification";
+          return false;
       }
     }
-    bool r = new_wallet(m_wallet_file, pwd_container.password(), m_recovery_key, m_restore_deterministic_wallet);
+    bool r = new_wallet(m_wallet_file, pwd_container.password(), m_recovery_key, m_restore_deterministic_wallet, m_non_deterministic);
     CHECK_AND_ASSERT_MES(r, false, "account creation failed");
   }
   else
@@ -341,13 +347,14 @@ bool simple_wallet::deinit()
 //----------------------------------------------------------------------------------------------------
 void simple_wallet::handle_command_line(const boost::program_options::variables_map& vm)
 {
-  m_wallet_file    = command_line::get_arg(vm, arg_wallet_file);
-  m_generate_new   = command_line::get_arg(vm, arg_generate_new_wallet);
-  m_daemon_address = command_line::get_arg(vm, arg_daemon_address);
-  m_daemon_host    = command_line::get_arg(vm, arg_daemon_host);
-  m_daemon_port    = command_line::get_arg(vm, arg_daemon_port);
-  m_electrum_seed  = command_line::get_arg(vm, arg_electrum_seed);
-  m_restore_deterministic_wallet        = command_line::get_arg(vm, arg_restore_deterministic_wallet);
+  m_wallet_file                   = command_line::get_arg(vm, arg_wallet_file);
+  m_generate_new                  = command_line::get_arg(vm, arg_generate_new_wallet);
+  m_daemon_address                = command_line::get_arg(vm, arg_daemon_address);
+  m_daemon_host                   = command_line::get_arg(vm, arg_daemon_host);
+  m_daemon_port                   = command_line::get_arg(vm, arg_daemon_port);
+  m_electrum_seed                 = command_line::get_arg(vm, arg_electrum_seed);
+  m_restore_deterministic_wallet  = command_line::get_arg(vm, arg_restore_deterministic_wallet);
+  m_non_deterministic             = command_line::get_arg(vm, arg_non_deterministic);
 }
 //----------------------------------------------------------------------------------------------------
 bool simple_wallet::try_connect_to_daemon()
@@ -362,13 +369,8 @@ bool simple_wallet::try_connect_to_daemon()
   return true;
 }
 
-bool simple_wallet::parse_electrum()
-{
-  return false;
-}
-
 //----------------------------------------------------------------------------------------------------
-bool simple_wallet::new_wallet(const string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key, bool recover)
+bool simple_wallet::new_wallet(const string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key, bool recover, bool two_random)
 {
   m_wallet_file = wallet_file;
 
@@ -378,7 +380,7 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
   crypto::secret_key recovery_val;
   try
   {
-    recovery_val = m_wallet->generate(wallet_file, password, recovery_key, recover);
+    recovery_val = m_wallet->generate(wallet_file, password, recovery_key, recover, two_random);
     message_writer(epee::log_space::console_color_white, true) << "Generated new wallet: " << m_wallet->get_account().get_public_address_str() << std::endl << "view key: " << string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_view_secret_key);
   }
   catch (const std::exception& e)
@@ -393,6 +395,15 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
   std::string electrum_words;
   crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words);
 
+  std::string print_electrum = "";
+
+  if (!two_random)
+  {
+    print_electrum = "\nYour wallet can be recovered using the following electrum-style word list:\n";
+    print_electrum += electrum_words;
+    print_electrum += "\n";
+  }
+
   success_msg_writer() <<
     "**********************************************************************\n" <<
     "Your wallet has been generated.\n" <<
@@ -401,8 +412,7 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
     "Always use \"exit\" command when closing simplewallet to save\n" <<
     "current session's state. Otherwise, you will possibly need to synchronize \n" <<
     "your wallet again. Your wallet key is NOT under risk anyway.\n" <<
-    "\nYour wallet can be recovered using the following electrum-style word list:\n" <<
-    electrum_words << "\n" <<
+    print_electrum << 
     "**********************************************************************";
   return true;
 }
@@ -968,6 +978,7 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_params, arg_command);
   command_line::add_arg(desc_params, arg_log_level);
   command_line::add_arg(desc_params, arg_restore_deterministic_wallet );
+  command_line::add_arg(desc_params, arg_non_deterministic );
   command_line::add_arg(desc_params, arg_electrum_seed );
   tools::wallet_rpc_server::init_options(desc_params);
 
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index 37ccfe895..006cdd08e 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -40,9 +40,7 @@ namespace cryptonote
 
     bool run_console_handler();
 
-    bool parse_electrum();
-
-    bool new_wallet(const std::string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false);
+    bool new_wallet(const std::string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false, bool two_random = false);
     bool open_wallet(const std::string &wallet_file, const std::string& password);
     bool close_wallet();
 
@@ -132,6 +130,7 @@ namespace cryptonote
 
     crypto::secret_key m_recovery_key;  // recovery key (used as random for wallet gen)
     bool m_restore_deterministic_wallet;  // recover flag
+    bool m_non_deterministic;  // old 2-random generation
 
     std::string m_daemon_address;
     std::string m_daemon_host;
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 59e1b0fa4..a63eb4be7 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -436,7 +436,7 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa
   THROW_WALLET_EXCEPTION_IF(!r, error::invalid_password);
 }
 //----------------------------------------------------------------------------------------------------
-crypto::secret_key wallet2::generate(const std::string& wallet_, const std::string& password, const crypto::secret_key& recovery_param, bool recover)
+crypto::secret_key wallet2::generate(const std::string& wallet_, const std::string& password, const crypto::secret_key& recovery_param, bool recover, bool two_random)
 {
   clear();
   prepare_file_names(wallet_);
@@ -445,7 +445,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_wallet_file, ignored_ec), error::file_exists, m_wallet_file);
   THROW_WALLET_EXCEPTION_IF(boost::filesystem::exists(m_keys_file,   ignored_ec), error::file_exists, m_keys_file);
 
-  crypto::secret_key retval = m_account.generate(recovery_param, recover);
+  crypto::secret_key retval = m_account.generate(recovery_param, recover, two_random);
 
   m_account_public_address = m_account.get_keys().m_account_address;
 
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index f54045b3a..534a0517b 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -97,7 +97,7 @@ namespace tools
       END_SERIALIZE()
     };
 
-    crypto::secret_key generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false);
+    crypto::secret_key generate(const std::string& wallet, const std::string& password, const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false, bool two_random = false);
     void load(const std::string& wallet, const std::string& password);
     void store();
     cryptonote::account_base& get_account(){return m_account;}

From 305def9493d9ba20246068b7676e50f384b6ae39 Mon Sep 17 00:00:00 2001
From: tom <tewinget@gmail.com>
Date: Mon, 9 Jun 2014 18:28:08 -0400
Subject: [PATCH 70/76] changed some print messages

---
 src/simplewallet/simplewallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 95d163f2e..e2b0cab13 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -42,7 +42,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
   const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", "Specify electrum seed for wallet recovery/creation", ""};
   const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", "Recover wallet using electrum-style mnemonic", false};
-  const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "requires --generate-new-wallet, uses old generation method", false};
+  const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "created non-deterministic view and spend keys", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -399,7 +399,7 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
 
   if (!two_random)
   {
-    print_electrum = "\nYour wallet can be recovered using the following electrum-style word list:\n";
+    print_electrum = "\nPLEASE NOTE: the following 24 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control. You will not be able to view these words again, so it is imperative to make note of them now.\n";
     print_electrum += electrum_words;
     print_electrum += "\n";
   }

From 0c85229924f7e0d85cb16fedf1ffbf23f870770e Mon Sep 17 00:00:00 2001
From: tom <tewinget@gmail.com>
Date: Mon, 9 Jun 2014 20:04:56 -0400
Subject: [PATCH 71/76] changed text a bit more

---
 src/simplewallet/simplewallet.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index e2b0cab13..21f3a8688 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -42,7 +42,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_password = {"password", "Wallet password", "", true};
   const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", "Specify electrum seed for wallet recovery/creation", ""};
   const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", "Recover wallet using electrum-style mnemonic", false};
-  const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "created non-deterministic view and spend keys", false};
+  const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", "creates non-deterministic view and spend keys", false};
   const command_line::arg_descriptor<int> arg_daemon_port = {"daemon-port", "Use daemon instance at port <arg> instead of 8081", 0};
   const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
 
@@ -397,12 +397,6 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
 
   std::string print_electrum = "";
 
-  if (!two_random)
-  {
-    print_electrum = "\nPLEASE NOTE: the following 24 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control. You will not be able to view these words again, so it is imperative to make note of them now.\n";
-    print_electrum += electrum_words;
-    print_electrum += "\n";
-  }
 
   success_msg_writer() <<
     "**********************************************************************\n" <<
@@ -411,9 +405,16 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
     "Use \"help\" command to see the list of available commands.\n" <<
     "Always use \"exit\" command when closing simplewallet to save\n" <<
     "current session's state. Otherwise, you will possibly need to synchronize \n" <<
-    "your wallet again. Your wallet key is NOT under risk anyway.\n" <<
-    print_electrum << 
-    "**********************************************************************";
+    "your wallet again. Your wallet key is NOT under risk anyway.\n"
+  ;
+
+  if (!two_random)
+  {
+    success_msg_writer(true) << "\nPLEASE NOTE: the following 24 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control. You will not be able to view these words again, so it is imperative to make note of them now.\n";
+    success_msg_writer() << electrum_words;
+  }
+  success_msg_writer() << "**********************************************************************";
+
   return true;
 }
 //----------------------------------------------------------------------------------------------------

From 205494f0d1bee85444d087f45d58558329f8c4ae Mon Sep 17 00:00:00 2001
From: tom <tewinget@gmail.com>
Date: Mon, 9 Jun 2014 20:36:51 -0400
Subject: [PATCH 72/76] change hash for keygen from blake to keccak

---
 src/cryptonote_core/account.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index 7da1c6745..3bedd7404 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -12,7 +12,7 @@
 #include "crypto/crypto.h"
 extern "C"
 {
-#include "crypto/blake256.h"
+#include "crypto/keccak.h"
 }
 #include "cryptonote_core/cryptonote_basic_impl.h"
 #include "cryptonote_core/cryptonote_format_utils.h"
@@ -39,7 +39,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;
-    blake256_hash((uint8_t *)&second, (uint8_t *)&first, sizeof(crypto::secret_key));
+    keccak((uint8_t *)&first, 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);
     m_creation_timestamp = time(NULL);

From c49cb0461091495c023fb9aa56ca8298a556f0a5 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Thu, 12 Jun 2014 19:34:24 -0400
Subject: [PATCH 73/76] changed wallet mnemonic to use cout so it doesn't print
 to log

---
 src/simplewallet/simplewallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 21f3a8688..6af0de9f9 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <thread>
+#include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>
@@ -411,7 +412,7 @@ bool simple_wallet::new_wallet(const string &wallet_file, const std::string& pas
   if (!two_random)
   {
     success_msg_writer(true) << "\nPLEASE NOTE: the following 24 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control. You will not be able to view these words again, so it is imperative to make note of them now.\n";
-    success_msg_writer() << electrum_words;
+    std::cout << electrum_words << std::endl;
   }
   success_msg_writer() << "**********************************************************************";
 

From a521046ff2eb73257fb8a7211e321047da5e7640 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Fri, 13 Jun 2014 00:01:26 -0400
Subject: [PATCH 74/76] Fixed console handler not properly exiting on SIGINT
 and such

---
 contrib/epee/include/console_handler.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 356ee7f9a..ab3cf67c6 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -233,6 +233,7 @@ namespace epee
 
     void stop()
     {
+      m_running = false;
       m_stdin_reader.stop();
     }
 
@@ -244,6 +245,10 @@ namespace epee
       bool continue_handle = true;
       while(continue_handle)
       {
+        if (!m_running)
+        {
+          break;
+        }
         if (!prompt.empty())
         {
           epee::log_space::set_console_color(epee::log_space::console_color_yellow, true);
@@ -257,7 +262,7 @@ namespace epee
         std::string command;
         if(!m_stdin_reader.get_line(command))
         {
-          LOG_PRINT("Failed to read line. Ignoring and continuing to run, exiting daemon may require a SIGTERM kill.", LOG_LEVEL_0);
+          LOG_PRINT("Failed to read line.", LOG_LEVEL_0);
         }
         string_tools::trim(command);
 
@@ -285,6 +290,7 @@ namespace epee
 
   private:
     async_stdin_reader m_stdin_reader;
+    bool m_running = true;
   };
 
 

From 0ddbd20129f297f97befd48f9efa89e1e6406d24 Mon Sep 17 00:00:00 2001
From: monero-project <sempre.amaro@gmail.com>
Date: Sat, 14 Jun 2014 13:17:27 -0400
Subject: [PATCH 75/76] added checkpoint @ 80000

---
 src/cryptonote_core/checkpoints_create.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h
index 3ecbbf0b6..a92fefd3f 100644
--- a/src/cryptonote_core/checkpoints_create.h
+++ b/src/cryptonote_core/checkpoints_create.h
@@ -15,6 +15,7 @@ namespace cryptonote {
     ADD_CHECKPOINT(22231, "7cb10e29d67e1c069e6e11b17d30b809724255fee2f6868dc14cfc6ed44dfb25");
     ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6");
     ADD_CHECKPOINT(50000, "0fe8758ab06a8b9cb35b7328fd4f757af530a5d37759f9d3e421023231f7b31c");
+    ADD_CHECKPOINT(80000, "a62dcd7b536f22e003ebae8726e9e7276f63d594e264b6f0cd7aab27b66e75e3");
     return true;
   }
 }

From 3bc16dc0e6bd38fbec51a054e640bacdb17a9a82 Mon Sep 17 00:00:00 2001
From: fluffypony <ric@spagni.net>
Date: Sun, 15 Jun 2014 09:48:13 +0200
Subject: [PATCH 76/76] proper tx_pool handling from CryptoZoidberg / BBR

---
 src/cryptonote_config.h                 |  2 ++
 src/cryptonote_core/cryptonote_core.cpp |  1 +
 src/cryptonote_core/tx_pool.cpp         | 26 +++++++++++++++++++++++++
 src/cryptonote_core/tx_pool.h           |  8 +++++++-
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index a992a9db0..295f59e51 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -51,6 +51,8 @@
 #define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT              200    //by default, blocks count in blocks downloading
 #define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT             3      //value of hop, after which we use only announce of new block
 
+#define CRYPTONOTE_MEMPOOL_TX_LIVETIME                    86400 //seconds, one day
+#define CRYPTONOTE_MEMPOOL_TX_FROM_ALT_BLOCK_LIVETIME     604800 //seconds, one week
 
 #define P2P_DEFAULT_PORT                                18080
 #define RPC_DEFAULT_PORT                                18081
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 50cbfd267..2609fc13e 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -526,6 +526,7 @@ namespace cryptonote
 
     m_store_blockchain_interval.do_call(boost::bind(&blockchain_storage::store_blockchain, &m_blockchain_storage));
     m_miner.on_idle();
+    m_mempool.on_idle();
     return true;
   }
   //-----------------------------------------------------------------------------------------------
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 4c4c6aea1..ce1bc1ad2 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -83,6 +83,7 @@ namespace cryptonote
         txd_p.first->second.max_used_block_id = null_hash;
         txd_p.first->second.max_used_block_height = 0;
         txd_p.first->second.kept_by_block = kept_by_block;
+        txd_p.first->second.receive_time = time(nullptr);
         tvc.m_verifivation_impossible = true;
         tvc.m_added_to_pool = true;
       }else
@@ -104,6 +105,7 @@ namespace cryptonote
       txd_p.first->second.max_used_block_height = max_used_block_height;
       txd_p.first->second.last_failed_height = 0;
       txd_p.first->second.last_failed_id = null_hash;
+      txd_p.first->second.receive_time = time(nullptr);
       tvc.m_added_to_pool = true;
 
       if(txd_p.first->second.fee > 0)
@@ -178,6 +180,30 @@ namespace cryptonote
     return true;
   }
   //---------------------------------------------------------------------------------
+  void tx_memory_pool::on_idle()
+  {
+    m_remove_stuck_tx_interval.do_call([this](){return remove_stuck_transactions();});
+  }
+  //---------------------------------------------------------------------------------
+  //proper tx_pool handling courtesy of CryptoZoidberg and Boolberry
+  bool tx_memory_pool::remove_stuck_transactions()
+  {
+    CRITICAL_REGION_LOCAL(m_transactions_lock);
+    for(auto it = m_transactions.begin(); it!= m_transactions.end();)
+    {
+      uint64_t tx_age = time(nullptr) - it->second.receive_time;
+
+      if((tx_age > CRYPTONOTE_MEMPOOL_TX_LIVETIME && !it->second.kept_by_block) || 
+         (tx_age > CRYPTONOTE_MEMPOOL_TX_FROM_ALT_BLOCK_LIVETIME && it->second.kept_by_block) )
+      {
+        LOG_PRINT_L0("Tx " << it->first << " removed from tx pool due to outdated, age: " << tx_age );
+        m_transactions.erase(it++);
+      }else
+        ++it;
+    }
+    return true;
+  }
+  //---------------------------------------------------------------------------------
   size_t tx_memory_pool::get_transactions_count()
   {
     CRITICAL_REGION_LOCAL(m_transactions_lock);
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h
index 26d273aa7..649af41a3 100644
--- a/src/cryptonote_core/tx_pool.h
+++ b/src/cryptonote_core/tx_pool.h
@@ -13,6 +13,7 @@
 
 #include "string_tools.h"
 #include "syncobj.h"
+#include "math_helper.h"
 #include "cryptonote_basic_impl.h"
 #include "verification_context.h"
 #include "crypto/hash.h"
@@ -40,6 +41,7 @@ namespace cryptonote
 
     bool on_blockchain_inc(uint64_t new_block_height, const crypto::hash& top_block_id);
     bool on_blockchain_dec(uint64_t new_block_height, const crypto::hash& top_block_id);
+    void on_idle();
 
     void lock();
     void unlock();
@@ -59,7 +61,7 @@ namespace cryptonote
     /*bool flush_pool(const std::strig& folder);
     bool inflate_pool(const std::strig& folder);*/
 
-#define CURRENT_MEMPOOL_ARCHIVE_VER    7
+#define CURRENT_MEMPOOL_ARCHIVE_VER    8
 
     template<class archive_t>
     void serialize(archive_t & a, const unsigned int version)
@@ -82,9 +84,11 @@ namespace cryptonote
       //
       uint64_t last_failed_height;
       crypto::hash last_failed_id;
+      time_t receive_time;
     };
 
   private:
+  	bool remove_stuck_transactions();
     bool is_transaction_ready_to_go(tx_details& txd);
     typedef std::unordered_map<crypto::hash, tx_details > transactions_container;
     typedef std::unordered_map<crypto::key_image, std::unordered_set<crypto::hash> > key_images_container;
@@ -92,6 +96,7 @@ namespace cryptonote
     epee::critical_section m_transactions_lock;
     transactions_container m_transactions;
     key_images_container m_spent_key_images;
+    epee::math_helper::once_a_time_seconds<30> m_remove_stuck_tx_interval;
 
     //transactions_container m_alternative_transactions;
 
@@ -159,6 +164,7 @@ namespace boost
       ar & td.max_used_block_id;
       ar & td.last_failed_height;
       ar & td.last_failed_id;
+      ar & td.receive_time;
 
     }
   }