Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release candidate #4

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4356ebf
add `optional` header
smk762 Sep 21, 2024
e3c8ba8
Add IBC channel input for tendermint sends
smk762 Sep 21, 2024
aa704fc
DefaultTextField -> DexTextField
smk762 Sep 21, 2024
10dfa8d
rm duplicate struct
smk762 Sep 23, 2024
84208f2
fix tendermint activation
smk762 Sep 23, 2024
b9ab863
accomodate tendermint tx history
smk762 Sep 23, 2024
cd5e85d
use feature branch of coins repo
smk762 Sep 23, 2024
64d1c68
set default timespoan for chart
smk762 Sep 26, 2024
e4b9002
dont fetch infos while activation in progress
smk762 Sep 27, 2024
5a8a085
use dev branch api
smk762 Oct 24, 2024
6f772cb
increment version
smk762 Oct 24, 2024
4af1341
fix some build warnings
smk762 Oct 24, 2024
7940fba
fix windows CI build error
smk762 Oct 24, 2024
d044154
fix macos build errors
smk762 Oct 24, 2024
a3f5aa2
handle llvm dep symlink fail
smk762 Oct 24, 2024
1f8e41d
brew fermenting
smk762 Oct 25, 2024
99c7775
update ci upload action
smk762 Oct 25, 2024
0e2e158
Merge pull request #1 from KomodoPlatform/0.8.1-dev
smk762 Oct 28, 2024
70ed54c
Merge branch 'dev' into add/ibc-channel-input
smk762 Oct 28, 2024
389312a
add electrum connection limit params to activation
smk762 Oct 29, 2024
195aca5
add missing commas
smk762 Oct 30, 2024
cfc9545
add new params to struct and json transform
smk762 Oct 30, 2024
bc24099
use latest dev kdf
smk762 Nov 11, 2024
9022079
Merge pull request #9 from KomodoPlatform/0.8.1-dev
smk762 Nov 11, 2024
2e02d6f
Merge branch 'dev' into add/ibc-channel-input
smk762 Nov 11, 2024
48b385f
fix v2.2.0+ tendermint activation format
smk762 Nov 12, 2024
aa64c2f
Merge pull request #5 from KomodoPlatform/add/ibc-channel-input
smk762 Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]


Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/atomicdex-desktop-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}"
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }}"
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-mac-x86-64.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://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-linux-x86-64.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://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-win-x86-64.zip)
endif ()

#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
Expand All @@ -78,7 +78,7 @@ FetchContent_Declare(
)

FetchContent_Declare(jl777-coins
URL https://github.com/KomodoPlatform/coins/archive/master.zip)
URL https://github.com/KomodoPlatform/coins/archive/add/tendermint-coins.zip)

#FetchContent_Declare(adex-generics-coins
# URL https://github.com/KomodoPlatform/komodo-wallet-desktop/archive/main.zip)
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/AddressField.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.15

DefaultTextField {
DexTextField {
readonly property int max_length: 50

validator: RegExpValidator {
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/AmountField.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.15

DefaultTextField
DexTextField
{
validator: RegExpValidator
{
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/AmountFloatField.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.15

DefaultTextField
DexTextField
{
validator: RegExpValidator
{
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/AmountIntField.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.15

DefaultTextField
DexTextField
{
property bool allowFloat: false
validator: RegExpValidator
Expand Down
8 changes: 0 additions & 8 deletions atomic_defi_design/Dex/Components/DefaultTextField.qml

This file was deleted.

2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/DexSweetComboBox.qml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ComboBox
{
anchors.rightMargin: 5

DefaultTextField
DexTextField
{
id: input_coin_filter
placeholderText: qsTr("Search")
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/SearchField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Rectangle
}
}

DefaultTextField
DexTextField
{
id: _textField

Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/TextFieldWithTitle.qml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ColumnLayout
}
}

DefaultTextField
DexTextField
{
id: input_field

Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/qmldir
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Screens/Startup/WalletsView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ SetupPage
visible: wallet_count > 0

// Searchbar
DefaultTextField
DexTextField
{
id: wallet_search
visible: wallet_count > 5
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Settings/RecoverSeedModal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ MultipageModal

HorizontalLine { Layout.fillWidth: true }

DefaultTextField
DexTextField
{
visible: coinsList.visible
enabled: coinsList.enabled
Expand Down
36 changes: 31 additions & 5 deletions atomic_defi_design/Dex/Wallet/SendModal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() {
Expand Down Expand Up @@ -263,7 +263,7 @@ MultipageModal
color: input_address.background.color
radius: input_address.background.radius

DefaultTextField
DexTextField
{
id: input_address

Expand Down Expand Up @@ -567,7 +567,7 @@ MultipageModal
color: input_memo.background.color
radius: input_memo.background.radius

DefaultTextField
DexTextField
{
id: input_memo

Expand All @@ -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)
Expand Down Expand Up @@ -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
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Wallet/SendModalContactList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading