Merge branch 'dev' into GleecDEX

KomodoPlatform · Jan 20, 2024 · 9585616 · 9585616
2 parents 1556d38 + d0a4478
commit 9585616
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
 **Operating Environment(s):**
  - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
  - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- - Komodo Wallet Version: [e.g. 0.7.0]
+ - Komodo Wallet Version: [e.g. 0.7.1]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml
@@ -9,7 +9,7 @@ env:
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.7.0"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://atomicdex.io/"
 
 jobs:

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -16,7 +16,7 @@ env:
   DEX_PROJECT_NAME: "GleecDEX"
   DEX_DISPLAY_NAME: "GleecDEX"
   DEX_COMPANY: "Gleec"
-  DEX_VERSION: "0.6.1"
+  DEX_VERSION: "0.7.1"
   DEX_WEBSITE: "https://gleec.com/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.0)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.1)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)

diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake
@@ -7,6 +7,7 @@ set(DEX_DISPLAY_NAME "GleecDEX")
 set(DEX_MAINTENANCE_TOOL_NAME "GleecDEX Maintenance Tool")
 set(DEX_COMPANY "Gleec")
 set(DEX_WEBSITE "https://gleec.com/")
+set(DEX_VERSION "0.7.1")
 set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home")
 set(DEX_DISCORD "")
 set(DEX_TWITTER "https://twitter.com/GleecOfficial")

diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp
@@ -647,7 +647,7 @@ namespace atomic_dex
                     out["adex_cfg"][ticker]["explorer_url"]            = coin_info.explorer_url;
                     out["adex_cfg"][ticker]["fallback_swap_contract"]  = coin_info.swap_contract_address;
                     out["adex_cfg"][ticker]["fname"]                   = name_lowercase;
-                    out["adex_cfg"][ticker]["is_testnet"]              = true;
+                    out["adex_cfg"][ticker]["is_testnet"]              = false;
                     out["adex_cfg"][ticker]["currently_enabled"]       = false;
                     out["adex_cfg"][ticker]["mm2"]                     = 1;
                     out["adex_cfg"][ticker]["name"]                    = name_lowercase;

diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp
@@ -21,24 +21,24 @@ namespace atomic_dex
     constexpr const char*
     get_version()
     {
-        return "0.7.0-beta";
+        return "0.7.1-beta";
     }
 
     constexpr int
     get_num_version() noexcept
     {
-        return 70;
+        return 71;
     }
 
     constexpr const char*
     get_raw_version()
     {
-        return "0.7.0";
+        return "0.7.1";
     }
 
     constexpr const char*
     get_precedent_raw_version()
     {
-        return "0.6.1";
+        return "0.7.0";
     }
 } // namespace atomic_dex
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "komodo-wallet",
-  "version-string": "0.7.0",
+  "version-string": "0.7.1",
   "dependencies": [
     "entt",
     "boost-multiprecision",