Merge pull request #335 from KomodoPlatform/dev

0.2.0
KomodoPlatform · Jul 27, 2020 · 5755498 · 5755498
2 parents 462c77d + 6e44bd4
commit 5755498
Show file tree

Hide file tree

Showing 199 changed files with 12,836 additions and 3,972 deletions.
diff --git a/.github/workflows/atomicdexpro_ci.yml b/.github/workflows/atomicdexpro_ci.yml
@@ -143,8 +143,8 @@ jobs:
           nimble build -y
 
           #./ci_tools_atomic_dex --install_dependencies
-          ./ci_tools_atomic_dex build debug
-          ./ci_tools_atomic_dex bundle debug
+          ./ci_tools_atomic_dex build release
+          ./ci_tools_atomic_dex bundle release
 
 
       - name: Running Tests (Linux)
@@ -161,8 +161,8 @@ jobs:
           export CXX=clang++-9
           export CC=clang-9
           echo "Running tests"
-          ./ci_tools_atomic_dex tests debug
-          cd build-Debug/bin/AntaraAtomicDexTestsAppDir/usr/bin
+          ./ci_tools_atomic_dex tests release
+          cd build-Release/bin/AntaraAtomicDexTestsAppDir/usr/bin
           cat atomic-dex-tests-result.xml
           curl https://report.ci/upload.py --output upload.py
           ls
@@ -172,8 +172,8 @@ jobs:
       - name: Upload bundle artifact (Linux)
         uses: actions/upload-artifact@v1
         with:
-          name: dexpro-ubuntu-debug.tar.gz
-          path: ./ci_tools_atomic_dex/bundle-Debug/AntaraAtomicDexAppDir.tar.gz
+          name: dexpro-ubuntu-release.tar.gz
+          path: ./ci_tools_atomic_dex/bundle-Release/AntaraAtomicDexAppDir.tar.gz
 
 
   macos-build:
@@ -265,8 +265,8 @@ jobs:
           export QT_ROOT=${{ github.workspace }}/Qt/5.15.0
           cd ci_tools_atomic_dex
           nimble build -y
-          ./ci_tools_atomic_dex bundle debug --osx_sdk=$HOME/sdk/MacOSX10.13.sdk --compiler=/usr/local/opt/llvm@9/bin/clang++
-          ls bundle-Debug/atomicDEX-Pro.dmg
+          ./ci_tools_atomic_dex bundle release --osx_sdk=$HOME/sdk/MacOSX10.13.sdk --compiler=/usr/local/opt/llvm@9/bin/clang++
+          ls bundle-Release/atomicDEX-Pro.dmg
 
       - name: Running Tests (MacOS)
         env: # Or as an environment variable
@@ -276,8 +276,8 @@ jobs:
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/5.15.0/clang_64/lib/cmake
           export QT_ROOT=${{ github.workspace }}/Qt/5.15.0
           echo "Running tests"
-          ./ci_tools_atomic_dex tests debug
-          cd build-Debug/bin/atomic_qt_tests.app/Contents/MacOS
+          ./ci_tools_atomic_dex tests release
+          cd build-Release/bin/atomic_qt_tests.app/Contents/MacOS
           cat atomic-dex-tests-result.xml
           curl https://report.ci/upload.py --output upload.py
           ls
@@ -288,8 +288,8 @@ jobs:
       - name: Upload artifacts (MacOS)
         uses: actions/upload-artifact@v1
         with:
-          name: dexpro-mac-debug.dmg
-          path: ./ci_tools_atomic_dex/bundle-Debug/atomicDEX-Pro.dmg
+          name: dexpro-mac-release.dmg
+          path: ./ci_tools_atomic_dex/bundle-Release/atomicDEX-Pro.dmg
 
   windows-build:
     name: Win Build
@@ -347,17 +347,17 @@ jobs:
           nimble build -y
 
           # downloading debug dlls because powershell build doesnt put it
-          $SHAORIG = "8B06E02CE77C48D6EE1993E2D532FE0B12650C77B24609BF4003ADE97826E8FE"
-          $DWFILE = ($PWD | select -exp Path) + '\debuglibs-win-dexpro.zip'
-          (New-Object System.Net.WebClient).DownloadFile('https://github.com/KomodoPlatform/depot/releases/download/0.1/debuglibs-win-atomicdexpro.zip', $DWFILE)
-          $SHADW = Get-FileHash -Algorithm SHA256 .\debuglibs-win-dexpro.zip | select -exp Hash
-          if ($SHADW -ne $SHAORIG) {Throw "Wrong hash: $SHADW =! $SHAORIG"}
+          #$SHAORIG = "8B06E02CE77C48D6EE1993E2D532FE0B12650C77B24609BF4003ADE97826E8FE"
+          #$DWFILE = ($PWD | select -exp Path) + '\debuglibs-win-dexpro.zip'
+          #(New-Object System.Net.WebClient).DownloadFile('https://github.com/KomodoPlatform/depot/releases/download/0.1/debuglibs-win-atomicdexpro.zip', $DWFILE)
+          #$SHADW = Get-FileHash -Algorithm SHA256 .\debuglibs-win-dexpro.zip | select -exp Hash
+          #if ($SHADW -ne $SHAORIG) {Throw "Wrong hash: $SHADW =! $SHAORIG"}
 
           #cmd /c '.\ci_tools_atomic_dex.exe --install_dependencies 2>&1'
-          cmd /c '.\ci_tools_atomic_dex.exe build debug 2>&1'
-          7z e -o'build-Debug\bin\' .\debuglibs-win-dexpro.zip
-          cmd /c '.\ci_tools_atomic_dex.exe bundle debug 2>&1'
-          ls bundle-Debug/bundle.zip
+          cmd /c '.\ci_tools_atomic_dex.exe build release 2>&1'
+          #7z e -o'build-release\bin\' .\debuglibs-win-dexpro.zip
+          cmd /c '.\ci_tools_atomic_dex.exe bundle release 2>&1'
+          ls bundle-Release/bundle.zip
 
       - name: Running Tests (Windows)
         shell: powershell
@@ -367,8 +367,8 @@ jobs:
         run: |
           echo "Running tests"
           $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\5.15.0\msvc2019_64"
-          cmd /c '.\ci_tools_atomic_dex.exe tests debug 2>&1'
-          cd build-Debug
+          cmd /c '.\ci_tools_atomic_dex.exe tests release 2>&1'
+          cd build-Release
           cd bin
           ls
           Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
@@ -377,5 +377,5 @@ jobs:
       - name: Upload artifacts (Windows)
         uses: actions/upload-artifact@v1
         with:
-          name: dexpro-win-debug.zip
-          path: ./ci_tools_atomic_dex/bundle-Debug/bundle.zip
+          name: dexpro-win-release.zip
+          path: ./ci_tools_atomic_dex/bundle-Release/bundle.zip
diff --git a/.github/workflows/linux_response_file.txt b/.github/workflows/linux_response_file.txt
@@ -2,6 +2,7 @@ entt
 folly
 boost-multiprecision
 boost-random
+boost-lockfree
 doctest
 fmt
 curl

diff --git a/.github/workflows/osx_response_file.txt b/.github/workflows/osx_response_file.txt
@@ -2,6 +2,7 @@ entt
 folly
 boost-multiprecision
 boost-random
+boost-lockfree
 doctest
 fmt
 curl

diff --git a/.github/workflows/windows_response_file.txt b/.github/workflows/windows_response_file.txt
@@ -2,6 +2,7 @@ entt:x64-Windows
 folly:x64-Windows
 boost-multiprecision:x64-Windows
 boost-random:x64-Windows
+boost-lockfree:x64-Windows
 doctest:x64-Windows
 fmt:x64-Windows
 curl:x64-Windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(atomic_qt LANGUAGES CXX VERSION 0.1.5)
+project(atomic_qt LANGUAGES CXX VERSION 0.2.0)
 
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -50,13 +47,13 @@ endif ()
 ##! We fetch our dependence
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2103/mm2-281d6ec86-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2165/mm2-e51a128c6-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2103/mm2-281d6ec86-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2165/mm2-e51a128c6-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2103/mm2-281d6ec86-Windows_NT-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.0.2165/mm2-e51a128c6-Windows_NT-Release.zip)
 endif ()
 
 FetchContent_Declare(jl777-coins
@@ -123,13 +120,16 @@ else ()
 endif ()
 add_library(unofficial-btc::bitcoin ALIAS unofficial-bitcoin)
 
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(TS_FILES
         ${CMAKE_SOURCE_DIR}/atomic_qt_design/assets/languages/atomic_qt_en.ts
         ${CMAKE_SOURCE_DIR}/atomic_qt_design/assets/languages/atomic_qt_fr.ts
         ${CMAKE_SOURCE_DIR}/atomic_qt_design/assets/languages/atomic_qt_tr.ts)
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_SOURCE_DIR}/atomic_qt_design/assets/languages/")
 qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR}/atomic_qt_design/qml ${TS_FILES})
-qt5_add_translation(qmFiles ${TS_FILES})
+#qt5_add_translation(qmFiles ${TS_FILES})
 message(STATUS "${QM_FILES}")
 message(STATUS "${TS_FILES}")
 
@@ -146,8 +146,22 @@ target_sources(atomic_qt_shared_deps INTERFACE
         ${CMAKE_SOURCE_DIR}/src/atomic.dex.provider.coinpaprika.api.cpp
         ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.bindings.cpp
         ${CMAKE_SOURCE_DIR}/src/atomic.dex.provider.coinpaprika.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.provider.cex.prices.api.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.provider.cex.prices.cpp
         ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.current.coin.infos.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.wallet.manager.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.utilities.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.wallet.config.cpp
         ${CMAKE_SOURCE_DIR}/src/atomic.dex.security.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.update.service.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.orders.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.orders.proxy.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.candlestick.charts.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.addressbook.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.addressbook.proxy.filter.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.contact.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.portfolio.model.cpp
+        ${CMAKE_SOURCE_DIR}/src/atomic.dex.qt.portfolio.proxy.filter.model.cpp
         $<$<PLATFORM_ID:Darwin>:${CMAKE_SOURCE_DIR}/src/osx/atomic.dex.osx.manager.mm>
         ${CMAKE_SOURCE_DIR}/qml.qrc
         ${qmFiles}
@@ -160,6 +174,8 @@ target_compile_definitions(atomic_qt_shared_deps
         $<$<PLATFORM_ID:Windows>:AUTO_DOWNLOAD>
         )
 
+#target_compile_options(atomic_qt_shared_deps INTERFACE -fstandalone-debug)
+
 target_link_libraries(atomic_qt_shared_deps
         INTERFACE
         Qt5::Core
@@ -180,6 +196,7 @@ target_link_libraries(atomic_qt_shared_deps
         spdlog::spdlog
         spdlog::spdlog_header_only
         )
+
 target_include_directories(atomic_qt_shared_deps
         INTERFACE
         ${CMAKE_CURRENT_SOURCE_DIR}/src
@@ -196,7 +213,11 @@ add_executable(atomic_qt MACOSX_BUNDLE ${ICON}
 ##! Testing executable
 add_executable(atomic_qt_tests MACOSX_BUNDLE ${ICON}
         src/atomic.dex.tests.cpp
-        src/atomic.dex.utilities.tests.cpp)
+        src/atomic.dex.wallet.config.tests.cpp
+        src/atomic.dex.utilities.tests.cpp
+        src/atomic.dex.provider.cex.prices.tests.cpp
+        src/atomic.dex.qt.utilities.tests.cpp
+        src/atomic.dex.provider.cex.prices.api.tests.cpp)
 
 target_link_libraries(atomic_qt
         PRIVATE
@@ -221,6 +242,9 @@ set_target_properties(${PROJECT_NAME}_tests
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
         )
 
+#target_enable_tsan(atomic_qt_tests)
+#target_enable_asan(atomic_qt)
+
 ##! Move assets
 if (LINUX)
     get_target_property(exe_runtime_directory_at ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ entt @@
     folly
     boost-multiprecision
     boost-random
+    boost-lockfree
     doctest
     fmt
     curl
@@ Expand Down @@