Merge remote-tracking branch 'upstream/dev' into nogeo

CMakeLists.txt

@@ -60,13 +60,13 @@ endif ()
 ##! We fetch our dependencies
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/dev/mm2_bd69fbd-mac-x86-64.zip)
+            URL https://sdk.devbuilds.komodo.earth/dev/mm2_a9f606d-mac-x86-64.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
             URL https://sdk.devbuilds.komodo.earth/dev/mm2_e9559c2-linux-x86-64.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/dev/mm2_bd69fbd-win-x86-64.zip)
+            URL https://sdk.devbuilds.komodo.earth/dev/mm2_a9f606d-win-x86-64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

atomic_defi_design/Dex/Screens/Dashboard.qml

@@ -53,7 +53,6 @@ Item
     readonly property var   api_wallet_page: API.app.wallet_pg
     readonly property var   current_ticker_infos: api_wallet_page.ticker_infos
     readonly property bool  can_change_ticker: !api_wallet_page.tx_fetching_busy
-    readonly property bool  is_dex_banned: !API.app.ip_checker.ip_authorized
 
     readonly property alias loader: loader
     readonly property alias current_component: loader.item

atomic_defi_design/Dex/Support/SupportModal.qml

@@ -178,12 +178,6 @@ There is a toggle in settings where you can turn on/off the display of these tra
                     title: qsTr("Which devices can I use %1 on?").arg(API.app_name)
                     text: qsTr('%1 is available for mobile on both <a href="%2">Android and iPhone, and for desktop on Windows, Mac, and Linux</a> operating systems.').arg(API.app_name).arg(API.app_website_url)
                 }
-
-                FAQLine
-                {
-                    title: qsTr("Compliance Info")
-                    text: qsTr("Due to regulatory and legal circumstances the citizens of certain jurisdictions including, but not limited to, the United States of America, Canada, Hong Kong, Israel, Singapore, Sudan, Austria, Iran and any other state, country or other jurisdiction that is embargoed by the United States of America or the European Union are not allowed to use this application.")
-                }
             }
         }
 

atomic_defi_design/Dex/Wallet/Main.qml

@@ -513,7 +513,6 @@ Item
             // Swap Button
             Item
             {
-                visible: !is_dex_banned
                 Layout.preferredWidth: 180
                 Layout.preferredHeight: 48
 

ci_tools_atomic_dex/ci_scripts/osx_script.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
 
 # Workaround for https://github.com/actions/setup-python/issues/577
-rm /usr/local/bin/2to3* || true
-rm /usr/local/bin/idle3* || true
-rm /usr/local/bin/pydoc3* || true
-rm /usr/local/bin/python3* || true
-rm /usr/local/bin/python3-config* || true
 
-brew install llvm@16
 brew update
 brew install autoconf \
             automake \
@@ -18,6 +12,7 @@ brew install autoconf \
             gnu-sed \
             coreutils \
             libtool \
+            llvm \
             gnu-getopt
 
 pip3 install yq

cmake/project.metadata.cmake

@@ -13,7 +13,6 @@ set(DEX_DISCORD "https://komodoplatform.com/discord")
 set(DEX_TWITTER "https://twitter.com/AtomicDEX")
 set(DEX_PRIMARY_COIN "LTC")                                                         ## Main coin of the DEX, will be enabled by default and will be the default left ticker for trading
 set(DEX_SECOND_PRIMARY_COIN "KMD")                                                  ## Second main coin of the DEX, will be enabled by default and will be the default right ticker for trading
-option(DISABLE_GEOBLOCKING "Enable to disable geoblocking (for dev purpose)" OFF)
 set(DEX_REPOSITORY_OWNER ${DEX_COMPANY})
 set(DEX_REPOSITORY_NAME "komodo-wallet-desktop")
 set(DEX_CHECKSUM_API_URL "https://komodo.earth/static/checksum.json")
@@ -147,4 +146,4 @@ macro(generate_linux_metafiles)
 
     configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo-64.png ${CMAKE_CURRENT_LIST_DIR}/cmake/install/linux/dex-logo-64.png COPYONLY)                                  # Configures x64 Linux logo
     configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo.png ${CMAKE_CURRENT_LIST_DIR}/cmake/install/linux/dex-logo.png COPYONLY)
-endmacro()
+endmacro()

src/CMakeLists.txt

@@ -41,10 +41,6 @@ if (APPLE)
     endmacro()
     adex_add_framework(Security ${PROJECT_NAME}_core)
 endif ()
-if (DISABLE_GEOBLOCKING)
-    message(STATUS "Disabling Geoblocking for dev purpose")
-    target_compile_definitions(${PROJECT_NAME}_core INTERFACE -DDISABLE_GEOBLOCKING)
-endif ()
 target_link_libraries(${PROJECT_NAME}_core INTERFACE SortFilterProxyModel)
 
 

src/app/app.cpp

@@ -491,7 +491,6 @@ namespace atomic_dex
 
         // get_dispatcher().sink<refresh_update_status>().connect<&application::on_refresh_update_status_event>(*this);
         //! MM2 system need to be created before the GUI and give the instance to the gui
-        system_manager_.create_system<ip_service_checker>();
         system_manager_.create_system<mm2_service>(system_manager_);
         auto& settings_page_system = system_manager_.create_system<settings_page>(system_manager_, m_app, this);
         auto& portfolio_system     = system_manager_.create_system<portfolio_page>(system_manager_, this);
@@ -905,18 +904,6 @@ namespace atomic_dex
     }
 } // namespace atomic_dex
 
-//! IP checker
-namespace atomic_dex
-{
-    ip_service_checker*
-    application::get_ip_checker() const
-    {
-        auto ptr = const_cast<ip_service_checker*>(std::addressof(system_manager_.get_system<ip_service_checker>()));
-        assert(ptr != nullptr);
-        return ptr;
-    }
-} // namespace atomic_dex
-
 //! Exporter service
 namespace atomic_dex
 {

src/app/app.hpp

@@ -45,7 +45,6 @@
 #include "atomicdex/pages/qt.wallet.page.hpp"
 #include "atomicdex/services/exporter/exporter.service.hpp"
 #include "atomicdex/services/internet/internet.checker.service.hpp"
-#include "atomicdex/services/ip/ip.checker.service.hpp"
 #include "atomicdex/services/mm2/mm2.service.hpp"
 #include "atomicdex/services/price/global.provider.hpp"
 #include "atomicdex/services/update/update.checker.service.hpp"
@@ -69,7 +68,6 @@ namespace atomic_dex
         Q_PROPERTY(portfolio_page_ptr portfolio_pg READ get_portfolio_page NOTIFY portfolioPageChanged)
         Q_PROPERTY(notification_manager* notification_mgr READ get_notification_manager)
         Q_PROPERTY(internet_service_checker* internet_checker READ get_internet_checker NOTIFY internetCheckerChanged)
-        Q_PROPERTY(ip_service_checker* ip_checker READ get_ip_checker NOTIFY ipCheckerChanged)
         Q_PROPERTY(exporter_service* exporter_service READ get_exporter_service NOTIFY exporterServiceChanged)
         Q_PROPERTY(trading_page* trading_pg READ get_trading_page NOTIFY tradingPageChanged)
         Q_PROPERTY(wallet_page* wallet_pg READ get_wallet_page NOTIFY walletPageChanged)
@@ -135,7 +133,6 @@ namespace atomic_dex
         settings_page*                           get_settings_page() const;
         qt_wallet_manager*                       get_wallet_mgr() const;
         internet_service_checker*                get_internet_checker() const;
-        ip_service_checker*                      get_ip_checker() const;
         update_checker_service*                  get_update_checker_service() const;
         [[nodiscard]] zcash_params_service*      get_zcash_params_service() const;
         exporter_service*                        get_exporter_service() const;
@@ -184,7 +181,6 @@ namespace atomic_dex
         void tradingPageChanged();
         void settingsPageChanged();
         void internetCheckerChanged();
-        void ipCheckerChanged();
         void exporterServiceChanged();
       public slots:
         void exit_handler();