Merge branch 'release'

.gitmodules

@@ -8,4 +8,7 @@
 [submodule "contrib/tor-connect"]
 	path = contrib/tor-connect
 	url = https://github.com/hyle-team/tor-connect.git
-	branch = main
+	branch = main
+[submodule "contrib/jwt-cpp"]
+	path = contrib/jwt-cpp
+	url = https://github.com/Thalhammer/jwt-cpp.git

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 PROJECT(Zano)
 
@@ -18,6 +18,9 @@ endif()
 if(POLICY CMP0043)
   cmake_policy(SET CMP0074 NEW)
 endif()
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif()
 
 
 set(CMAKE_CXX_STANDARD 17)
@@ -50,31 +53,31 @@ if (UNIX AND NOT APPLE)
 else()
   # multi configurations for MSVC and XCode
   if(CMAKE_SYSTEM_NAME STREQUAL "iOS") 
-    set(CMAKE_CONFIGURATION_TYPES "Release")
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") 
     set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
   else()
     set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
   endif()
 endif()
 message("Generated with config types: ${CMAKE_CONFIGURATION_TYPES}, and built type: ${CMAKE_BUILD_TYPE}")
- 
+
 enable_testing()
 
 set(OPENSSL_USE_STATIC_LIBS TRUE) # link statically
 find_package(OpenSSL REQUIRED)
 
 
 if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
 endif()
 
 set(USE_PCH FALSE CACHE BOOL "Use shared precompiled headers")
 set(DISABLE_TOR FALSE CACHE BOOL "Disable TOR library(and related tor-connect submodule)")
 set(TESTNET FALSE CACHE BOOL "Compile for testnet")
 set(BUILD_GUI FALSE CACHE BOOL "Build qt-daemon")
 
-include_directories(src contrib/eos_portable_archive contrib contrib/epee/include ${OPENSSL_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib")
+include_directories(src contrib/eos_portable_archive contrib contrib/epee/include contrib/jwt-cpp/include ${OPENSSL_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/version" "${CMAKE_BINARY_DIR}/contrib/zlib")
 
 add_definitions(-DSTATICLIB)
 
@@ -122,6 +125,7 @@ if(MSVC)
     endforeach()
   endif()
   include_directories(SYSTEM src/platform/msc)
+  configure_file(utils/Directory.Build.props.in ${CMAKE_BINARY_DIR}/Directory.Build.props)
 else()
   set(ARCH default CACHE STRING "CPU to build for: -march value or default")
   if("${ARCH}" STREQUAL "default")
@@ -225,11 +229,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
   set(Boost_LIBRARIES "libboost.a")
   #workaround for new XCode 12 policy for builds(now it includes a slice for the "arm64" when builds for simulator)
   set(__iphoneos_archs "arm64")
-  set(__iphonesimulator_archs "x86_64")
+  #set(__iphonesimulator_archs "arm64,x86_64")
   set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}")
   set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}")
-  set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
-  set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
+  #set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
+  #set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
   set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/")
   set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a")
@@ -260,8 +264,10 @@ elseif(NOT MSVC)
 endif()
 
 if(BUILD_GUI)
-  cmake_minimum_required(VERSION 3.1)
+  cmake_minimum_required(VERSION 3.1) # <-- this is important for Linux GUI build, don't touch it -- sowle
   find_package(Qt5Widgets REQUIRED)  
+  find_package(Qt5WebEngineWidgets REQUIRED)  
+  find_package(Qt5WebChannel REQUIRED)  
 endif()
 
 set(COMMIT_ID_IN_VERSION ON CACHE BOOL "Include commit ID in version")

README.md

@@ -15,10 +15,10 @@ Be sure to clone the repository properly:\
 |--|--|--|--|
 | gcc (Linux) | 5.4.0 | 9.4.0 | 12.3.0 |
 | llvm/clang (Linux) | UNKNOWN | 7.0.1 | 8.0.0 |
-| [MSVC](https://visualstudio.microsoft.com/downloads/) (Windows) | 2017 (15.9.30) | 2017 (15.9.30) | 2022 (17.7.5) |
-| [XCode](https://developer.apple.com/downloads/) (macOS) | 12.3 | 14.3 | 14.3 |
-| [CMake](https://cmake.org/download/) | 3.15.5 | 3.22.1 | 3.26.3 |
-| [Boost](https://www.boost.org/users/download/) | 1.70 | 1.70 | 1.76 |
+| [MSVC](https://visualstudio.microsoft.com/downloads/) (Windows) | 2017 (15.9.30) | 2019 (16.11.34) | 2022 (17.9.5) |
+| [XCode](https://developer.apple.com/downloads/) (macOS) | 12.3 | 14.3 | 15.2 |
+| [CMake](https://cmake.org/download/) | 3.15.5 | 3.26.3 | 3.29.0 |
+| [Boost](https://www.boost.org/users/download/) | 1.70 | 1.70 | 1.84 |
 | [OpenSSL](https://www.openssl.org/source/) [(win)](https://slproweb.com/products/Win32OpenSSL.html) | 1.1.1n | 1.1.1w | 1.1.1w | 
 | [Qt](https://download.qt.io/archive/qt/) (*only for GUI*) | 5.8.0 | 5.11.2 | 5.15.2 |
 

contrib/CMakeLists.txt

@@ -14,9 +14,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
   message("excluded upnp support for IOS build")
   return()
 endif()
+
 add_subdirectory(miniupnp/miniupnpc)
 
 
+
 set_property(TARGET libminiupnpc-static PROPERTY FOLDER "contrib")
 set_property(TARGET zlibstatic PROPERTY FOLDER "contrib")
 set_property(TARGET mdbx PROPERTY FOLDER "contrib")

contrib/epee/include/file_io_utils.h

@@ -35,6 +35,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <filesystem>
 
 #ifndef MAKE64
 	#define MAKE64(low,high)	((__int64)(((DWORD)(low)) | ((__int64)((DWORD)(high))) << 32))
@@ -561,16 +562,15 @@ namespace file_io_utils
 		try
 		{
 
-			boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end
-			for ( boost::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr )
+			std::filesystem::directory_iterator end_itr; // default construction yields past-the-end
+			for ( std::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr )
 			{
-				if ( only_files && boost::filesystem::is_directory(itr->status()) )
+				if ( only_files && std::filesystem::is_directory(itr->status()) )
 				{
 					continue;
 				}
 				target_list.push_back(itr->path().filename().string());
 			}
-
 		}
 
 		catch(...)

contrib/epee/include/misc_language.h

@@ -82,6 +82,13 @@ namespace epee
 
 namespace misc_utils
 {
+
+  template<typename t_type_a, typename t_type_b>
+  void cast_assign_a_to_b(t_type_a& a, const t_type_b& b)
+  {
+    *static_cast<t_type_b*>(&a) = b;
+  }
+
   template<class _Ty1,
     class _Ty2,
     class _Ty3>
@@ -532,6 +539,92 @@ namespace misc_utils
 
   };
 
+  template<typename key, typename expiration_type>
+  struct expirating_set
+  {
+    typedef std::set<key> main_set;
+    main_set m_set;
+    std::multimap<expiration_type, typename main_set::iterator> m_expirations;
+
+    const main_set& get_set()
+    {
+      return m_set;
+    }
+    void add(const key& k, const expiration_type& e)
+    {
+      auto res = m_set.insert(k);
+      m_expirations.insert({ e, res.first });
+    }
+
+    void remove_if_expiration_less_than(const expiration_type& e)
+    {
+      while(m_expirations.size() && m_expirations.begin()->first < e)
+      {
+        m_set.erase(m_expirations.begin()->second);
+        m_expirations.erase(m_expirations.begin());
+      }
+    }
+  };
+
+  template<typename key, typename expiration_type, typename value_type>
+  struct expirating_map
+  {
+    typedef std::map<key, value_type> main_map;
+    main_map m_map;
+    std::multimap<expiration_type, typename main_map::iterator> m_expirations;
+
+    const main_map& get_map()
+    {
+      return m_map;
+    }
+    void add(const key& k, const value_type& v, const expiration_type& e)
+    {
+      auto res = m_map.insert(k, v);
+      m_expirations.insert({ e, res.first });
+    }
+
+    void remove_if_expiration_less_than(const expiration_type& e)
+    {
+      while (m_expirations.size() && m_expirations.begin()->first < e)
+      {
+        m_map.erase(m_expirations.begin()->second);
+        m_expirations.erase(m_expirations.begin());
+      }
+    }
+
+    template <class t_archive>
+    inline void serialize(t_archive& a, const unsigned int ver)
+    {
+      std::vector<std::tuple<key, value_type, expiration_type> > items;
+      if constexpr (t_archive::is_saving::value)
+      {
+        for (const auto& item: m_expirations)
+        {
+          items.resize(items.size + 1);
+          std::get<2>(items.back()) = item.first;
+          std::get<0>(items.back()) = item.second.first;
+          std::get<1>(items.back()) = item.second.second;
+        }
+      }
+      a & items;
+
+      if constexpr (!t_archive::is_saving::value)
+      {
+        for (const auto& item : items)
+        {
+          this->add(std::get<0>(item), std::get<1>(item), std::get<2>(item));
+
+
+          items.resize(items.size + 1);
+          std::get<2>(items.back()) = item.first;
+          std::get<0>(items.back()) = item.second.first;
+          std::get<1>(items.back()) = item.second.second;
+        }
+      }
+
+    }
+
+  };
 
 
 } // namespace misc_utils

contrib/epee/include/net/http_base.h

@@ -98,7 +98,7 @@ namespace net_utils
 			std::string m_transfer_encoding;//"Transfer-Encoding:"
 			std::string m_content_encoding; //"Content-Encoding:"
 			std::string m_host;             //"Host:"
-			std::string m_cookie;			//"Cookie:"
+			std::string m_cookie;						//"Cookie:"
 			fields_list m_etc_fields;
 
 			void clear()
@@ -147,10 +147,10 @@ namespace net_utils
 			std::string       m_http_method_str;
 			std::string       m_full_request_str;
 			std::string       m_replace_html;
-            std::string       m_request_head;
+      std::string       m_request_head;
 			int               m_http_ver_hi;
 			int               m_http_ver_lo;
-            bool		      m_have_to_block;
+      bool							m_have_to_block;
 			http_header_info	m_header_info;
       uri_content       m_uri_content;
 			size_t				    m_full_request_buf_size;
@@ -166,11 +166,11 @@ namespace net_utils
 
 		struct http_response_info 
 		{
-			int					m_response_code;
-			std::string			m_response_comment;
+			int									m_response_code;
+			std::string					m_response_comment;
 			fields_list	        m_additional_fields;
-			std::string			m_body;
-			std::string			m_mime_tipe;
+			std::string					m_body;
+			std::string					m_mime_tipe;
 			http_header_info    m_header_info;
 			int                 m_http_ver_hi;// OUT paramter only
 			int                 m_http_ver_lo;// OUT paramter only