From da5582045870c02af49c6e3d58a8b3ee019a6d94 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Sun, 19 May 2019 13:23:53 +0800
Subject: [PATCH 1/3] clean_search_thread_map updated

---
 src/CurrentBlockchainStatus.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
index e2cf94d..58aebda 100755
--- a/src/CurrentBlockchainStatus.cpp
+++ b/src/CurrentBlockchainStatus.cpp
@@ -1084,18 +1084,19 @@ CurrentBlockchainStatus::get_search_thread(string const& acc_address)
 
     return searching_threads.find(acc_address)->second.get_functor();
 }
-
 void
 CurrentBlockchainStatus::clean_search_thread_map()
 {
     std::lock_guard<std::mutex> lck (searching_threads_map_mtx);
 
-    for (auto& st: searching_threads)
+    for (auto it = searching_threads.begin(); 
+            it != searching_threads.end();)
     {
+        auto& st = *it;
+
         if (search_thread_exist(st.first)
                 && st.second.get_functor().still_searching() == false)
         {
-
             // before erasing a search thread, check if there was any
             // exception thrown by it
             try
@@ -1111,7 +1112,11 @@ CurrentBlockchainStatus::clean_search_thread_map()
             }
 
             OMINFO << "Ereasing a search thread";
-            searching_threads.erase(st.first);
+            it = searching_threads.erase(it);
+        }
+        else
+        {
+            ++it;
         }
     }
 }

From 6cd783c9d685516e2483e8748064273779c9a995 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Tue, 21 May 2019 05:30:13 +0800
Subject: [PATCH 2/3] add missing target_include_monero_directories:q

---
 CMakeLists.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fde1eb0..79b70ac 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,18 @@ if (NOT MYSQL_INCLUDE_DIR)
     return()
 endif()
 
-
+macro(target_include_monero_directories target_name)
+
+    target_include_directories(${target_name}
+        PRIVATE
+        ${MONERO_SOURCE_DIR}/src
+        ${MONERO_SOURCE_DIR}/external
+        ${MONERO_SOURCE_DIR}/build
+        ${MONERO_SOURCE_DIR}/external/easylogging++
+        ${MONERO_SOURCE_DIR}/contrib/epee/include
+        ${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb)
+
+endmacro(target_include_monero_directories)
 
 
 include_directories(${MYSQL_INCLUDE_DIR})

From 9607cc2c69b66727c10705a604970ce65e37a89a Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Tue, 21 May 2019 10:36:58 +0800
Subject: [PATCH 3/3] compatibility with realease_v013

---
 .gitmodules                     |  2 +-
 CMakeLists.txt                  | 15 +--------------
 src/CMakeLists.txt              |  4 ----
 src/CurrentBlockchainStatus.cpp |  6 ++++++
 src/CurrentBlockchainStatus.h   |  5 ++++-
 src/xmregcore                   |  2 +-
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0b9a170..6e2eee3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/xmregcore"]
 	path = src/xmregcore
 	url = https://github.com/moneroexamples/xmregcore
-    branch = master
+    branch = release_v13
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79b70ac..ee39475 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,19 +60,6 @@ if (NOT MYSQL_INCLUDE_DIR)
     return()
 endif()
 
-macro(target_include_monero_directories target_name)
-
-    target_include_directories(${target_name}
-        PRIVATE
-        ${MONERO_SOURCE_DIR}/src
-        ${MONERO_SOURCE_DIR}/external
-        ${MONERO_SOURCE_DIR}/build
-        ${MONERO_SOURCE_DIR}/external/easylogging++
-        ${MONERO_SOURCE_DIR}/contrib/epee/include
-        ${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb)
-
-endmacro(target_include_monero_directories)
-
 
 include_directories(${MYSQL_INCLUDE_DIR})
 
@@ -142,7 +129,7 @@ target_include_monero_directories(${PROJECT_NAME})
 set(LIBRARIES
         myxrm
         myxrmcore
-        ${Monero_LIBRARIES}
+        Monero::Monero
         restbed
         mysqlpp
         mysqlclient
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ba8600..b3d9477 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,8 +30,4 @@ add_library(myxrm
 target_include_monero_directories(myxrm)
 target_include_directories(myxrm PRIVATE "xmregcore")
 
-    #target_include_directories(myxmr 
-    #  PUBLIC 
-    #${MONERO_SOURCE_DIR}/contrib/epee/include)
-
 
diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
index 58aebda..229b9b2 100755
--- a/src/CurrentBlockchainStatus.cpp
+++ b/src/CurrentBlockchainStatus.cpp
@@ -1307,6 +1307,12 @@ MicroCoreAdapter::get_output_key(uint64_t amount,
 {
     cbs->get_output_keys(amount, absolute_offsets, outputs);
 }
+    
+uint64_t
+MicroCoreAdapter::get_num_outputs(uint64_t amount)
+{
+ return 0;
+}
 
 void
 MicroCoreAdapter::get_output_tx_and_index(
diff --git a/src/CurrentBlockchainStatus.h b/src/CurrentBlockchainStatus.h
index bfde8cb..2cd03a1 100755
--- a/src/CurrentBlockchainStatus.h
+++ b/src/CurrentBlockchainStatus.h
@@ -378,7 +378,10 @@ public:
     get_output_key(uint64_t amount,
                    vector<uint64_t> const& absolute_offsets,
                    vector<cryptonote::output_data_t>& outputs) 
-                    /*const*/ override;
+                     override;
+
+    virtual uint64_t
+    get_num_outputs(uint64_t amount) override;
 
     virtual void
     get_output_tx_and_index(
diff --git a/src/xmregcore b/src/xmregcore
index efeff91..5714f72 160000
--- a/src/xmregcore
+++ b/src/xmregcore
@@ -1 +1 @@
-Subproject commit efeff91fcfe767f5f0891879b7364e565ca52e69
+Subproject commit 5714f7221b1a66a01b7e868a46a00c5eb8ef0409