Merge pull request #2159 from KomodoPlatform/dev

0.5.7.1 RC
KomodoPlatform · Mar 7, 2023 · 4af2a8a · 4af2a8a
2 parents 3504b28 + 146b1ea
commit 4af2a8a
Show file tree

Hide file tree

Showing 461 changed files with 1,827 additions and 1,878 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 ]
- - AtomicDEX Version: [e.g. 0.5.7]
+ - AtomicDEX Version: [e.g. 0.5.7.1]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -11,8 +11,8 @@ on:
 
 env:
   DEX_API: "mm2"
-  DEX_RPCPORT: 7783
-  DEX_RPC: "http://127.0.0.1:7783"
+  DEX_RPCPORT: 7762
+  DEX_RPC: "http://127.0.0.1:7762"
   DEX_PROJECT_NAME: "atomicdex-desktop"
   DEX_DISPLAY_NAME: "AtomicDex Desktop"
   DEX_COMPANY: "KomodoPlatform"
@@ -38,13 +38,13 @@ jobs:
 
         include:
           - name: ubuntu-release
-            os: ubuntu-latest
+            os: ubuntu-20.04
             qt: '5.15.2'
             type: 'Release'
             host: 'linux'
 
           - name: ubuntu-debug
-            os: ubuntu-latest
+            os: ubuntu-20.04
             qt: '5.15.2'
             type: 'Debug'
             host: 'linux'
@@ -74,19 +74,19 @@ jobs:
             host: 'windows'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.9'
 
       - name: Install MSVC
         if: runner.os == 'Windows'
-        uses: ilammy/msvc-dev-cmd@v1.4.1
+        uses: ilammy/msvc-dev-cmd@v1.12.0
 
       - name: Build libwally (Windows)
         if: runner.os == 'Windows'
@@ -107,64 +107,54 @@ jobs:
 
       - name: Install QT (macOS)
         if: runner.os == 'macOS'
-        uses: KomodoPlatform/install-qt-action@v2.14.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
-          setup-python: 'false'
           host: ${{ matrix.host }}
-          target: 'desktop'
           dir: '${{ github.workspace }}'
-          modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
+          target: 'desktop'
+          modules: 'qtcharts debug_info qtwebengine'
+          tools: 'tools_ifw'
+          setup-python: 'false'
+          cache: true
 
       - name: Install QT (Linux)
         if: runner.os == 'Linux'
-        uses: KomodoPlatform/install-qt-action@v2.14.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
-          setup-python: 'false'
           host: ${{ matrix.host }}
-          target: 'desktop'
           dir: '${{ github.workspace }}'
-          modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
-          aqtversion: '==0.8'
-          py7zrversion: '==0.6'
+          target: 'desktop'
+          modules: 'qtcharts debug_info qtwebengine'
+          setup-python: 'false'
+          cache: true
 
       - name: Install QT (Windows)
         if: runner.os == 'Windows'
-        uses: KomodoPlatform/install-qt-action@v2.14.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
           host: ${{ matrix.host }}
+          dir: 'C:\'
           target: 'desktop'
+          modules: 'qtcharts debug_info qtwebengine'
+          tools: 'tools_ifw'
           arch: 'win64_msvc2019_64'
-          dir: 'C:\'
-          modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
-
-      - name: Install QT IFW (MacOS)
-        if: runner.os == 'macOS'
-        run: |
-          python3  -m aqt tool ${{ matrix.host }} tools_ifw 4.5.0 qt.tools.ifw.45 --outputdir ${{ github.workspace }}/Qt
-          echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.5/bin" >> $GITHUB_PATH
-
-      - name: Install QT IFW (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          python -m pip install --upgrade pip
-          python -m aqt tool ${{ matrix.host }} tools_ifw 4.5.0 qt.tools.ifw.45 --outputdir C:/Qt
-          echo "C:/Qt/Tools/QtInstallerFramework/4.5/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          cache: true
 
       - 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
+          echo "CHOOSENIM_CHOOSE_VERSION=1.6.10" >> $GITHUB_ENV
+          export CHOOSENIM_CHOOSE_VERSION=1.6.10
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
           chmod +x choosenim.sh
           ./choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
-          chmod +x /home/runner/.choosenim/toolchains/nim-1.4.8/bin/*
+          chmod +x /home/runner/.choosenim/toolchains/nim-1.6.10/bin/*
 
       - name: Install deps (Linux)
         if: runner.os == 'Linux'
@@ -191,11 +181,11 @@ jobs:
           echo "CC=clang-12" >> $GITHUB_ENV
 
       - name: vcpkg deps (All)
-        uses: KomodoPlatform/run-vcpkg@v7
+        uses: lukka/run-vcpkg@v10
         with:
           vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo'
-          setupOnly: true
           appendedCacheKey: ${{ hashFiles('vcpkg.json') }}
+          vcpkgJsonGlob: 'vcpkg.json'
 
 
       - name: import code signing certificates (macos)
@@ -222,19 +212,25 @@ jobs:
       - name: Build AtomicDEX (MacOS)
         if: runner.os == 'macOS'
         run: |
+          xcrun --sdk macosx --show-sdk-path
+          export SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
+          ls /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+          echo $HOME/sdk
+          ls $HOME/sdk
           export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
           export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
           export APPLE_ID="${{ secrets.APPLE_ID }}"
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
-          export MACOSX_DEPLOYMENT_TARGET=10.13
+          export MACOSX_DEPLOYMENT_TARGET=10.15
           export CC=clang
           export CXX=clang++
           cd ci_tools_atomic_dex
           nimble build -y
-          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX10.14.sdk --compiler=clang++
+          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX10.15.sdk --compiler=clang++
+
 
 
       - name: Build AtomicDEX (Linux)
@@ -276,23 +272,23 @@ jobs:
 
       - name: Upload bundle artifact (Linux ZSTD)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_zstd }}
           path: ./bundled/linux/${{ env.target_name_zstd }}
           retention-days: 7
 
       - name: Upload bundle artifact (Linux ZIP)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/linux/${{ env.target_name_zip }}
           retention-days: 7
 
       - name: Upload bundle artifact (Linux AppImage)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_appimage }}
           path: ./bundled/linux/${{ env.target_name_appimage }}
@@ -306,15 +302,15 @@ jobs:
 
       - name: Upload artifacts (MacOS dmg)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_dmg }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg
           retention-days: 7
 
       - name: Upload artifacts (MacOS installer)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
@@ -329,15 +325,15 @@ jobs:
 
       - name: Upload artifacts (Windows zip)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_zip }}
-          path: ./bundled/windows/bin.zip
+          path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}.zip
           retention-days: 7
 
       - name: Upload artifacts (Windows installer)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,14 +11,13 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.1)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
 include(ipo_prerequisites)
 
 ##! Options
-option(PREFER_BOOST_FILESYSTEM "Enable to use boost filesystem instead of std::filesystem" OFF)
 option(WITH_HOTRELOAD "Enable to use qml Hot reload" OFF)
 
 if (NOT WITH_HOTRELOAD)
@@ -91,6 +90,7 @@ if (UNIX)
     configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_CURRENT_SOURCE_DIR}/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
     configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/mm2/coins COPYONLY)
     configure_file(${mm2_SOURCE_DIR}/mm2 ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/mm2/${DEX_API} COPYONLY)
+    file(COPY ${jl777-coins_SOURCE_DIR}/icons/ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/atomic_defi_design/assets/images/coins/)
 else ()
     configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
     configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY)

diff --git a/assets/themes/Binance - Dark/colors.json b/assets/themes/Binance - Dark/colors.json
@@ -28,6 +28,7 @@
   "gradientButtonTextHoveredColor": "#000000FF",
   "gradientButtonTextPressedColor": "#000000FF",
 
+  "checkBoxTickColor": "#FFFFFFFF",
   "checkBoxGradientStartColor": "#cb9800FF",
   "checkBoxGradientEndColor": "#EBB514FF",
 

diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json
@@ -31,8 +31,9 @@
     "gradientButtonTextHoveredColor": "#FFFFFFFF",
     "gradientButtonTextPressedColor": "#FFFFFFFF",
 
-    "checkBoxGradientStartColor": "#8892EBFF",
-    "checkBoxGradientEndColor": "#9DD4F3FF",
+    "checkBoxTickColor": "#FFFFFFFF",
+    "checkBoxGradientStartColor": "#6673E3FF",
+    "checkBoxGradientEndColor": "#5EBBF0FF",
 
     "switchGradientStartColor": "#1D80B0FF",
     "switchGradientEndColor": "#5B69E6FF",

diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json
@@ -28,6 +28,7 @@
     "gradientButtonTextHoveredColor": "#FFFFFFFF",
     "gradientButtonTextPressedColor": "#FFFFFFFF",
 
+    "checkBoxTickColor": "#456078FF",
     "checkBoxGradientStartColor": "#8892EBFF",
     "checkBoxGradientEndColor": "#9DD4F3FF",
 

diff --git a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml
@@ -118,16 +118,22 @@ Dex.Rectangle
                 showAssetStandards: useStandardsCheckBox.checked
             }
 
-            Dex.DefaultCheckBox
-            {
-                id: useStandardsCheckBox
-                Layout.preferredWidth: 150
-                Layout.fillHeight: true
-                Layout.leftMargin: 4
-                boxWidth: 22
-                boxHeight: 22
-                text: qsTr("Use standard network address")
-                font: Dex.DexTypo.caption
+            RowLayout {
+                id: rowLayout
+                spacing: 4
+                Dex.DefaultCheckBox
+                {
+                    id: useStandardsCheckBox
+                    Layout.preferredWidth: 30
+                    Layout.fillHeight: true
+                    Layout.leftMargin: 4
+                }
+                Dex.DefaultText {
+                    Layout.minimumWidth: 120
+                    Layout.maximumWidth: 120
+                    text: qsTr("Use standard network address")
+                    font: Dex.DexTypo.caption
+                }
             }
         }
 

diff --git a/atomic_defi_design/Dex/Components/DexCheckBox.qml b/atomic_defi_design/Dex/Components/DexCheckBox.qml
@@ -26,9 +26,9 @@ CheckBox
         id: _indicator
         anchors.verticalCenter: control.verticalCenter
 
-        implicitWidth: 26
-        implicitHeight: 26
-        radius: 20
+        implicitWidth: 20
+        implicitHeight: 20
+        radius: 4
 
         gradient: Gradient
         {
@@ -37,6 +37,23 @@ CheckBox
             GradientStop { position: 0.6; color: Dex.CurrentTheme.checkBoxGradientEndColor }
         }
 
+        DefaultImage {
+            id: check_icon
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            width: parent.width - 6
+            height: parent.height - 6
+            source: General.image_path + "white_check.svg"
+            visible: control.checkState === Qt.Checked
+        }
+
+        DefaultColorOverlay
+        {
+            anchors.fill: check_icon
+            source: check_icon
+            color: Dex.CurrentTheme.checkBoxTickColor
+        }
+
         DefaultRectangle
         {
             visible: !control.checked
@@ -53,7 +70,6 @@ CheckBox
     {
         id: _content
         Layout.alignment: Qt.AlignVCenter
-        Layout.preferredWidth: labelWidth
         height: _label.height
         spacing: 0
 
@@ -63,8 +79,6 @@ CheckBox
             text: control.text
             font: control.font
             color: control.textColor
-            Layout.alignment: Qt.AlignVCenter
-            Layout.fillWidth: true
             verticalAlignment: Text.AlignVCenter
             leftPadding: control.indicator.width + control.spacing
             wrapMode: Label.Wrap