SWAP version 3.4.0

README.md

@@ -1,6 +1,6 @@
 # Swap
 
-Copyright (c) 2014-2024 The Monero Project.   
+Copyright (c) 2014-2026 The Monero Project.   
 Swap (previously known as Freehaven) is based on [Monero](README_original.md)
 
 ![Build-Linux](https://github.com/swap-dev/swap/workflows/Build-Linux/badge.svg)
@@ -12,7 +12,7 @@ Active Branches:
 - Unstable: swap-v3.3dev(latest)
 - Testing: N/A
 
-To contribute to the Swap Project, please make all pull requests to the _swap-v3.2dev_ branch.<br/>
+To contribute to the Swap Project, please make all pull requests to the _swap-v3.3dev_ branch.<br/>
 For production, please use the _latest or tagged release_ of the _master_ branch.
 
 ## Resources

contrib/epee/include/console_handler.h

@@ -543,6 +543,31 @@ namespace epee
       return it->second.second;
     }
 
+    std::vector<std::string> get_command_list(const std::vector<std::string>& keywords = std::vector<std::string>())
+    {
+      std::vector<std::string> list;
+      list.reserve(m_command_handlers.size());
+      for(auto const& x:m_command_handlers)
+      {
+        bool take = true;
+        for(auto const& y:keywords)
+        {
+          bool in_usage = x.second.second.first.find(y) != std::string::npos;
+          bool in_description = x.second.second.second.find(y) != std::string::npos;
+          if (!(in_usage || in_description))
+          {
+            take = false;
+            break;
+          }
+        }
+        if (take)
+        {
+          list.push_back(x.first);
+        }
+      }
+      return list;
+    }
+
     void set_handler(const std::string& cmd, const callback& hndlr, const std::string& usage = "", const std::string& description = "")
     {
       lookup::mapped_type & vt = m_command_handlers[cmd];

contrib/epee/include/net/abstract_http_client.h

@@ -64,6 +64,7 @@ namespace http
     abstract_http_client() {}
     virtual ~abstract_http_client() {}
     bool set_server(const std::string& address, boost::optional<login> user, ssl_options_t ssl_options = ssl_support_t::e_ssl_support_autodetect);
+    virtual bool set_proxy(const std::string& address);
     virtual void set_server(std::string host, std::string port, boost::optional<login> user, ssl_options_t ssl_options = ssl_support_t::e_ssl_support_autodetect) = 0;
     virtual void set_auto_connect(bool auto_connect) = 0;
     virtual bool connect(std::chrono::milliseconds timeout) = 0;

contrib/epee/include/net/http_client.h

@@ -885,14 +885,6 @@ namespace net_utils
 			}
 		};
 		typedef http_simple_client_template<blocked_mode_client> http_simple_client;
-
-    class http_simple_client_factory : public http_client_factory
-    {
-    public:
-      std::unique_ptr<abstract_http_client> create() override {
-        return std::unique_ptr<epee::net_utils::http::abstract_http_client>(new epee::net_utils::http::http_simple_client());
-      }
-    };
 	}
 }
 }

contrib/epee/src/abstract_http_client.cpp

@@ -137,6 +137,11 @@ namespace http
     set_server(std::move(parsed.host), std::to_string(parsed.port), std::move(user), std::move(ssl_options));
     return true;
   }
+
+  bool epee::net_utils::http::abstract_http_client::set_proxy(const std::string& address)
+  {
+    return false;
+  }
 }
 }
 }

external/CMakeLists.txt

@@ -67,4 +67,6 @@ else()
 endif()
 
 add_subdirectory(db_drivers)
-add_subdirectory(easylogging++)
+add_subdirectory(easylogging++)
+add_subdirectory(qrcodegen)
+

external/qrcodegen/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(libqrcodegen)
+
+add_library(qrcodegen STATIC QrCode.cpp)
+set_target_properties(qrcodegen PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(qrcodegen PROPERTIES CXX_STANDARD 11)
+
+target_include_directories(qrcodegen PUBLIC 
+    ${CMAKE_CURRENT_SOURCE_DIR})