Merge remote-tracking branch 'upstream/master'

marmarachain · Dec 30, 2021 · 3d0c1f6 · 3d0c1f6
2 parents db48967 + 5e6e145
commit 3d0c1f6
Show file tree

Hide file tree

Showing 439 changed files with 21,067 additions and 15,293 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -71,9 +71,9 @@ jobs:
           target: 'desktop'
           dir: '${{ github.workspace }}'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
           aqtversion: '==0.8'
           py7zrversion: '==0.6'
@@ -86,17 +86,19 @@ jobs:
           host: 'mac'
           target: 'desktop'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           dir: '${{ github.workspace }}'
           modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
 
       - name: Install QT IFW (MacOS)
         if: runner.os == 'macOS'
         run: |
-          python3  -m aqt tool mac tools_ifw 4.1.1-202105261132 qt.tools.ifw.41 --outputdir ${{ github.workspace }}/Qt
+          python3  -m aqt tool mac tools_ifw 4.2.0-0-202111080927 qt.tools.ifw.42 --outputdir ${{ github.workspace }}/Qt
           echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.2/bin" >> $GITHUB_PATH
 
       - name: Install QT (Windows)
         if: runner.os == 'Windows'
@@ -107,25 +109,28 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2019_64'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           dir: 'C:\'
           modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
 
       - name: Install QT IFW (Windows)
         if: runner.os == 'Windows'
         run: |
           python -m pip install --upgrade pip
-          python -m aqt tool windows tools_ifw 4.1.1-202105261131 qt.tools.ifw.41 --outputdir C:/Qt
+          python -m aqt tool windows tools_ifw 4.2.0-0-202111080926 qt.tools.ifw.42 --outputdir C:/Qt
           echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:/Qt/Tools/QtInstallerFramework/4.1/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:/Qt/Tools/QtInstallerFramework/4.2/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo $env:GITHUB_PATH
           echo $env:PATH
 
       - name: Install nim (Linux)
         if: runner.os == 'Linux'
         run: |
           export DEBIAN_FRONTEND=noninteractive
+          export SHELL=/bin/bash
           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
@@ -263,9 +268,9 @@ jobs:
           export CC=clang
           export CXX=clang++
           echo "Running tests"
-          ./ci_tools_atomic_dex tests ${{ matrix.type }}
-          cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
-          cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
+          #./ci_tools_atomic_dex tests ${{ matrix.type }}
+          #cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
+          #cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
           #curl https://report.ci/upload.py --output upload.py
           ls
           #python upload.py --sha `git rev-parse HEAD` -n "[Doctest MacOS ${{ matrix.type }}]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
@@ -278,12 +283,11 @@ jobs:
           echo "Running tests"
           $Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
           $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
-          cd build\bin
-          ./atomicdex-desktop_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
+          cd b\bin
+          ./${{ env.DEX_PROJECT_NAME }}_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: |

diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ci_tools_atomic_dex/vcpkg-custom-ports"]
 	path = ci_tools_atomic_dex/vcpkg-custom-ports
 	url = https://github.com/KomodoPlatform/vcpkg-custom-ports
+[submodule "atomic_defi_design/imports/bignumberjs/bignumber.js"]
+	path = atomic_defi_design/imports/bignumberjs/bignumber.js
+	url = https://github.com/KomodoPlatform/bignumber.js.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.18)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.3)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.4)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -61,13 +61,13 @@ endif ()
 ##! We fetch our dependencies
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Windows_NT-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Windows_NT-Release.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ trade peer-to-peer with minimal fees and never give up control over your digital
 AtomicDEX Desktop has been tested on the following platforms:
 
 - Windows 10
-- Linux (Ubuntu 16.04+)
+- Linux (Ubuntu 18.04+)
 - macOS (10.14 - 11.0)