From c532b7f675d2e02a39adfbf44be5c964d21e428d Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Sun, 12 Feb 2017 09:48:56 +0800
Subject: [PATCH] updated to latest Monero PR's.

---
 .gitignore           |  1 +
 CMakeLists.txt       | 12 +++++++++++-
 src/monero_headers.h |  2 +-
 src/rpccalls.h       |  4 +++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40f074e..0e2b78f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 *.*~
 *.user
 .idea/
+*.log
 cmake-build-debug/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6752e6f..1700ae8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,10 @@ add_library(cryptoxmr STATIC IMPORTED)
 set_property(TARGET cryptoxmr
         PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcrypto.a)
 
+add_library(cryptonote_basic STATIC IMPORTED)
+set_property(TARGET cryptonote_basic
+        PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_basic.a)
+
 add_library(cryptonote_core STATIC IMPORTED)
 set_property(TARGET cryptonote_core
         PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_core.a)
@@ -69,6 +73,10 @@ add_library(cryptonote_protocol STATIC IMPORTED)
 set_property(TARGET cryptonote_protocol
         PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcryptonote_protocol.a)
 
+add_library(daemonizer STATIC IMPORTED)
+set_property(TARGET daemonizer
+        PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libdaemonizer.a)
+
 add_library(mnemonics STATIC IMPORTED)
 set_property(TARGET mnemonics
         PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libmnemonics.a)
@@ -176,9 +184,11 @@ set(LIBRARIES
         myext
         mstch
         wallet
+        blockchain_db
         cryptonote_core
         cryptonote_protocol
-        blockchain_db
+        cryptonote_basic
+        daemonizer
         cryptoxmr
         blocks
         lmdb
diff --git a/src/monero_headers.h b/src/monero_headers.h
index 2ef5505..c373cc2 100644
--- a/src/monero_headers.h
+++ b/src/monero_headers.h
@@ -19,7 +19,7 @@
 #include "net/http_client.h"
 #include "storages/http_abstract_invoke.h"
 
-#include "cryptonote_core/cryptonote_basic.h"
+//#include "cryptonote_core/cryptonote_basic.h"
 #include "cryptonote_core/tx_pool.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/lmdb/db_lmdb.h"
diff --git a/src/rpccalls.h b/src/rpccalls.h
index 4980063..9959ded 100644
--- a/src/rpccalls.h
+++ b/src/rpccalls.h
@@ -45,7 +45,9 @@ namespace xmreg
 
             timeout_time_ms = std::chrono::milliseconds {timeout_time};
 
-            m_http_client.set_server(deamon_url);
+            m_http_client.set_server(
+                    deamon_url,
+                    boost::optional<epee::net_utils::http::login>{});
         }
 
         bool