updated to recent moner PRs

CMakeLists.txt

@@ -39,6 +39,7 @@ include_directories(/usr/include/mysql)
 # get individual monero static libraries
 # that are needed in this project
 
+
 add_library(common STATIC IMPORTED)
 set_property(TARGET common PROPERTY IMPORTED_LOCATION ${MONERO_LIBS_DIR}/libcommon.a)
 
@@ -49,6 +50,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)
@@ -57,6 +62,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)
@@ -106,9 +115,11 @@ target_link_libraries(restbed_xmr
         myext
         restbed
         wallet
+        blockchain_db
         cryptonote_core
         cryptonote_protocol
-        blockchain_db
+        cryptonote_basic
+        daemonizer
         cryptoxmr
         blocks
         lmdb

html/js/config.js

@@ -16,7 +16,7 @@ var config = {
     txChargeRatio: 0.5,
     defaultMixin: 3,
     txChargeAddress: '',
-    idleTimeout: 10,
+    idleTimeout: 30,
     idleWarningDuration: 20,
     maxBlockNumber: 500000000,
     avgBlockTime: 60,

src/monero_headers.h

@@ -18,7 +18,6 @@
 #include "net/http_client.h"
 #include "storages/http_abstract_invoke.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"

src/rpccalls.h

@@ -44,7 +44,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