Merge pull request #32 from KomodoPlatform/firoorg-dev

v0.7.0 Update

Author: levonpetrosyan93

.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 Version: [e.g. 0.6.1]
+ - Komodo Wallet Version: [e.g. 0.7.0]
  - Build branch: [e.g. master/dev] 
 
 

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

@@ -9,7 +9,7 @@ env:
   DEX_PROJECT_NAME: "firodex-desktop"
   DEX_DISPLAY_NAME: "FiroDex Desktop"
   DEX_COMPANY: "Firo Core Team"
-  DEX_VERSION: "0.6.1"
+  DEX_VERSION: "0.7.0"
   DEX_WEBSITE: "https://firo.org/"
 
 jobs:
@@ -21,6 +21,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: setup cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - name: Install QT (Linux/Release)
         uses: jurplel/install-qt-action@v2
         with:

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

@@ -11,13 +11,18 @@ on:
     - cron: '0 0 * * 1'
 
 env:
-  DEX_API: "mm2"
-  DEX_RPCPORT: 7783
-  DEX_RPC: "http://127.0.0.1:7783"
+  DEX_API: "mm2_firo"
+  DEX_RPCPORT: 7653
+  DEX_RPC: "http://127.0.0.1:7653"
   DEX_PROJECT_NAME: "firodex"
   DEX_DISPLAY_NAME: "Firo Dex"
   DEX_COMPANY: "Firo"
+  DEX_VERSION: "0.7.0"
   DEX_WEBSITE: "https://firo.org/"
+  VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
+  VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
+  RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
+  VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
 
 jobs:
 
@@ -51,13 +56,13 @@ jobs:
             host: 'linux'
 
           - name: osx-release
-            os: macos-11
+            os: macos-12
             qt: '5.15.2'
             type: 'Release'
             host: 'mac'
 
           - name: osx-debug
-            os: macos-11
+            os: macos-12
             qt: '5.15.2'
             type: 'Debug'
             host: 'mac'
@@ -80,6 +85,13 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
+      - name: setup cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:

CMakeLists.txt

@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.6.1)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.7.0)
 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/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Darwin-Release.zip)
+            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-mac-x86-64.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Linux-Release.zip)
+            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-linux-x86-64.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v1.0.7-beta/mm2-79f620559-Win64.zip)
+            URL https://sdk.devbuilds.komodo.earth/main/mm2_b0fd99e-win-x86-64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

assets/config/cfg.json

@@ -1,6 +1,7 @@
 {
   "notification_enabled": true,
   "spamfilter_enabled": false,
+  "use_static_rpcpass": false,
   "current_currency": "USD",
   "current_fiat": "USD",
   "current_currency_sign": "$",
@@ -40,9 +41,13 @@
     "HUF": "Ft",
     "SEK": "kr",
     "KMD": "KMD",
+    "DOGE": "Ð",
+    "ETH": "⟠",
+    "ETH_ALT": "Ξ",
     "BTC": "₿",
     "BTC_ALT": "฿",
-    "LTC": "Ł"
+    "LTC": "Ł",
+    "FIRO": "FIRO"
   },
   "available_fiat": [
     "USD",
@@ -90,6 +95,9 @@
   "possible_currencies": [
     "USD",
     "BTC",
-    "KMD"
+    "KMD",
+    "LTC",
+    "DOGE",
+    "FIRO"
   ]
 }

atomic_defi_design/Dex/Addressbook/AddAddressForm.qml

@@ -31,6 +31,9 @@ Dex.Rectangle
             case "QRC-20":      return "QTUM"
             case "BEP-20":      return "BNB"
             case "ERC-20":      return "ETH"
+            case "AVX-20":      return "AVAX"
+            case "FTM-20":      return "FTM"
+            case "PLG-20":      return "MATIC"
             case "Smart Chain": return "KMD"
             case "SLP":         return "USDT-SLP"
         }
@@ -49,6 +52,9 @@ Dex.Rectangle
             case "QRC-20":      return true
             case "BEP-20":      return true
             case "ERC-20":      return true
+            case "PLG-20":      return true
+            case "AVX-20":      return true
+            case "FTM-20":      return true
             case "Smart Chain": return true
             case "SLP":         return true
         }

atomic_defi_design/Dex/Components/AmountFloatField.qml

@@ -0,0 +1,9 @@
+import QtQuick 2.15
+
+DefaultTextField
+{
+    validator: RegExpValidator
+    {
+        regExp: /([0-9]*[.])?[0-9]+/
+    }
+}

atomic_defi_design/Dex/Components/AmountIntField.qml

@@ -2,8 +2,9 @@ import QtQuick 2.15
 
 DefaultTextField
 {
+    property bool allowFloat: false
     validator: RegExpValidator
     {
-        regExp: /[0-9]+/
+        regExp: allowFloat ? /([0-9]*[.])?[0-9]+/ : /[0-9]+/
     }
 }

atomic_defi_design/Dex/Components/CoinMenu.qml

@@ -27,6 +27,7 @@ Menu {
 
     MenuItem {
         id: disable_action
+        height: 40
         text: qsTr("Disable %1", "TICKER").arg(ticker)
         onTriggered: API.app.disable_coins([ticker])
         enabled: can_disable
@@ -41,22 +42,27 @@ Menu {
             restart_modal.open()
         }
         enabled: disable_action.enabled && API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_custom_coin
+        visible: enabled
+        height: enabled ? 40 : 0
     }
 
     MenuItem {
+        height: 40
         enabled: !General.prevent_coin_disabling.running
         text: qsTr("Disable all %1 assets").arg(type)
         onTriggered: API.app.disable_coins(API.app.portfolio_pg.get_all_coins_by_type(type))
     }
 
     MenuItem {
+        height: 40
         enabled: !General.prevent_coin_disabling.running
         text: qsTr("Disable all assets")
         onTriggered: API.app.disable_coins(API.app.portfolio_pg.get_all_enabled_coins())
     }
 
     MenuItem
     {
+        height: 40
         enabled: !General.prevent_coin_disabling.running
         text: qsTr("Disable 0 balance assets")
         onTriggered: API.app.disable_no_balance_coins()

atomic_defi_design/Dex/Components/SetupPage.qml

@@ -44,8 +44,8 @@ Item
 
             leftPadding: 30
             rightPadding: leftPadding
-            topPadding: leftPadding * 0.5
-            bottomPadding: topPadding
+            topPadding: 12
+            bottomPadding: 12
             Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             background: DefaultRectangle
@@ -69,9 +69,9 @@ Item
 
     DexLanguage
     {
-        y: 52
+        y: 24
         anchors.right: parent.right
-        anchors.rightMargin: 52
+        anchors.rightMargin: 24
         width: 72
     }