Merge branch 'KomodoPlatform:dev' into dev

electrumx-coin · Aug 23, 2024 · 899d966 · 899d966
2 parents 2a166a0 + eeb767c
commit 899d966
Show file tree

Hide file tree

Showing 198 changed files with 3,087 additions and 2,426 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 ]
- - Komodo Wallet Desktop Version: [e.g. 0.7.2]
+ - Komodo Wallet Desktop Version: [e.g. 0.8.0]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml
@@ -9,7 +9,7 @@ env:
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.7.2"
+  DEX_VERSION: "0.8.0"
   DEX_WEBSITE: "https://atomicdex.io/"
 
 jobs:

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -8,13 +8,13 @@ on:
       - dev
 
 env:
-  DEX_API: "mm2_kmd"
+  DEX_API: "kdf_kwd"
   DEX_RPCPORT: 7762
   DEX_RPC: "http://127.0.0.1:7762"
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.7.2"
+  DEX_VERSION: "0.8.0"
   DEX_WEBSITE: "https://atomicdex.io/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
@@ -156,9 +156,7 @@ jobs:
           export SHELL=/bin/bash
           echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
           export CHOOSENIM_CHOOSE_VERSION=1.6.2
-          curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
-          chmod +x choosenim.sh
-          ./choosenim.sh -y
+          ./ci_tools_atomic_dex/ci_scripts/choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
           chmod +x /home/runner/.choosenim/toolchains/nim-1.6.2/bin/*
 
@@ -167,9 +165,7 @@ jobs:
         run: |
           echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
           export CHOOSENIM_CHOOSE_VERSION=1.6.2
-          curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
-          chmod +x choosenim.sh
-          ./choosenim.sh -y
+          ./ci_tools_atomic_dex/ci_scripts/choosenim.sh -y
           export PATH=/Users/runner/.nimble/bin:$PATH
           chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.2/bin/*
 

diff --git a/.gitignore b/.gitignore
@@ -69,7 +69,7 @@ Thumbs.db
 # --------
 *.exe
 
-/assets/tools/mm2/
+/assets/tools/kdf/
 /ci_tools_atomic_dex/vcpkg-repo/
 /ci_tools_atomic_dex/ci_tools_atomic_dex
 ci_tools_atomic_dex/build-Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.2)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.0)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -59,14 +59,14 @@ endif ()
 
 ##! We fetch our dependencies
 if (APPLE)
-    FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip)
+    FetchContent_Declare(kdf
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
-    FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Linux-Release.zip)
+    FetchContent_Declare(kdf
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Linux-Release.zip)
 else ()
-    FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip)
+    FetchContent_Declare(kdf
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
@@ -83,20 +83,20 @@ FetchContent_Declare(jl777-coins
 #FetchContent_Declare(adex-generics-coins
 #        URL https://github.com/KomodoPlatform/komodo-wallet-desktop/archive/main.zip)
 
-FetchContent_MakeAvailable(mm2 jl777-coins qmaterial)
+FetchContent_MakeAvailable(kdf jl777-coins qmaterial)
 
 ##! Configure our needs.
 if (UNIX)
     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)
+    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/kdf/coins COPYONLY)
+    configure_file(${kdf_SOURCE_DIR}/mm2 ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/kdf/${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_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(${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)
+    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/coins COPYONLY)
+    configure_file(${kdf_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/${DEX_API}.exe COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/msvcp140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/vcruntime140.dll COPYONLY)
 endif ()
 
 

diff --git a/assets/tools/.gitignore b/assets/tools/.gitignore
@@ -1,2 +1,3 @@
 mm2
 coins
+kdf
diff --git a/atomic_defi_design/Dex/Components/DexLabel.qml b/atomic_defi_design/Dex/Components/DexLabel.qml
@@ -20,13 +20,10 @@ Text
         }
     }
 
+    text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value
     font: monospace ? Dex.DexTypo.monoSmall : Dex.DexTypo.body2
-
     color: enabled ? Dex.CurrentTheme.foregroundColor : Dex.CurrentTheme.textDisabledColor
-
-    text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value
     wrapMode: Text.WordWrap
-
     onLinkActivated: Qt.openUrlExternally(link)
     linkColor: color
 }
diff --git a/atomic_defi_design/Dex/Components/DexTextField.qml b/atomic_defi_design/Dex/Components/DexTextField.qml
@@ -10,6 +10,8 @@ TextField
 
     property alias left_text: left_text.text_value
     property alias right_text: right_text.text_value
+    property alias left_fontsize: left_text.font.pixelSize
+    property alias right_fontsize: right_text.font.pixelSize
     property alias radius: background.radius
     property color backgroundColor: Dex.CurrentTheme.textFieldBackgroundColor
     property color backgroundColorActive: Dex.CurrentTheme.textFieldActiveBackgroundColor

diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml
@@ -30,7 +30,8 @@ DexRectangle
     Layout.leftMargin: 10
     Layout.rightMargin: 20
 
-    Dex.Text{
+    DexLabel
+    {
         anchors.bottom: parent.top
         anchors.bottomMargin: 5
         anchors.horizontalCenter: parent.horizontalCenter
@@ -46,6 +47,7 @@ DexRectangle
         Layout.leftMargin: 20
         Layout.rightMargin: 20
 
+        // Coin Icon
         Dex.Image
         {
             id: icon
@@ -58,49 +60,46 @@ DexRectangle
             Layout.topMargin: 0
             Layout.bottomMargin: 0
         }
+
+        //
         ColumnLayout
         {
             spacing: 2
             Layout.alignment: Qt.AlignVCenter
 
-            Dex.Text
+            DexLabel
             {
                 Layout.preferredWidth: parent.width - 15
-
                 text_value: `<font color="${Style.getCoinColor(ticker)}"><b>${ticker}</b></font>&nbsp;&nbsp;&nbsp;<font color="${Dex.CurrentTheme.foregroundColor}">${fullname}</font>`
-                font.pixelSize: Style.textSizeSmall3
+                font: Dex.DexTypo.body2
                 elide: Text.ElideRight
                 wrapMode: Text.NoWrap
             }
 
-            Dex.Text
+            DexLabel
             {
                 id: middle_line
-
                 property string coin_value: amount
-                text: coin_value
+                text_value: coin_value
                 Layout.fillWidth: true
                 elide: Text.ElideRight
-                color: Dex.CurrentTheme.foregroundColor
-                font: DexTypo.body2
                 wrapMode: Label.NoWrap
-                ToolTip.text: coin_value
-                Component.onCompleted: font.pixelSize = 11.5
+                font: DexTypo.body3
+                ToolTip.text: text_value
+                privacy: true
             }
 
-            Dex.Text
+            DexLabel
             {
                 id: bottom_line
-
                 property string fiat_value: General.getFiatText(amount, ticker)
-                text: fiat_value
+                text_value: fiat_value
                 Layout.fillWidth: true
                 elide: Text.ElideRight
-                color: Dex.CurrentTheme.foregroundColor
-                font: DexTypo.body2
+                font: DexTypo.body3
                 wrapMode: Label.NoWrap
-                ToolTip.text: fiat_value
-                Component.onCompleted: font.pixelSize = 11.5
+                ToolTip.text: text_value
+                privacy: true
             }
         }
     }

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -175,7 +175,7 @@ QtObject {
     }
 
     function coinContractAddress(ticker) {
-        var cfg = API.app.trading_pg.get_raw_mm2_coin_cfg(ticker)
+        var cfg = API.app.trading_pg.get_raw_kdf_coin_cfg(ticker)
         if (cfg.hasOwnProperty('protocol')) {
             if (cfg.protocol.hasOwnProperty('protocol_data')) {
                 if (cfg.protocol.protocol_data.hasOwnProperty('contract_address')) {
@@ -187,7 +187,7 @@ QtObject {
     }
 
     function coinPlatform(ticker) {
-        var cfg = API.app.trading_pg.get_raw_mm2_coin_cfg(ticker)
+        var cfg = API.app.trading_pg.get_raw_kdf_coin_cfg(ticker)
         if (cfg.hasOwnProperty('protocol')) {
             if (cfg.protocol.hasOwnProperty('protocol_data')) {
                 if (cfg.protocol.protocol_data.hasOwnProperty('platform')) {
@@ -419,6 +419,14 @@ QtObject {
     }
 
     function getFeesDetail(fees) {
+        if (privacy_mode) {
+            return [
+                {"label": privacy_text},
+                {"label": privacy_text},
+                {"label": privacy_text},
+                {"label": privacy_text}
+            ]
+        } 
         return [
             {"label": qsTr("<b>Taker tx fee:</b> "), "fee": fees.base_transaction_fees, "ticker": fees.base_transaction_fees_ticker},
             {"label": qsTr("<b>Dex tx fee:</b> "), "fee": fees.fee_to_send_taker_fee, "ticker": fees.fee_to_send_taker_fee_ticker},
@@ -435,6 +443,10 @@ QtObject {
     }
 
     function getSimpleFromPlaceholder(selectedTicker, selectedOrder, sell_ticker_balance) {
+        if (privacy_mode)
+        {
+            return "0"
+        }
         if (sell_ticker_balance == 0)
         {
             return qsTr("%1 balance is zero").arg(selectedTicker)
@@ -489,6 +501,7 @@ QtObject {
     }
 
     function getTxExplorerURL(ticker, txid, add_0x=true) {
+        if (privacy_mode) return ''
         if(txid !== '') {
             const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
             const txid_prefix = (add_0x && coin_info.is_erc_family) ? '0x' : ''
@@ -497,6 +510,7 @@ QtObject {
     }
 
     function getAddressExplorerURL(ticker, address) {
+        if (privacy_mode) return ''
         if(address !== '') {
             const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
             return coin_info.explorer_url + addressTxUri(coin_info) + address
@@ -505,12 +519,14 @@ QtObject {
     }
 
     function viewTxAtExplorer(ticker, txid, add_0x=true) {
+        if (privacy_mode) return ''
         if(txid !== '') {
             Qt.openUrlExternally(getTxExplorerURL(ticker, txid, add_0x))
         }
     }
 
     function viewAddressAtExplorer(ticker, address) {
+        if (privacy_mode) return ''
         if(address !== '') {
             Qt.openUrlExternally(getAddressExplorerURL(ticker, address))
         }
@@ -555,6 +571,7 @@ QtObject {
     }
 
     function convertUsd(v) {
+        if (privacy_mode) return ''
         let rate = API.app.get_rate_conversion("USD", API.app.settings_pg.current_currency)
         let value = parseFloat(v) / parseFloat(rate)
 
@@ -566,6 +583,7 @@ QtObject {
     }
 
     function formatFiat(received, amount, fiat, precision=2) {
+        if (privacy_mode) return ''
         if (precision == 2 && fiat == "BTC") {
             precision = 8
         }
@@ -575,6 +593,7 @@ QtObject {
     }
 
     function formatPercent(value, show_prefix=true) {
+        if (privacy_mode) return ''
         let prefix = ''
         if(value > 0) prefix = '+ '
         else if(value < 0) {
@@ -619,6 +638,7 @@ QtObject {
     }
 
     function formatCrypto(received, amount, ticker, fiat_amount, fiat, precision, trail_zeros) {
+        if (privacy_mode) return ''
         return diffPrefix(received) + ticker + " " + formatDouble(amount, precision, trail_zeros) + (fiat_amount ? " (" + formatFiat("", fiat_amount, fiat) + ")" : "")
     }
 
@@ -777,15 +797,10 @@ QtObject {
     }
 
     function feeText(trade_info, base_ticker, has_info_icon=true, has_limited_space=false) {
-
-
         if(!trade_info || !trade_info.trading_fee) return ""
-
         const tx_fee = txFeeText(trade_info, base_ticker, has_info_icon, has_limited_space)
         const trading_fee = tradingFeeText(trade_info, base_ticker, has_info_icon)
         const minimum_amount = minimumtradingFeeText(trade_info, base_ticker, has_info_icon)
-
-
         return tx_fee + "\n" + trading_fee +"<br>"+minimum_amount
     }
 
@@ -804,13 +819,9 @@ QtObject {
     }
 
     function txFeeText(trade_info, base_ticker, has_info_icon=true, has_limited_space=false) {
-
         if(!trade_info || !trade_info.trading_fee) return ""
-
         const has_parent_coin_fees = hasParentCoinFees(trade_info)
-
          var info =  qsTr('%1 Transaction Fee'.arg(trade_info.base_transaction_fees_ticker))+': '+ trade_info.base_transaction_fees + " (%1)".arg(getFiatText(trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker, has_info_icon))
-
         if (has_parent_coin_fees) {
             info = info+"<br>"+qsTr('%1 Transaction Fee'.arg(trade_info.rel_transaction_fees_ticker))+': '+ trade_info.rel_transaction_fees + " (%1)".arg(getFiatText(trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker, has_info_icon))
         }

diff --git a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml
@@ -87,9 +87,9 @@ RowLayout
             Dex.Text
             {
                 id: middle_line
-
                 property string coin_value: !details ? "" : details.balance
-                text: coin_value
+                text_value: coin_value
+                privacy: true
                 Layout.fillWidth: true
                 elide: Text.ElideRight
                 color: Dex.CurrentTheme.foregroundColor
@@ -105,13 +105,14 @@ RowLayout
 
                 property string fiat_value: !details ? "" :
                             General.formatFiat("", details.main_currency_balance, API.app.settings_pg.current_currency)
-                text: fiat_value
+                text_value: fiat_value
                 Layout.fillWidth: true
                 elide: Text.ElideRight
                 color: Dex.CurrentTheme.foregroundColor
                 font: DexTypo.body2
                 wrapMode: Label.NoWrap
                 ToolTip.text: fiat_value
+                privacy: true
                 Component.onCompleted: font.pixelSize = 11
             }
         }