Merge pull request #1416 from KomodoPlatform/smtf_v2

0.5.3 patch: smtf -> smtf-v2

.github/workflows/atomicdex-desktop-ci.yml

@@ -126,11 +126,14 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           export DEBIAN_FRONTEND=noninteractive
-          echo "CHOOSENIM_CHOOSE_VERSION=1.4.0" >> $GITHUB_ENV
+          echo "CHOOSENIM_CHOOSE_VERSION=1.4.8" >> $GITHUB_ENV
+          export CHOOSENIM_CHOOSE_VERSION=1.4.8
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
           chmod +x choosenim.sh
           ./choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
+          ls /home/runner/.choosenim/toolchains
+          chmod +x /home/runner/.choosenim/toolchains/nim-1.4.8/bin/*
 
       - name: Install deps (Linux)
         if: runner.os == 'Linux'
@@ -270,19 +273,17 @@ jobs:
 
       - name: Running Tests (Windows)
         shell: powershell
-        working-directory: ci_tools_atomic_dex
         if: runner.os == 'Windows' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository
         run: |
           echo "Running tests"
           $Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
           $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
-          cmd /c '.\ci_tools_atomic_dex.exe tests release 2>&1'
-          cd build-Release
-          cd bin
-          ls
+          cd build\bin
+          ./atomicdex-desktop_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
           #Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
           #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
 
+
       - name: Upload env variable for artifacts (Linux)
         if: runner.os == 'Linux'
         run: |

CMakeLists.txt

@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.2)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.3)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)

assets/config/0.5.2-coins.json → assets/config/0.5.3-coins.json

@@ -2948,8 +2948,8 @@
     "currently_enabled": false,
     "wallet_only": true
   },
-  "SMTF": {
-    "coin": "SMTF",
+  "SMTF-v2": {
+    "coin": "SMTF-v2",
     "name": "SmartFi",
     "coinpaprika_id": "test-coin",
     "coingecko_id": "test-coin",

ci_tools_atomic_dex/ci_scripts/osx_script.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
 brew update
+brew tap-new $USER/local-nim
+brew extract --version=1.4.8 nim $USER/local-nim
 brew install autoconf \
             automake \
             libtool \
             pkgconfig \
             wget \
-            nim \
+            nim@1.4.8 \
             ninja \
             gnu-sed \
             coreutils \

ci_tools_atomic_dex/ci_scripts/windows_script.ps1

@@ -21,11 +21,8 @@ scoop cache rm llvm
 scoop cache rm nim
 $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\$Env:QT_VERSION\msvc2019_64"
 $Env:QT_ROOT = "C:\Qt"
-cd ci_tools_atomic_dex
-#$file = 'src\generate.nim'
-#$regex = '(?<=g_vcpkg_cmake_script_path & ")[^"]*'
-#(Get-Content $file) -replace $regex, ' -DVCPKG_TARGET_TRIPLET=x64-windows ' | Set-Content $file
-nimble build -y
-#cmd /c '.\ci_tools_atomic_dex.exe build release 2>&1'
-cmd /c '.\ci_tools_atomic_dex.exe bundle release 2>&1'
-#ls bundle-Release/bundle.zip
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../ 
+ninja
+ninja install

ci_tools_atomic_dex/installer/osx/config/config.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>${DEX_DISPLAY_NAME}</Name>
-    <Version>0.5.2</Version>
+    <Version>0.5.3</Version>
     <Title>${DEX_DISPLAY_NAME} Installer</Title>
     <ProductUrl>${DEX_WEBSITE}</ProductUrl>
     <Publisher>${DEX_COMPANY}</Publisher>

ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in

@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.2</Version>
-    <ReleaseDate>2021-09-23</ReleaseDate>
+    <Version>0.5.3</Version>
+    <ReleaseDate>2021-11-10</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>

ci_tools_atomic_dex/installer/windows/config/config.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>@DEX_DISPLAY_NAME@</Name>
-    <Version>0.5.2</Version>
+    <Version>0.5.3</Version>
     <Title>@DEX_DISPLAY_NAME@ Installer</Title>
     <ProductUrl>@DEX_WEBSITE@</ProductUrl>
     <Publisher>@DEX_COMPANY@</Publisher>

ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in

@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.2</Version>
-    <ReleaseDate>2021-09-23</ReleaseDate>
+    <Version>0.5.3</Version>
+    <ReleaseDate>2021-11-10</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>

cmake/install/macos/dex_install.cmake

@@ -4,8 +4,8 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
             RESOURCE ${ICON}
             MACOSX_BUNDLE_ICON_FILE dex-logo
-            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.2
-            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.2
+            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.3
+            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.3
             MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in")
     add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD COMMAND

src/core/atomicdex/version/version.hpp

@@ -21,24 +21,24 @@ namespace atomic_dex
     constexpr const char*
     get_version()
     {
-        return "0.5.2-beta";
+        return "0.5.3-beta";
     }
 
     constexpr int
     get_num_version() noexcept
     {
-        return 52;
+        return 53;
     }
 
     constexpr const char*
     get_raw_version()
     {
-        return "0.5.2";
+        return "0.5.3";
     }
 
     constexpr const char*
     get_precedent_raw_version()
     {
-        return "0.5.1";
+        return "0.5.2";
     }
 } // namespace atomic_dex

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "atomicdex-desktop",
-  "version-string": "0.5.2",
+  "version-string": "0.5.3",
   "dependencies": [
     "entt",
     "boost-multiprecision",