KomodoPlatform · smk762 · Sep 21, 2024 · Sep 21, 2024 · Sep 21, 2024 · Sep 23, 2024
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.8.0]
+ - Komodo Wallet Desktop Version: [e.g. 0.8.1]
  - 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.8.0"
+  DEX_VERSION: "0.8.1"
   DEX_WEBSITE: "https://atomicdex.io/"
 
 jobs:
@@ -120,7 +120,7 @@ jobs:
           zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer
 
       - name: Upload artifacts (Linux)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: AtomicDEX-Pro-Installer-linux-release
           path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
@@ -232,7 +232,7 @@ jobs:
           zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer
 
       - name: Upload artifacts (Linux/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: AtomicDEX-Pro-Installer-linux-debug
           path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
@@ -296,7 +296,7 @@ jobs:
           ls bundle-Release/atomicDEX-Pro.dmg
 
       - name: Upload artifacts (MacOS/Release)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-mac-release.dmg
           path: ./ci_tools_atomic_dex/bundle-Release/atomicDEX-Pro.dmg
@@ -360,7 +360,7 @@ jobs:
           ls bundle-Debug/atomicDEX-Pro.dmg
 
       - name: Upload artifacts (MacOS/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-mac-debug.dmg
           path: ./ci_tools_atomic_dex/bundle-Debug/atomicDEX-Pro.dmg
@@ -438,7 +438,7 @@ jobs:
           ls bundle-Release/bundle.zip
 
       - name: Upload artifacts (Win/Release)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-win-release
           path: ./ci_tools_atomic_dex/bundle-Release/bundle.zip
@@ -516,7 +516,7 @@ jobs:
           ls bundle-Debug/bundle.zip
 
       - name: Upload artifacts (Windows/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-win-debug
           path: ./ci_tools_atomic_dex/bundle-Debug/bundle.zip

diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -17,7 +17,7 @@ env:
   DEX_PROJECT_NAME: "komodo-wallet"
   DEX_DISPLAY_NAME: "Komodo Wallet"
   DEX_COMPANY: "KomodoPlatform"
-  DEX_VERSION: "0.8.0"
+  DEX_VERSION: "0.8.1"
   DEX_WEBSITE: "https://atomicdex.io/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
@@ -204,7 +204,7 @@ jobs:
 
       - name: import code signing certificates (macos)
         if: runner.os == 'macOS'  && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
-        uses: Apple-Actions/import-codesign-certs@v1
+        uses: Apple-Actions/import-codesign-certs@v3
         with:
           keychain: ${{ github.run_id }}
           keychain-password: ${{ github.run_id }}
@@ -213,7 +213,7 @@ jobs:
 
       - name: import installer code signing certificates (macos)
         if: runner.os == 'macOS'  && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
-        uses: apple-actions/import-codesign-certs@v1
+        uses: apple-actions/import-codesign-certs@v3
         with:
           keychain: ${{ github.run_id }}
           keychain-password: ${{ github.run_id }}
@@ -232,7 +232,7 @@ jobs:
           echo $HOME/sdk
           ls $HOME/sdk
           export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
-          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
+          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
           export APPLE_ID="${{ secrets.APPLE_ID }}"
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
@@ -288,23 +288,23 @@ jobs:
 
       - name: Upload bundle artifact (Linux ZSTD)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_zstd }}
           path: ./bundled/linux/${{ env.target_name_zstd }}
           retention-days: 7
 
       - name: Upload bundle artifact (Linux ZIP)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/linux/${{ env.target_name_zip }}
           retention-days: 7
 
       - name: Upload bundle artifact (Linux AppImage)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_appimage }}
           path: ./bundled/linux/${{ env.target_name_appimage }}
@@ -318,15 +318,15 @@ jobs:
 
       - name: Upload artifacts (MacOS dmg)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_dmg }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg
           retention-days: 7
 
       - name: Upload artifacts (MacOS installer)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
@@ -341,15 +341,15 @@ jobs:
 
       - name: Upload artifacts (Windows zip)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}.zip
           retention-days: 7
 
       - name: Upload artifacts (Windows installer)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
@@ -382,7 +382,7 @@ jobs:
         if: runner.os == 'macOS' &&  'KomodoPlatform/komodo-wallet-desktop' == github.repository
         run: |
           export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
-          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
+          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
           export APPLE_ID="${{ secrets.APPLE_ID }}"
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"

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.8.0)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.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(kdf
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.2.0-beta/mm2-bb749a993-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(kdf
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.2.0-beta/mm2-bb749a993-Linux-Release.zip)
 else ()
     FetchContent_Declare(kdf
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.1.0-beta/mm2-35e923949-Win64.zip)
+            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.2.0-beta/mm2-bb749a993-Win64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

diff --git a/atomic_defi_design/Dex/Components/AddressField.qml b/atomic_defi_design/Dex/Components/AddressField.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 
-DefaultTextField {
+DexTextField {
     readonly property int max_length: 50
 
     validator: RegExpValidator {

diff --git a/atomic_defi_design/Dex/Components/AmountField.qml b/atomic_defi_design/Dex/Components/AmountField.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 
-DefaultTextField
+DexTextField
 {
     validator: RegExpValidator
     {

diff --git a/atomic_defi_design/Dex/Components/AmountFloatField.qml b/atomic_defi_design/Dex/Components/AmountFloatField.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 
-DefaultTextField
+DexTextField
 {
     validator: RegExpValidator
     {

diff --git a/atomic_defi_design/Dex/Components/AmountIntField.qml b/atomic_defi_design/Dex/Components/AmountIntField.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 
-DefaultTextField
+DexTextField
 {
     property bool allowFloat: false
     validator: RegExpValidator

diff --git a/atomic_defi_design/Dex/Components/DefaultTextField.qml b/atomic_defi_design/Dex/Components/DefaultTextField.qml
diff --git a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml
@@ -85,7 +85,7 @@ ComboBox
         {
             anchors.rightMargin: 5
 
-            DefaultTextField
+            DexTextField
             {
                 id: input_coin_filter
                 placeholderText: qsTr("Search")

diff --git a/atomic_defi_design/Dex/Components/SearchField.qml b/atomic_defi_design/Dex/Components/SearchField.qml
@@ -37,7 +37,7 @@ Rectangle
         }
     }
 
-    DefaultTextField
+    DexTextField
     {
         id: _textField
 

diff --git a/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml b/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml
@@ -51,7 +51,7 @@ ColumnLayout
         }
     }
 
-    DefaultTextField
+    DexTextField
     {
         id: input_field
 

diff --git a/atomic_defi_design/Dex/Components/qmldir b/atomic_defi_design/Dex/Components/qmldir
@@ -16,7 +16,7 @@ Rectangle 1.0 DefaultRectangle.qml
 ScrollView 1.0 DefaultScrollView.qml
 SearchField 1.0 SearchField.qml
 Text 1.0 DefaultText.qml
-TextField 1.0 DefaultTextField.qml
+TextField 1.0 DexTextField.qml
 TextFieldWithTitle 1.0 TextFieldWithTitle.qml
 ToolTip 1.0 DefaultTooltip.qml
 UserIcon 1.0 UserIcon.qml

diff --git a/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml b/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml
@@ -79,7 +79,7 @@ SetupPage
             visible: wallet_count > 0
 
             // Searchbar
-            DefaultTextField
+            DexTextField
             {
                 id: wallet_search
                 visible: wallet_count > 5

diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml
@@ -262,7 +262,7 @@ MultipageModal
 
         HorizontalLine { Layout.fillWidth: true }
 
-        DefaultTextField
+        DexTextField
         {
             visible: coinsList.visible
             enabled: coinsList.enabled

diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml
@@ -47,7 +47,7 @@ MultipageModal
 
     function getCryptoAmount() { return _preparePage.cryptoSendMode ? input_amount.text : equivalentAmount.value }
 
-    function prepareSendCoin(address, amount, with_fees, fees_amount, is_special_token, gas_limit, gas_price, memo="") {
+    function prepareSendCoin(address, amount, with_fees, fees_amount, is_special_token, gas_limit, gas_price, memo="", ibc_source_channel="") {
         let max = parseFloat(current_ticker_infos.balance) === parseFloat(amount)
         // Save for later check
         async_param_max = max
@@ -60,7 +60,7 @@ MultipageModal
             gas_price,
             gas_limit: gas_limit === "" ? 0 : parseInt(gas_limit)
         }
-        api_wallet_page.send(address, amount, max, with_fees, fees_info, memo)
+        api_wallet_page.send(address, amount, max, with_fees, fees_info, memo, ibc_source_channel)
     }
 
     function sendCoin() {
@@ -263,7 +263,7 @@ MultipageModal
             color: input_address.background.color
             radius: input_address.background.radius
 
-            DefaultTextField
+            DexTextField
             {
                 id: input_address
 
@@ -567,7 +567,7 @@ MultipageModal
             color: input_memo.background.color
             radius: input_memo.background.radius
 
-            DefaultTextField
+            DexTextField
             {
                 id: input_memo
 
@@ -579,6 +579,31 @@ MultipageModal
             }
         }
 
+        // IBC channel ID
+        DefaultRectangle
+        {
+            visible: (["TENDERMINT", "TENDERMINTTOKEN"].includes(current_ticker_infos.type)) 
+            enabled: !root.is_send_busy
+
+            Layout.preferredWidth: 500
+            Layout.preferredHeight: 44
+            Layout.alignment: Qt.AlignHCenter
+
+            color: input_memo.background.color
+            radius: input_memo.background.radius
+
+            DexTextField
+            {
+                id: input_ibc_channel_id
+
+                width: 470
+                height: 44
+                placeholderText: qsTr("Enter IBC channel ID")
+                forceFocus: true
+                font: DexTypo.body3
+            }
+        }
+
         ColumnLayout
         {
             visible: General.getCustomFeeType(current_ticker_infos)
@@ -656,7 +681,7 @@ MultipageModal
                 Layout.preferredHeight: 38
                 Layout.alignment: Qt.AlignHCenter
 
-                placeholderText: qsTr("Enter the custom fee") + " [" + api_wallet_page.ticker + "]"
+                placeholderText: qsTr("Enter the custom fee") + " (" + api_wallet_page.ticker + "/kb)"
             }
 
             // Token coins
@@ -786,7 +811,8 @@ MultipageModal
                     General.isSpecialToken(current_ticker_infos),
                     input_custom_fees_gas.text,
                     input_custom_fees_gas_price.text,
-                    input_memo.text
+                    input_memo.text,
+                    input_ibc_channel_id.text
                 )
             }
         }

diff --git a/atomic_defi_design/Dex/Wallet/SendModalContactList.qml b/atomic_defi_design/Dex/Wallet/SendModalContactList.qml
@@ -26,7 +26,7 @@ MultipageModal
         titleText: qsTr("Select a contact with an %1 address").arg(ticker)
 
         // Searchbar
-        DefaultTextField
+        DexTextField
         {
             Layout.alignment: Qt.AlignHCenter
             Layout.fillWidth: true