Merge pull request #2296 from KomodoPlatform/dev

v0.5.8 Release candidate
KomodoPlatform · Jun 27, 2023 · 3b17aa4 · 3b17aa4
2 parents bea819c + d08ab51
commit 3b17aa4
Show file tree

Hide file tree

Showing 107 changed files with 3,540 additions and 2,863 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.2]
+ - AtomicDEX Version: [e.g. 0.5.8]
  - Build branch: [e.g. master/dev] 
 
 

diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/atomicdex-desktop-cd.yml
@@ -9,6 +9,7 @@ env:
   DEX_PROJECT_NAME: "atomicdex-desktop"
   DEX_DISPLAY_NAME: "AtomicDex Desktop"
   DEX_COMPANY: "KomodoPlatform"
+  DEX_VERSION: "0.5.8"
   DEX_WEBSITE: "https://atomicdex.io/"
 
 jobs:

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -16,6 +16,7 @@ env:
   DEX_PROJECT_NAME: "atomicdex-desktop"
   DEX_DISPLAY_NAME: "AtomicDex Desktop"
   DEX_COMPANY: "KomodoPlatform"
+  DEX_VERSION: "0.5.8"
   DEX_WEBSITE: "https://atomicdex.io/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite

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

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.5.7.2)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.8)
 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/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-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/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-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/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

diff --git a/assets/config/cfg.json b/assets/config/cfg.json
@@ -1,5 +1,6 @@
 {
   "notification_enabled": true,
+  "spamfilter_enabled": false,
   "current_currency": "USD",
   "current_fiat": "USD",
   "current_currency_sign": "$",

diff --git a/atomic_defi_design/Dex/App.qml b/atomic_defi_design/Dex/App.qml
@@ -32,7 +32,6 @@ DexRectangle
     property var notification_modal: notifications_modal
     property var logout_confirm_modal: logout_modal
     property var notifications_list: _currentPage === App.ScreenType.Dashboard ? loader.item.notifications_list : []
-    property bool segwit_on: false
 
     property var    _currentPage: API.app.wallet_mgr.log_status() ? App.ScreenType.Dashboard : App.ScreenType.Startup
     property var    _availablePages: [_startup, dashboard]

diff --git a/atomic_defi_design/Dex/Components/CexInfoModal.qml b/atomic_defi_design/Dex/Components/CexInfoModal.qml
@@ -17,9 +17,7 @@ MultipageModal {
             Layout.preferredHeight: 200
             Layout.fillWidth: true
 
-            text: qsTr('Market data (prices, charts, etc.) marked with the ⓘ icon originates from third-party sources.<br><br>Data is sourced via <a href="https://bandprotocol.com/">Band Decentralized Oracle</a> and <a href="https://coingecko.com">CoinGecko</a>.<br><br><b>Oracle Supported Pairs:</b><br>%1<br><br><b>Last reference (Band Oracle):</b><br><a href="%2">%2</a>')
-                            .arg(API.app.portfolio_pg.oracle_price_supported_pairs.join(', '))
-                            .arg(API.app.portfolio_pg.oracle_last_price_reference)
+            text: qsTr('Market data (prices, charts, etc.) marked with the ⓘ icon originates from third-party sources.<br><br>Data is sourced via <a href="https://coingecko.com">CoinGecko</a>.')
         }
     }
 }
diff --git a/atomic_defi_design/Dex/Components/CoinTypeTag.qml b/atomic_defi_design/Dex/Components/CoinTypeTag.qml
@@ -1,22 +1,22 @@
-import QtQuick 2.15
-import "../Constants"
-import App 1.0
-
-AnimatedRectangle {
-    property string type
-    radius: 20
-
-    height: type_tag.font.pixelSize * 1.5
-    width: type_tag.width + 8
-
-    color: Style.getCoinTypeColor(type)
-
-    DexLabel {
-        id: type_tag
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-        text: type
-        color: Style.getCoinTypeTextColor(type)
-        font: DexTypo.overLine
-    }
-}
+import QtQuick 2.15
+import "../Constants"
+import App 1.0
+
+AnimatedRectangle {
+    property string type
+    radius: 20
+
+    height: type_tag.font.pixelSize * 1.5
+    width: type_tag.width + 8
+
+    color: Style.getCoinTypeColor(type)
+
+    DexLabel {
+        id: type_tag
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: type
+        color: Style.getCoinTypeTextColor(type)
+        font: DexTypo.overLine
+    }
+}
diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml
@@ -331,121 +331,4 @@ QtObject {
         return Style.colorWhite4
     }
 
-    function getCoinColor(ticker) {
-        const c = colorCoin[ticker]
-        return c || Style.colorTheme2
-    }
-
-    readonly property var colorCoin: ({
-                                          "ARPA": "#CCD9E2",
-                                          "BCH": "#8DC351",
-                                          "BTC": "#F7931A",
-                                          "CLC": "#0970DC",
-                                          "FTC": "#FFFFFF",
-                                          "GLEEC": "#8C41FF",
-                                          "GRS": "#377E96",
-                                          "DOGE": "#C3A634",
-                                          "ETH": "#627EEA",
-                                          "KMD": "#2B6680",
-                                          "MORTY": "#A4764D",
-                                          "RICK": "#A5CBDD",
-                                          "EMC2": "#00CCFF",
-                                          "DASH": "#008CE7",
-                                          "RVN": "#384182",
-                                          "DGB": "#006AD2",
-                                          "FIRO": "#BB2100",
-                                          "LTC": "#BFBBBB",
-                                          "ZEC": "#ECB244",
-                                          "ZER": "#FFFFFF",
-                                          "NAV": "#7D59B5",
-                                          "DP": "#E41D25",
-                                          "ECA": "#A915DC",
-                                          "QTUM": "#2E9AD0",
-                                          "CHIPS": "#598182",
-                                          "AXE": "#C63877",
-                                          "PANGEA": "#D88245",
-                                          "JUMBLR": "#2B4649",
-                                          "DEX": "#43B7B6",
-                                          "COQUI": "#79A541",
-                                          "CRYPTO": "#F58736",
-                                          "LABS": "#C1F6E1",
-                                          "MGW": "#854F2F",
-                                          "MONA": "#DEC799",
-                                          "NMC": "#186C9D",
-                                          "RFOX": "#D83331",
-                                          "BOTS": "#F69B57",
-                                          "MCL": "#EA0000",
-                                          "CCL": "#FFE400",
-                                          "BET": "#F69B57",
-                                          "SUPERNET": "#F69B57",
-                                          "OOT": "#25AAE1",
-                                          "REVS": "#F69B57",
-                                          "ILN": "#523170",
-                                          "VRSC": "#3164D3",
-                                          "THC": "#819F6F",
-                                          "1INCH": "#95A7C5",
-                                          "BAT": "#FF5000",
-                                          "BUSD": "#EDB70B",
-                                          "DAI": "#B68900",
-                                          "USDC": "#317BCB",
-                                          "PAX": "#EDE70A",
-                                          "SUSHI": "#E25DA8",
-                                          "TUSD": "#2E3181",
-                                          "AWC": "#31A5F6",
-                                          "VRA": "#D70A41",
-                                          "SPACE": "#E44C65",
-                                          "QC": "#00D7B3",
-                                          "PBC": "#64A3CB",
-                                          "AAVE": "#9C64A6",
-                                          "ANT": "#33DAE6",
-                                          "AGI": "#6815FF",
-                                          "BAND": "#526BFF",
-                                          "BLK": "#191919",
-                                          "BNT": "#000D2B",
-                                          "BTCZ": "#F5B036",
-                                          "CEL": "#4055A6",
-                                          "CENNZ": "#2E87F1",
-                                          "COMP": "#00DBA3",
-                                          "CRO": "#243565",
-                                          "CVC": "#3AB03E",
-                                          "CVT": "#4B0082",
-                                          "DODO": "#FFF706",
-                                          "ELF": "#2B5EBB",
-                                          "ENJ": "#6752C3",
-                                          "EURS": "#2F77ED",
-                                          "FUN": "#EF1C70",
-                                          "GNO": "#00B0CC",
-                                          "HOT": "#983EFF",
-                                          "IOTX": "#00CDCE",
-                                          "KNC": "#117980",
-                                          "LEO": "#F79B2C",
-                                          "LINK": "#356CE4",
-                                          "LRC": "#32C2F8",
-                                          "MANA": "#FF3C6C",
-                                          "MATIC": "#1E61ED",
-                                          "MED": "#00B5FF",
-                                          "MKR": "#1BAF9F",
-                                          "NPXS": "#F3CB00",
-                                          "POWR": "#05BCAA",
-                                          "QI": "#FFFFFF",
-                                          "QIAIR": "#FEFEFE",
-                                          "QKC": "#2175B4",
-                                          "QNT": "#46DDC8",
-                                          "REP": "#0E0E21",
-                                          "REV": "#78034D",
-                                          "RLC": "#FFE100",
-                                          "SFUSD": "#9881B8",
-                                          "SNT": "#596BED",
-                                          "SNX": "#00D1FF",
-                                          "SOULJA": "#8F734A",
-                                          "STORJ": "#2683FF",
-                                          "TSL": "#64B082",
-                                          "VRM": "#586A7A",
-                                          "WSB": "#FEBB84",
-                                          "WBTC": "#CCCCCC",
-                                          "YFI": "#006BE6",
-                                          "ZRX": "#302C2C",
-                                          "UNI": "#FF007A",
-                                          "RUNES": "#336699"
-                                      })
 }
diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -87,6 +87,16 @@ QtObject {
         return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_wallet_only
     }
 
+    function isFaucetCoin(ticker)
+    {
+        return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
+    }
+
+    function isCoinWithMemo(ticker) {
+        const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
+        return coin_info.has_memos
+    }
+
     function getLanguage()
     {
         return API.app.settings_pg.lang
@@ -111,17 +121,22 @@ QtObject {
     {
         let progress = 100
         if (!activation_status.hasOwnProperty("result")) return progress
+        // console.log("["+coin+"] [zhtlcActivationProgress]: " + JSON.stringify(activation_status))
         let status = activation_status.result.status
         let details = activation_status.result.details
 
         let block_offset = 0
-        if (coin == 'ARRR') block_offset = 1900000
+        if (coin == 'ARRR') block_offset = 2000000
 
         // use range from checkpoint block to present
-        if (status == "Ready")
+        if (!status)
+        {
+            return -1
+        }
+        else if (status == "Ok")
         {
             if (details.hasOwnProperty("error"))
-                console.log("[zhtlcActivationProgress] Error enabling: " + JSON.stringify(details.error))
+                console.log("["+coin+"] [zhtlcActivationProgress] Error enabling: " + JSON.stringify(details.error))
         }
         else if (status == "InProgress")
         {
@@ -140,7 +155,7 @@ QtObject {
             else if (details.hasOwnProperty("RequestingBalance")) progress = 98
             else progress = 5
         }
-        else console.log("[zhtlcActivationProgress] Unexpected status: " + status)
+        else console.log("["+coin+"] [zhtlcActivationProgress] Unexpected status: " + status)
         return progress
     }
 

diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml
@@ -196,6 +196,7 @@ QtObject {
             case 'Ethereum Classic':  return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"]
             case 'Arbitrum':          return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
             case 'ERC-20':            return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
+            case 'EWT':               return dark_theme ? colorCoinDark["EWT"] : colorCoin["EWT"]
             case 'FTM-20':            return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"]
             case 'Moonbeam':          return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"]
             case 'HecoChain':         return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"]
@@ -237,6 +238,7 @@ QtObject {
             case 'Ethereum Classic':  return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"]
             case 'Arbitrum':          return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
             case 'ERC-20':            return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
+            case 'EWT':               return dark_theme ? colorCoinDark["EWT"] : colorCoin["EWT"]
             case 'FTM-20':            return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"]
             case 'Moonbeam':          return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"]
             case 'HecoChain':         return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"]
@@ -256,7 +258,7 @@ QtObject {
 
     function getCoinColor(ticker) {
         let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
-        if (!info.type) { return dark_theme ? colorCoin["default"] : colorCoinDark["default"] }
+        if (!info.type) { return colorWhite3 }
         let color = getCoinGroupTextColor(info.type)
         let base_ticker = atomic_qt_utilities.retrieve_main_ticker(ticker)
         if (colorCoin.hasOwnProperty(base_ticker) && !dark_theme)
@@ -278,6 +280,7 @@ QtObject {
                                           "BCH": "#8DC351",
                                           "ETC": "#328432",
                                           "ETH": "#687DE3",
+                                          "EWT": "#A466FF",
                                           "FTM": "#13B5EC",
                                           "HECO": "#00953F",                             
                                           "GLMR": "#F6007C",
@@ -303,6 +306,7 @@ QtObject {
                                           "BCH": "#8DC351",
                                           "ETC": "#328432",
                                           "ETH": "#687DE3",
+                                          "EWT": "#A466FF",
                                           "FTM": "#13B5EC",
                                           "HECO": "#00953F",                             
                                           "GLMR": "#F6007C",

diff --git a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml
@@ -234,28 +234,20 @@ DexPopup
 
     function onBalanceUpdateStatus(am_i_sender, amount, ticker, human_date, timestamp)
     {
-
-        if (!app.segwit_on)
+        if (amount != 0)
         {
-            if (amount != 0)
-            {
-                newNotification(
-                    balanceUpdateStatusNotification,
-                    {
-                        am_i_sender,
-                        amount,
-                        ticker,
-                        human_date,
-                        timestamp
-                    },
-                    timestamp,
+            newNotification(
+                balanceUpdateStatusNotification,
+                {
+                    am_i_sender,
+                    amount,
+                    ticker,
                     human_date,
-                    "open_wallet_page")
-            }
-        }
-        else
-        {
-            app.segwit_on = false
+                    timestamp
+                },
+                timestamp,
+                human_date,
+                "open_wallet_page")
         }
     }