Merge remote-tracking branch 'upstream/master' into upstream_0.6.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Something looks wierd or doesn't work as expected? Let us know the details so we can fix it!
+about: Something looks weird or doesn't work as expected? Let us know the details so we can fix it!
 title: "[BUG]: "
 labels: bug
 assignees: ''
@@ -26,10 +26,10 @@ 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]
+ - Komodo Wallet Version: [e.g. 0.6.1]
  - Build branch: [e.g. master/dev] 
 
 
 **Additional context**
  - Add any related context about the problem here (e.g. screen resolution, mining activity on address)
- - Attach [log files](https://forum.komodoplatform.com/t/accessing-atomicdex-desktop-log-files/540)
+ - Attach [log files](https://forum.komodoplatform.com/t/accessing-komodo-wallet-desktop-log-files/540)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -16,9 +16,9 @@ A clear and concise description of how your solution could be implemented.
 
 
 **Describe alternatives you've considered**
-Have you considered any alternative approaches to solving to the problem?
+Have you considered any alternative approaches to solving the problem?
 
 
 **Additional context**
 For visual features, screenshots are great to include.
-If your request is similar to a feature frm a different app, please include a link.
+If your request is similar to a feature from a different app, please include a link.

.github/ISSUE_TEMPLATE/support.md

@@ -8,5 +8,5 @@ assignees: ''
 ---
 
 [Komodo Platform Discord Support Channel](https://discord.gg/RRZ8hzc)
-[Komodo Platform Forum](https://forum.komodoplatform.com/t/atomicdex-desktop-collection/541)
+[Komodo Platform Forum](https://forum.komodoplatform.com/t/komodo-wallet-desktop-collection/541)
 [Develper Documentation](https://developers.komodoplatform.com/)

.github/workflows/firodex-desktop-cd.yml

@@ -9,6 +9,7 @@ env:
   DEX_PROJECT_NAME: "firodex-desktop"
   DEX_DISPLAY_NAME: "FiroDex Desktop"
   DEX_COMPANY: "Firo Core Team"
+  DEX_VERSION: "0.6.1"
   DEX_WEBSITE: "https://firo.org/"
 
 jobs:

.gitignore

@@ -1,6 +1,6 @@
 # This file is used to ignore files which are generated
 # ----------------------------------------------------------------------------
-
+.vscode/
 *~
 *.autosave
 *.a

.gitlab-ci.yml

@@ -18,9 +18,9 @@ variables:
 cache:
   - key: $CI_COMMIT_REF_SLUG
     paths:
-      - atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
-      - atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
-      - atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
+      - komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
+      - komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
+      - komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
   - key: $CI_PROJECT_NAME
     paths:
       - "$CI_PROJECT_DIR/.cache/vcpkg"
@@ -68,12 +68,12 @@ linux:build:
     - rm -rf build_ninja || echo "no build_ninja folder to rm"
     - mkdir build_ninja && cd $_
     - cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../
-    - ninja atomicdex-desktop 
     - ninja install  
+    - ninja komodo-wallet
     - cd $CI_PROJECT_DIR
-    - cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip .
-    - cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst .
-    - cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage .
+    - cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip .
+    - cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst .
+    - cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage .
 
 AtomicDex-linux-zip:
   stage: upload_linux_zip
@@ -83,7 +83,7 @@ AtomicDex-linux-zip:
   artifacts:
     name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.zip"
     paths:
-      - $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
+      - $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
     when: always
     expire_in: 3 days
 
@@ -95,7 +95,7 @@ AtomicDex-linux-AppImage:
   artifacts:
     name: "AtomicDex-linux-${CI_COMMIT_SHA::9}-AppImage"
     paths:
-      - $CI_PROJECT_DIR/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
+      - $CI_PROJECT_DIR/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
     when: always
     expire_in: 3 days
 
@@ -107,6 +107,6 @@ AtomicDex-linux-tar:
   artifacts:
     name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.tar.zst"
     paths:
-      - $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
+      - $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
     when: always
     expire_in: 3 days

CMakeLists.txt

@@ -11,7 +11,7 @@ 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.6.1)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -60,13 +60,13 @@ endif ()
 ##! We fetch our dependencies
 if (APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Windows_NT-Release.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
@@ -81,24 +81,25 @@ FetchContent_Declare(jl777-coins
         URL https://github.com/KomodoPlatform/coins/archive/master.zip)
 
 #FetchContent_Declare(adex-generics-coins
-#        URL https://github.com/KomodoPlatform/atomicdex-desktop-generics/archive/main.zip)
+#        URL https://github.com/KomodoPlatform/komodo-wallet-desktop/archive/main.zip)
 
 FetchContent_MakeAvailable(mm2 jl777-coins qmaterial)
 
 ##! Configure our needs.
 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}/utils/coins_config_tcp.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}/utils/coins_config_tcp.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)
     configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
 endif ()
 
+
 add_subdirectory(vendor/antara-gaming_sdk/modules)
 
 ##! Osx bundle icon

CMakeLists.txt.user

@@ -104,7 +104,7 @@
 -DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}
 -DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}
 -DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\MSI\atomicDEX-Desktop\build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\MSI\komodo-wallet-desktop\build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
@@ -215,15 +215,15 @@
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/MSI/atomicDEX-Desktop/build/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/MSI/komodo-wallet-desktop/build/bin</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
     <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
@@ -286,15 +286,15 @@
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop_tests</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop_tests</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop_tests</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet_tests</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet_tests</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet_tests</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/MSI/atomicDEX-Desktop/build/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/MSI/komodo-wallet-desktop/build/bin</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
   </valuemap>