moved all stuff to github

2 files changed, 1003 insertions, 0 deletions

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
new file mode 100644
index 000000000..aa4e2f518
--- /dev/null
+++ b/src/wallet/wallet2.cpp
@@ -0,0 +1,595 @@
+// 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 <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+
+#include <boost/utility/value_init.hpp>
+#include "include_base_utils.h"
+using namespace epee;
+
+#include "wallet2.h"
+#include "cryptonote_core/cryptonote_format_utils.h"
+#include "rpc/core_rpc_server_commands_defs.h"
+#include "misc_language.h"
+#include "cryptonote_core/cryptonote_basic_impl.h"
+#include "common/boost_serialization_helper.h"
+#include "profile_tools.h"
+#include "crypto/crypto.h"
+#include "serialization/binary_utils.h"
+
+using namespace cryptonote;
+
+namespace tools
+{
+//----------------------------------------------------------------------------------------------------
+bool wallet2::init(const std::string& daemon_address, uint64_t upper_transaction_size_limit)
+{
+  m_upper_transaction_size_limit = upper_transaction_size_limit;
+  m_daemon_address = daemon_address;
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::process_new_transaction(cryptonote::transaction& tx, uint64_t height)
+{
+  std::vector<size_t> outs;
+  uint64_t tx_money_got_in_outs = 0;
+  crypto::public_key tx_pub_key = null_pkey;
+  bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
+  CHECK_AND_ASSERT_MES(r && tx_pub_key != null_pkey, false, "process_new_transaction failed.");
+  r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs);
+  CHECK_AND_ASSERT_MES(r, false, "call lookup_acc_outs failed");
+  if(outs.size() && tx_money_got_in_outs)
+  {
+    //good news - got money! take care about it
+    //usually we have only one transfer for user in transaction
+    cryptonote::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::request req = AUTO_VAL_INIT(req);
+    cryptonote::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::response res = AUTO_VAL_INIT(res);
+    req.txid = get_transaction_hash(tx);
+    bool r = net_utils::invoke_http_bin_remote_command2(m_daemon_address + "/get_o_indexes.bin", req, res, m_http_client, WALLET_RCP_CONNECTION_TIMEOUT);
+    CHECK_AND_ASSERT_MES(r, false, "failed to get_o_indexes.bin");
+    if(res.status != CORE_RPC_STATUS_OK)
+      return false;// in case of split while lookup_acc_outs, transaction could be lost (especially if it is coinbase tx)
+    CHECK_AND_ASSERT_MES(res.o_indexes.size() == tx.vout.size(), false, "internal error: transactions outputs size=" << tx.vout.size()
+                                                  << " not match with COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES response size=" << res.o_indexes.size());
+
+    BOOST_FOREACH(size_t o, outs)
+    {
+      CHECK_AND_ASSERT_MES(o < tx.vout.size(), false, "wrong out in transaction: internal index=" << o << ", total_outs" << tx.vout.size());
+      m_transfers.push_back(boost::value_initialized<transfer_details>());
+      transfer_details& td = m_transfers.back();
+      td.m_block_height = height;
+      td.m_internal_output_index = o;
+      td.m_global_output_index = res.o_indexes[o];
+      td.m_tx = tx;
+      td.m_spent = false;
+      cryptonote::keypair in_ephemeral;
+      cryptonote::generate_key_image_helper(m_account.get_keys(), tx_pub_key, o, in_ephemeral, td.m_key_image);
+      CHECK_AND_ASSERT_MES(in_ephemeral.pub == boost::get<cryptonote::txout_to_key>(tx.vout[o].target).key,
+                                    false, "internal error: at key_image generating ephemeral public key not matched with output_key");
+      m_key_images[td.m_key_image] = m_transfers.size()-1;
+      LOG_PRINT_L1("Received money: " << print_money(td.amount()) << ", with tx: " << get_transaction_hash(tx));
+    }
+  }
+  // check all outputs for spending (compare key images)
+  BOOST_FOREACH(auto& in, tx.vin)
+  {
+    if(in.type() != typeid(cryptonote::txin_to_key))
+      continue;
+    auto it = m_key_images.find(boost::get<cryptonote::txin_to_key>(in).k_image);
+    if(it != m_key_images.end())
+    {
+      LOG_PRINT_L1("Spent money: " << print_money(boost::get<cryptonote::txin_to_key>(in).amount) << ", with tx: " << get_transaction_hash(tx));
+      m_transfers[it->second].m_spent = true;
+    }
+  }
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::process_new_blockchain_entry(cryptonote::block& b, cryptonote::block_complete_entry& bche, crypto::hash& bl_id, uint64_t height)
+{
+  //handle transactions from new block
+  CHECK_AND_ASSERT_MES(height == m_blockchain.size(), false, "internal error: current_index=" << height << ", m_blockchain.size()=" << m_blockchain.size());
+  //optimization: seeking only for blocks that are not older then the wallet creation time plus 1 day. 1 day is for possible user incorrect time setup
+  if(b.timestamp + 60*60*24 > m_account.get_createtime())
+  {
+    TIME_MEASURE_START(miner_tx_handle_time);
+    bool r = process_new_transaction(b.miner_tx, height);
+    TIME_MEASURE_FINISH(miner_tx_handle_time);
+    CHECK_AND_NO_ASSERT_MES(r, false, "failed to process transaction");
+
+    TIME_MEASURE_START(txs_handle_time);
+    BOOST_FOREACH(auto& txblob, bche.txs)
+    {
+      cryptonote::transaction tx;
+      r = parse_and_validate_tx_from_blob(txblob, tx);
+      CHECK_AND_ASSERT_MES(r, false, "failed to parse and validate transaction from blob");
+      r = process_new_transaction(tx, height);
+      CHECK_AND_ASSERT_MES(r, false, "failed to process transaction");
+    }
+    TIME_MEASURE_FINISH(txs_handle_time);
+    LOG_PRINT_L2("Processed block: " << bl_id << ", height " << height << ", " <<  miner_tx_handle_time + txs_handle_time << "(" << miner_tx_handle_time << "/" << txs_handle_time <<")ms");
+  }else
+  {
+    LOG_PRINT_L2( "Skipped block by timestamp, height: " << height << ", block time " << b.timestamp << ", account time " << m_account.get_createtime());
+  }
+  m_blockchain.push_back(bl_id);
+  ++m_local_bc_height;
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::get_short_chain_history(std::list<crypto::hash>& ids)
+{
+  size_t i = 0;
+  size_t current_multiplier = 1;
+  size_t sz = m_blockchain.size();
+  if(!sz)
+    return true;
+  size_t current_back_offset = 1;
+  bool genesis_included = false;
+  while(current_back_offset < sz)
+  {
+    ids.push_back(m_blockchain[sz-current_back_offset]);
+    if(sz-current_back_offset == 0)
+      genesis_included = true;
+    if(i < 10)
+    {
+      ++current_back_offset;
+    }else
+    {
+      current_back_offset += current_multiplier *= 2;
+    }
+    ++i;
+  }
+  if(!genesis_included)
+    ids.push_back(m_blockchain[0]);
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::pull_blocks(size_t& blocks_added)
+{
+  blocks_added = 0;
+  cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::request req = AUTO_VAL_INIT(req);
+  cryptonote::COMMAND_RPC_GET_BLOCKS_FAST::response res = AUTO_VAL_INIT(res);
+  get_short_chain_history(req.block_ids);
+  bool r = net_utils::invoke_http_bin_remote_command2(m_daemon_address + "/getblocks.bin", req, res, m_http_client, WALLET_RCP_CONNECTION_TIMEOUT);
+  CHECK_AND_ASSERT_MES(r, false, "failed to get blocks");
+  CHECK_AND_ASSERT_MES(res.status == CORE_RPC_STATUS_OK, false, "failed to get blocks");
+
+  //find split position, if split happened
+
+  CHECK_AND_ASSERT_MES(res.start_height < m_blockchain.size(), false, "wrong daemon response: m_start_height="
+    << res.start_height << " not less than local blockchain size=" << m_blockchain.size());
+
+  size_t current_index = res.start_height;
+  BOOST_FOREACH(auto& bl_entry, res.blocks)
+  {
+    cryptonote::block bl;
+    r = cryptonote::parse_and_validate_block_from_blob(bl_entry.block, bl);
+    CHECK_AND_ASSERT_MES(r, false, "failed to parse/validate block");
+    crypto::hash bl_id = get_block_hash(bl);
+    if(current_index >= m_blockchain.size())
+    {
+      r = process_new_blockchain_entry(bl, bl_entry, bl_id, current_index);
+      if(!r) return false;
+      ++blocks_added;
+    }else
+    {
+      if(bl_id != m_blockchain[current_index])
+      {
+        //split detected here !!!
+        CHECK_AND_ASSERT_MES(current_index != res.start_height, false, "wrong daemon response: first block in response " << string_tools::pod_to_hex(bl_id)
+          << "\nnot match with local block id " << string_tools::pod_to_hex(m_blockchain[current_index]));
+        detach_blockchain(current_index);
+        r = process_new_blockchain_entry(bl, bl_entry, bl_id, current_index);
+        if(!r) return false;
+
+      }
+    }
+    ++current_index;
+  }
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::refresh()
+{
+  size_t blocks_fetched = 0;
+  return refresh(blocks_fetched);
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::refresh(size_t & blocks_fetched)
+{
+  bool received_money = false;
+  return refresh(blocks_fetched, received_money);
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::refresh(size_t & blocks_fetched, bool& received_money)
+{
+  received_money = false;
+  blocks_fetched = 0;
+  size_t added_blocks = 0;
+  size_t try_count = 0;
+  crypto::hash last_tx_hash_id = m_transfers.size() ? get_transaction_hash(m_transfers.back().m_tx) : null_hash;
+
+  while(true)
+  {
+    bool res = pull_blocks(added_blocks);
+    if(!res)
+    {
+      if(try_count < 3)
+      {
+        LOG_PRINT_L0("Another try pull_blocks(try_count=" << try_count << ")...");
+        ++try_count;
+        continue;
+      }else
+      {
+        LOG_PRINT_L0("pull_blocks failed, try_count=" << try_count);
+        return false;
+      }
+    }
+    blocks_fetched+=added_blocks;
+
+    if(!added_blocks)
+      break;
+  }
+  if(last_tx_hash_id != (m_transfers.size() ? get_transaction_hash(m_transfers.back().m_tx) : null_hash))
+    received_money = true;
+
+  LOG_PRINT_L2( "Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance()));
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::detach_blockchain(uint64_t height)
+{
+  LOG_PRINT_L0("Detaching blockchain on height " << height);
+  size_t transfers_detached = 0;
+
+  auto it = std::find_if(m_transfers.begin(), m_transfers.end(), [&](const transfer_details& td){return td.m_block_height >= height;});
+  size_t i_start = it - m_transfers.begin();
+
+  for(size_t i = i_start; i!= m_transfers.size();i++)
+  {
+    auto it_ki = m_key_images.find(m_transfers[i].m_key_image);
+    CHECK_AND_ASSERT_MES(it_ki != m_key_images.end(), false, "key image not found");
+    m_key_images.erase(it_ki);
+    ++transfers_detached;
+  }
+  m_transfers.erase(it, m_transfers.end());
+
+  size_t blocks_detached = m_blockchain.end() - (m_blockchain.begin()+height);
+  m_blockchain.erase(m_blockchain.begin()+height, m_blockchain.end());
+  m_local_bc_height -= blocks_detached;
+
+  LOG_PRINT_L0("Detached blockchain on height " << height << ", transfers detached " << transfers_detached << ", blocks detached " << blocks_detached);
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::deinit()
+{
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::clear()
+{
+  m_blockchain.clear();
+  m_transfers.clear();
+  cryptonote::block b;
+  cryptonote::generate_genesis_block(b);
+  m_blockchain.push_back(get_block_hash(b));
+  m_local_bc_height = 1;
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::store_keys(const std::string& keys_file_name, const std::string& password)
+{
+  std::string account_data;
+  bool r = epee::serialization::store_t_to_binary(m_account, account_data);
+  CHECK_AND_ASSERT_MES(r, false, "failed to serialize wallet keys");
+  wallet2::keys_file_data keys_file_data = boost::value_initialized<wallet2::keys_file_data>();
+
+  crypto::chacha8_key key;
+  crypto::generate_chacha8_key(password, key);
+  std::string cipher;
+  cipher.resize(account_data.size());
+  keys_file_data.iv = crypto::rand<crypto::chacha8_iv>();
+  crypto::chacha8(account_data.data(), account_data.size(), key, keys_file_data.iv, &cipher[0]);
+  keys_file_data.account_data = cipher;
+
+  std::string buf;
+  r = ::serialization::dump_binary(keys_file_data, buf);
+  r = r && epee::file_io_utils::save_string_to_file(keys_file_name, buf); //and never touch wallet_keys_file again, only read
+  CHECK_AND_ASSERT_MES(r, false, "failed to generate wallet keys file " << keys_file_name);
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+namespace
+{
+  bool verify_keys(const crypto::secret_key& sec, const crypto::public_key& expected_pub)
+  {
+    crypto::public_key pub;
+    bool r = crypto::secret_key_to_public_key(sec, pub);
+    return r && expected_pub == pub;
+  }
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::load_keys(const std::string& keys_file_name, const std::string& password)
+{
+  wallet2::keys_file_data keys_file_data;
+  std::string buf;
+  bool r = epee::file_io_utils::load_file_to_string(keys_file_name, buf);
+  r &= ::serialization::parse_binary(buf, keys_file_data);
+  CHECK_AND_ASSERT_MES(r, false, "failed to load wallet keys file: " << keys_file_name);
+
+  crypto::chacha8_key key;
+  crypto::generate_chacha8_key(password, key);
+  std::string account_data;
+  account_data.resize(keys_file_data.account_data.size());
+  crypto::chacha8(keys_file_data.account_data.data(), keys_file_data.account_data.size(), key, keys_file_data.iv, &account_data[0]);
+
+  const cryptonote::account_keys& keys = m_account.get_keys();
+  r = epee::serialization::load_t_from_binary(m_account, account_data);
+  r = r && verify_keys(keys.m_view_secret_key,  keys.m_account_address.m_view_public_key);
+  r = r && verify_keys(keys.m_spend_secret_key, keys.m_account_address.m_spend_public_key);
+  if (!r)
+  {
+    LOG_ERROR("invalid password");
+    return false;
+  }
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::generate(const std::string& wallet_, const std::string& password)
+{
+  clear();
+  prepare_file_names(wallet_);
+  boost::system::error_code e;
+  if(boost::filesystem::exists(m_wallet_file, e) || boost::filesystem::exists(m_keys_file, e))
+  {
+    LOG_PRINT_RED_L0("failed to generate wallet, file already exist or wrong path: " << wallet_);
+    return false;
+  }
+
+  m_account.generate();
+  m_account_public_address = m_account.get_keys().m_account_address;
+
+  bool r = store_keys(m_keys_file, password);
+  CHECK_AND_ASSERT_MES(r, false, "Failed to store wallet key files!");
+  r = file_io_utils::save_string_to_file(m_wallet_file + ".address.txt", m_account.get_public_address_str());
+  if(!r) LOG_PRINT_RED_L0("String with address text not saved");
+  return store();
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::prepare_file_names(const std::string& file_path)
+{
+  m_keys_file = file_path;
+  m_wallet_file = file_path;
+  boost::system::error_code e;
+  if(string_tools::get_extension(m_keys_file) == "keys")
+  {//provided keys file name
+    m_wallet_file = string_tools::cut_off_extension(m_wallet_file);
+  }else
+  {//provided wallet file name
+    m_keys_file += ".keys";
+  }
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::check_connection()
+{
+  if(m_http_client.is_connected())
+    return true;
+
+  net_utils::http::url_content u;
+  net_utils::parse_url(m_daemon_address, u);
+  if(!u.port)
+    u.port = 8081;  
+  return m_http_client.connect(u.host, std::to_string(u.port), WALLET_RCP_CONNECTION_TIMEOUT);
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::load(const std::string& wallet_, const std::string& password)
+{
+  clear();
+  prepare_file_names(wallet_);
+  boost::system::error_code e;
+  if(!boost::filesystem::exists(m_keys_file, e) || e)
+  {
+    LOG_PRINT_L0("file not found: " << m_keys_file);
+    return false;
+  }
+
+  bool r = load_keys(m_keys_file, password);
+  if (!r)
+    return false;
+
+  LOG_PRINT_L0("Loaded wallet keys file, with public address: " << m_account.get_public_address_str());
+  //keys loaded ok!
+  //try to load wallet file. but even if we failed, it is not big problem
+  if(!boost::filesystem::exists(m_wallet_file, e) || e)
+  {
+    LOG_PRINT_L0("file not found: " << m_wallet_file << ", starting with empty blockchain");
+    m_account_public_address = m_account.get_keys().m_account_address;
+    return true;
+  }
+  r = tools::unserialize_obj_from_file(*this, m_wallet_file);
+  CHECK_AND_ASSERT_MES(r, false, "failed to load wallet from file " << m_wallet_file);
+  CHECK_AND_ASSERT_MES(m_account_public_address.m_spend_public_key == m_account.get_keys().m_account_address.m_spend_public_key &&
+                       m_account_public_address.m_view_public_key == m_account.get_keys().m_account_address.m_view_public_key,
+                       false, "addresses of wallet keys file and wallet data file are mismatched");
+  if(!m_blockchain.size())
+  {
+    cryptonote::block b;
+    cryptonote::generate_genesis_block(b);
+    m_blockchain.push_back(get_block_hash(b));
+  }
+  m_local_bc_height = m_blockchain.size();
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::store()
+{
+  bool r = tools::serialize_obj_to_file(*this, m_wallet_file);
+  CHECK_AND_ASSERT_MES(r, false, "failed to save wallet to file " << m_wallet_file);
+  return r;
+}
+//----------------------------------------------------------------------------------------------------
+void wallet2::show_incoming_transfers()
+{
+  uint64_t amount = 0;
+  if(!m_transfers.size())
+  {
+    LOG_PRINT_L0("No incoming transfers");
+    return;
+  }
+  BOOST_FOREACH(transfer_details& td, m_transfers)
+  {
+    LOG_PRINT_L0("transfer: " << print_money(td.amount())
+                                    << ", spent: " << td.m_spent
+                                    << ", global_index: " << td.m_global_output_index
+                                    << ", tx_id: " << get_transaction_hash(td.m_tx));
+    if(!td.m_spent)
+      amount += td.amount();
+  }
+}
+//----------------------------------------------------------------------------------------------------
+uint64_t wallet2::unlocked_balance()
+{
+  uint64_t amount = 0;
+  BOOST_FOREACH(transfer_details& td, m_transfers)
+    if(!td.m_spent && is_transfer_unlocked(td))
+      amount += td.amount();
+
+  return amount;
+}
+//----------------------------------------------------------------------------------------------------
+uint64_t wallet2::balance()
+{
+  uint64_t amount = 0;
+  BOOST_FOREACH(auto& td, m_transfers)
+    if(!td.m_spent)
+      amount += td.amount();
+
+  return amount;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::get_transfers(wallet2::transfer_container& incoming_transfers)
+{
+  incoming_transfers = m_transfers;
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::is_transfer_unlocked(const transfer_details& td) const
+{
+  if(!is_tx_spendtime_unlocked(td.m_tx.unlock_time))
+    return false;
+
+  if(td.m_block_height + DEFAULT_TX_SPENDABLE_AGE > m_blockchain.size())
+    return false;
+
+  return true;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::is_tx_spendtime_unlocked(uint64_t unlock_time) const
+{
+  if(unlock_time < CRYPTONOTE_MAX_BLOCK_NUMBER)
+  {
+    //interpret as block index
+    if(m_blockchain.size()-1 + CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS >= unlock_time)
+      return true;
+    else
+      return false;
+  }else
+  {
+    //interpret as time
+    uint64_t current_time = static_cast<uint64_t>(time(NULL));
+    if(current_time + CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS >= unlock_time)
+      return true;
+    else
+      return false;
+  }
+  return false;
+}
+//----------------------------------------------------------------------------------------------------
+namespace
+{
+  template<typename T>
+  T pop_random_value(std::vector<T>& vec)
+  {
+    CHECK_AND_ASSERT_MES(!vec.empty(), T(), "Vector must be non-empty");
+
+    size_t idx = crypto::rand<size_t>() % vec.size();
+    T res = vec[idx];
+    if (idx + 1 != vec.size())
+    {
+      vec[idx] = vec.back();
+    }
+    vec.resize(vec.size() - 1);
+
+    return res;
+  }
+}
+//----------------------------------------------------------------------------------------------------
+uint64_t wallet2::select_transfers(uint64_t needed_money, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers)
+{
+  std::vector<size_t> unused_transfers_indices;
+  std::vector<size_t> unused_dust_indices;
+  for (size_t i = 0; i < m_transfers.size(); ++i)
+  {
+    const transfer_details& td = m_transfers[i];
+    if (!td.m_spent && is_transfer_unlocked(td))
+    {
+      if (dust < td.amount())
+        unused_transfers_indices.push_back(i);
+      else
+        unused_dust_indices.push_back(i);
+    }
+  }
+
+  bool at_least_one_dust_selected = unused_dust_indices.empty();
+  uint64_t found_money = 0;
+  while (found_money < needed_money && (!unused_transfers_indices.empty() || !unused_dust_indices.empty()))
+  {
+    size_t idx;
+    if (at_least_one_dust_selected)
+    {
+      idx = !unused_transfers_indices.empty() ? pop_random_value(unused_transfers_indices) : pop_random_value(unused_dust_indices);
+    }
+    else
+    {
+      idx = pop_random_value(unused_dust_indices);
+      at_least_one_dust_selected = true;
+    }
+
+    transfer_container::iterator it = m_transfers.begin() + idx;
+    selected_transfers.push_back(it);
+    found_money += it->amount();
+  }
+
+  return found_money;
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count,
+  uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx)
+{
+  return transfer(dsts, fake_outputs_count, unlock_time, fee, detail::digit_split_strategy, tx_dust_policy(fee), tx);
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx, transafer_fail_details& tfd)
+{
+  return transfer(dsts, fake_outputs_count, unlock_time, fee, detail::digit_split_strategy, tx_dust_policy(fee), tx, tfd);
+}
+//----------------------------------------------------------------------------------------------------
+bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count,
+                       uint64_t unlock_time, uint64_t fee)
+{
+  cryptonote::transaction tx;
+  return transfer(dsts, fake_outputs_count, unlock_time, fee, tx);
+}
+//----------------------------------------------------------------------------------------------------
+}
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
new file mode 100644
index 000000000..27799e2da
--- /dev/null
+++ b/src/wallet/wallet2.h
@@ -0,0 +1,408 @@
+// 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 <memory>
+#include <boost/serialization/list.hpp>
+#include <boost/serialization/vector.hpp>
+#include <atomic>
+#include "include_base_utils.h"
+#include "cryptonote_core/account.h"
+#include "cryptonote_core/account_boost_serialization.h"
+#include "cryptonote_core/cryptonote_basic_impl.h"
+#include "net/http_client.h"
+#include "storages/http_abstract_invoke.h"
+#include "rpc/core_rpc_server_commands_defs.h"
+#include "cryptonote_core/cryptonote_format_utils.h"
+#include "common/unordered_containers_boost_serialization.h"
+#include "crypto/chacha8.h"
+#include "crypto/hash.h"
+
+#define DEFAULT_TX_SPENDABLE_AGE                               10
+#define WALLET_RCP_CONNECTION_TIMEOUT                          200000
+
+namespace tools
+{
+  class wallet2
+  {
+    wallet2(const wallet2&){};
+  public:
+    wallet2(){};
+    struct transfer_details
+    {
+      uint64_t m_block_height;
+      cryptonote::transaction m_tx;
+      size_t m_internal_output_index;
+      uint64_t m_global_output_index;
+      bool m_spent;
+      crypto::key_image m_key_image; //TODO: key_image stored twice :(
+
+      uint64_t amount() const { return m_tx.vout[m_internal_output_index].amount; }
+    };
+    typedef std::vector<transfer_details> transfer_container;
+
+    struct tx_dust_policy
+    {
+      uint64_t dust_threshold;
+      bool add_to_fee;
+      cryptonote::account_public_address addr_for_dust;
+
+      tx_dust_policy(uint64_t a_dust_threshold = 0, bool an_add_to_fee = true, cryptonote::account_public_address an_addr_for_dust = cryptonote::account_public_address())
+        : dust_threshold(a_dust_threshold)
+        , add_to_fee(an_add_to_fee)
+        , addr_for_dust(an_addr_for_dust)
+      {
+      }
+    };
+
+    struct keys_file_data
+    {
+      crypto::chacha8_iv iv;
+      std::string account_data;
+
+      BEGIN_SERIALIZE_OBJECT()
+        FIELD(iv)
+        FIELD(account_data)
+      END_SERIALIZE()
+    };
+
+    struct transafer_fail_details
+    {
+      enum fail_reason
+      {
+        error_ok = 0,
+        error_not_connected,
+        error_rejected_by_daemon,
+        error_too_big_transaction, 
+        error_not_enough_money, 
+        error_internal_error
+      };
+      fail_reason reason;
+      uint64_t tx_blob_size;
+      uint64_t max_expected_tx_blob_size;
+    };
+
+    bool generate(const std::string& wallet, const std::string& password);
+    bool load(const std::string& wallet, const std::string& password);
+    bool store();
+    cryptonote::account_base& get_account(){return m_account;}
+
+    bool 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);
+
+    bool refresh();
+    bool refresh(size_t & blocks_fetched);
+    bool refresh(size_t & blocks_fetched, bool& received_money);
+    bool deinit();
+
+    uint64_t balance();
+    uint64_t unlocked_balance();
+    void show_incoming_transfers();
+    template<typename T>
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy);
+    template<typename T>
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx, transafer_fail_details& tfd);
+    template<typename T>
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx);
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee);
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx);
+    bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx, transafer_fail_details& tfd);
+    bool check_connection();
+    bool get_transfers(wallet2::transfer_container& incoming_transfers);
+    uint64_t get_blockchain_current_height() const { return m_local_bc_height; }
+    template <class t_archive>
+    inline void serialize(t_archive &a, const unsigned int ver)
+    {
+      if(ver < 5)
+        return;
+      a & m_blockchain;
+      a & m_transfers;
+      a & m_account_public_address;
+      a & m_key_images;
+    }
+
+  private:
+    bool store_keys(const std::string& keys_file_name, const std::string& password);
+    bool load_keys(const std::string& keys_file_name, const std::string& password);
+    bool process_new_transaction(cryptonote::transaction& tx, uint64_t height);
+    bool process_new_blockchain_entry(cryptonote::block& b, cryptonote::block_complete_entry& bche, crypto::hash& bl_id, uint64_t height);
+    bool detach_blockchain(uint64_t height);
+    bool get_short_chain_history(std::list<crypto::hash>& ids);
+    bool is_tx_spendtime_unlocked(uint64_t unlock_time) const;
+    bool is_transfer_unlocked(const transfer_details& td) const;
+    bool clear();
+    bool pull_blocks(size_t& blocks_added);
+    uint64_t select_transfers(uint64_t needed_money, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers);
+    bool prepare_file_names(const std::string& file_path);
+
+    cryptonote::account_base m_account;
+    std::string m_daemon_address;
+    std::string m_wallet_file;
+    std::string m_keys_file;
+    epee::net_utils::http::http_simple_client m_http_client;
+    std::vector<crypto::hash> m_blockchain;
+    std::atomic<uint64_t> m_local_bc_height; //temporary workaround 
+
+    transfer_container m_transfers;
+    std::unordered_map<crypto::key_image, size_t> m_key_images;
+    cryptonote::account_public_address m_account_public_address;
+    uint64_t m_upper_transaction_size_limit; //TODO: auto-calc this value or request from daemon, now use some fixed value
+  };
+}
+BOOST_CLASS_VERSION(tools::wallet2, 5)
+
+namespace boost
+{
+  namespace serialization
+  {
+    template <class Archive>
+    inline void serialize(Archive &a, tools::wallet2::transfer_details &x, const boost::serialization::version_type ver)
+    {
+      a & x.m_block_height;
+      a & x.m_global_output_index;
+      a & x.m_internal_output_index;
+      a & x.m_tx;
+      a & x.m_spent;
+      a & x.m_key_image;
+    }
+  }
+}
+
+namespace tools
+{
+  namespace detail
+  {
+    //----------------------------------------------------------------------------------------------------
+    inline void digit_split_strategy(const std::vector<cryptonote::tx_destination_entry>& dsts,
+      const cryptonote::tx_destination_entry& change_dst, uint64_t dust_threshold,
+      std::vector<cryptonote::tx_destination_entry>& splitted_dsts, uint64_t& dust)
+    {
+      splitted_dsts.clear();
+      dust = 0;
+
+      BOOST_FOREACH(auto& de, dsts)
+      {
+        cryptonote::decompose_amount_into_digits(de.amount, dust_threshold,
+          [&](uint64_t chunk) { splitted_dsts.push_back(cryptonote::tx_destination_entry(chunk, de.addr)); },
+          [&](uint64_t a_dust) { splitted_dsts.push_back(cryptonote::tx_destination_entry(a_dust, de.addr)); } );
+      }
+
+      cryptonote::decompose_amount_into_digits(change_dst.amount, dust_threshold,
+        [&](uint64_t chunk) { splitted_dsts.push_back(cryptonote::tx_destination_entry(chunk, change_dst.addr)); },
+        [&](uint64_t a_dust) { dust = a_dust; } );
+    }
+    //----------------------------------------------------------------------------------------------------
+    inline void null_split_strategy(const std::vector<cryptonote::tx_destination_entry>& dsts,
+      const cryptonote::tx_destination_entry& change_dst, uint64_t dust_threshold,
+      std::vector<cryptonote::tx_destination_entry>& splitted_dsts, uint64_t& dust)
+    {
+      splitted_dsts = dsts;
+
+      dust = 0;
+      uint64_t change = change_dst.amount;
+      if (0 < dust_threshold)
+      {
+        for (uint64_t order = 10; order <= 10 * dust_threshold; order *= 10)
+        {
+          uint64_t dust_candidate = change_dst.amount % order;
+          uint64_t change_candidate = (change_dst.amount / order) * order;
+          if (dust_candidate <= dust_threshold)
+          {
+            dust = dust_candidate;
+            change = change_candidate;
+          }
+          else
+          {
+            break;
+          }
+        }
+      }
+
+      if (0 != change)
+      {
+        splitted_dsts.push_back(cryptonote::tx_destination_entry(change, change_dst.addr));
+      }
+    }
+    //----------------------------------------------------------------------------------------------------
+    inline void print_source_entry(const cryptonote::tx_source_entry& src)
+    {
+      std::string indexes;
+      std::for_each(src.outputs.begin(), src.outputs.end(), [&](const cryptonote::tx_source_entry::output_entry& s_e) { indexes += boost::to_string(s_e.first) + " "; });
+      std::cout << "amount=" << cryptonote::print_money(src.amount) << ", real_output=" <<src.real_output << ", real_output_in_tx_index=" << src.real_output_in_tx_index << ", indexes: " << indexes << ENDL;
+    }
+    //----------------------------------------------------------------------------------------------------
+  }
+  //----------------------------------------------------------------------------------------------------
+  template<typename T>
+  bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count,
+    uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy)
+  {
+    cryptonote::transaction tx;
+    return transfer(dsts, fake_outputs_count, unlock_time, fee, destination_split_strategy, dust_policy, tx);
+  }
+
+  template<typename T>
+  bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count,
+    uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx)
+  {
+    transafer_fail_details stub = AUTO_VAL_INIT(stub);
+    return transfer(dsts, fake_outputs_count, unlock_time, fee, destination_split_strategy, dust_policy, tx, stub);
+  }
+
+  template<typename T>
+  bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count,
+    uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx, transafer_fail_details& tfd)
+  {
+    using namespace cryptonote;
+
+    uint64_t needed_money = fee;
+    BOOST_FOREACH(auto& dt, dsts)
+    {
+      CHECK_AND_ASSERT_MES(dt.amount > 0, false, "Wrong destination amount value: " << dt.amount);
+      needed_money += dt.amount;
+    }
+
+    std::list<transfer_container::iterator> selected_transfers;
+    uint64_t found_money = select_transfers(needed_money, dust_policy.dust_threshold, selected_transfers);
+
+    if(found_money < needed_money)
+    {
+      LOG_ERROR("not enough money, available only " << print_money(found_money) << ", expected " << print_money(needed_money) );
+      tfd.reason = transafer_fail_details::error_not_enough_money;
+      return false;
+    }
+    //typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount outs_for_amount;
+    typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry;
+    typedef cryptonote::tx_source_entry::output_entry tx_output_entry;
+
+    COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response daemon_resp = AUTO_VAL_INIT(daemon_resp);
+    if(fake_outputs_count)
+    {
+
+      COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request req = AUTO_VAL_INIT(req);
+      req.outs_count = fake_outputs_count + 1;// add one to make possible (if need) to skip real output key
+      BOOST_FOREACH(transfer_container::iterator it, selected_transfers)
+      {
+        CHECK_AND_ASSERT_MES(it->m_tx.vout.size() > it->m_internal_output_index, false, "internal error: m_internal_output_index = "
+          << it->m_internal_output_index << " more than " << it->m_tx.vout.size());
+        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);
+      tfd.reason = transafer_fail_details::error_not_connected;
+      CHECK_AND_ASSERT_MES(r, false, "failed to get getrandom_outs");
+      tfd.reason = transafer_fail_details::error_internal_error;
+      CHECK_AND_ASSERT_MES(daemon_resp.status == CORE_RPC_STATUS_OK, false, "failed to getrandom_outs.bin");
+      CHECK_AND_ASSERT_MES(daemon_resp.outs.size() == selected_transfers.size(), false, "internal error: daemon returned wrong response for getrandom_outs, wrong amounts count = "
+        << daemon_resp.outs.size() << ", expected " << selected_transfers.size());
+    }
+    tfd.reason = transafer_fail_details::error_ok;
+ 
+    //prepare inputs
+    size_t i = 0;
+    std::vector<cryptonote::tx_source_entry> sources;
+    BOOST_FOREACH(transfer_container::iterator it, selected_transfers)
+    {
+      sources.resize(sources.size()+1);
+      cryptonote::tx_source_entry& src = sources.back();
+      transfer_details& td = *it;
+      src.amount = td.amount();
+      //paste mixin transaction
+      if(daemon_resp.outs.size())
+      {
+        daemon_resp.outs[i].outs.sort([](const out_entry& a, const out_entry& b){return a.global_amount_index < b.global_amount_index;});
+        BOOST_FOREACH(out_entry& daemon_oe, daemon_resp.outs[i].outs)
+        {
+          if(td.m_global_output_index == daemon_oe.global_amount_index)
+            continue;
+          tx_output_entry oe;
+          oe.first = daemon_oe.global_amount_index;
+          oe.second = daemon_oe.out_key;
+          src.outputs.push_back(oe);
+          if(src.outputs.size() >= fake_outputs_count)
+            break;
+        }
+      }
+
+      //paste real transaction to the random index
+      auto it_to_insert = std::find_if(src.outputs.begin(), src.outputs.end(), [&](const tx_output_entry& a)
+      {
+        return a.first >= td.m_global_output_index;
+      });
+      //size_t real_index = src.outputs.size() ? (rand() % src.outputs.size() ):0;
+      tx_output_entry real_oe;
+      real_oe.first = td.m_global_output_index;
+      real_oe.second = boost::get<txout_to_key>(td.m_tx.vout[td.m_internal_output_index].target).key;
+      auto interted_it = src.outputs.insert(it_to_insert, real_oe);
+      src.real_out_tx_key = get_tx_pub_key_from_extra(td.m_tx);
+      src.real_output = interted_it - src.outputs.begin();
+      src.real_output_in_tx_index = td.m_internal_output_index;
+      detail::print_source_entry(src);
+      ++i;
+    }
+
+    cryptonote::tx_destination_entry change_dts = AUTO_VAL_INIT(change_dts);
+    if (needed_money < found_money)
+    {
+      change_dts.addr = m_account.get_keys().m_account_address;
+      change_dts.amount = found_money - needed_money;
+    }
+
+    uint64_t dust = 0;
+    std::vector<cryptonote::tx_destination_entry> splitted_dsts;
+    destination_split_strategy(dsts, change_dts, dust_policy.dust_threshold, splitted_dsts, dust);
+    CHECK_AND_ASSERT_MES(dust <= dust_policy.dust_threshold, false, "internal error: invalid dust value");
+    if (0 != dust && !dust_policy.add_to_fee)
+    {
+      splitted_dsts.push_back(cryptonote::tx_destination_entry(dust, dust_policy.addr_for_dust));
+    }
+    
+    tfd.reason = transafer_fail_details::error_internal_error;
+    bool r = cryptonote::construct_tx(m_account.get_keys(), sources, splitted_dsts, tx, unlock_time);
+    CHECK_AND_ASSERT_MES(r, false, "Transaction construction failed");
+
+    //check transaction size
+    if(get_object_blobsize(tx) >= m_upper_transaction_size_limit)
+    {
+      LOG_PRINT_RED("Transaction size is too big: " << get_object_blobsize(tx)  << ", expected size < " << m_upper_transaction_size_limit, LOG_LEVEL_2);
+      tfd.reason = transafer_fail_details::error_too_big_transaction;
+      tfd.tx_blob_size = get_object_blobsize(tx);
+      tfd.max_expected_tx_blob_size = m_upper_transaction_size_limit;
+      return false;
+    }
+
+
+    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;
+    tfd.reason = transafer_fail_details::error_not_connected;
+    r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/sendrawtransaction", req, daemon_send_resp, m_http_client, 200000);
+    CHECK_AND_ASSERT_MES(r, false, "failed to send transaction");
+    if(daemon_send_resp.status != CORE_RPC_STATUS_OK)
+    {
+      tfd.reason = transafer_fail_details::error_rejected_by_daemon;
+      LOG_ERROR("daemon failed to accept generated transaction, id: " << get_transaction_hash(tx) );
+      return false;
+    }
+    std::string key_images;
+    std::for_each(tx.vin.begin(), tx.vin.end(), [&](const txin_v& s_e) -> bool
+    {
+      CHECKED_GET_SPECIFIC_VARIANT(s_e, const txin_to_key, in, false);
+      key_images += boost::to_string(in.k_image) + " ";
+      return true;
+    });
+    LOG_PRINT_L2("transaction " << get_transaction_hash(tx) << " generated ok and sent to daemon, key_images: [" << key_images << "]");
+
+    BOOST_FOREACH(transfer_container::iterator it, selected_transfers)
+      it->m_spent = true;
+
+    LOG_PRINT_L0("Transaction successfully sent. <" << get_transaction_hash(tx) << ">" << ENDL 
+                  << "Commission: " << print_money(fee+dust) << "(dust: " << print_money(dust) << ")" << ENDL
+                  << "Balance: " << print_money(balance()) << ENDL
+                  << "Unlocked: " << print_money(unlocked_balance()) << ENDL
+                  << "Please, wait for confirmation for your balance to be unlocked.");
+
+    tfd.reason = transafer_fail_details::error_ok;
+    return true;
+  }
+}