From 5ffbfd51fbe58a03deb15c94fdda3f92b994b706 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Sep 2023 00:08:07 +0800 Subject: [PATCH 1/6] use nim 1.6.2 --- .github/workflows/atomicdex-desktop-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index b03ca4d6c0..63531cad42 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -156,24 +156,24 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive export SHELL=/bin/bash - echo "CHOOSENIM_CHOOSE_VERSION=1.6.10" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.10 + echo "CHOOSENIM_CHOOSE_VERSION=1.6.20" >> $GITHUB_ENV + export CHOOSENIM_CHOOSE_VERSION=1.6.20 curl https://nim-lang.org/choosenim/init.sh > choosenim.sh chmod +x choosenim.sh ./choosenim.sh -y export PATH=/home/runner/.nimble/bin:$PATH - chmod +x /home/runner/.choosenim/toolchains/nim-1.6.10/bin/* + chmod +x /home/runner/.choosenim/toolchains/nim-1.6.20/bin/* - name: Install nim (MacOS) if: runner.os == 'macOS' run: | - echo "CHOOSENIM_CHOOSE_VERSION=1.6.10" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.10 + echo "CHOOSENIM_CHOOSE_VERSION=1.6.20" >> $GITHUB_ENV + export CHOOSENIM_CHOOSE_VERSION=1.6.20 curl https://nim-lang.org/choosenim/init.sh > choosenim.sh chmod +x choosenim.sh ./choosenim.sh -y export PATH=/Users/runner/.nimble/bin:$PATH - chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.10/bin/* + chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.20/bin/* - name: Install deps (Linux) if: runner.os == 'Linux' From 87e3dc6f0325ec14330f2104dc63938149ee8e51 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Sep 2023 00:58:29 +0800 Subject: [PATCH 2/6] fix nim version --- .github/workflows/atomicdex-desktop-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 63531cad42..7a61079109 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -156,24 +156,24 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive export SHELL=/bin/bash - echo "CHOOSENIM_CHOOSE_VERSION=1.6.20" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.20 + 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 export PATH=/home/runner/.nimble/bin:$PATH - chmod +x /home/runner/.choosenim/toolchains/nim-1.6.20/bin/* + chmod +x /home/runner/.choosenim/toolchains/nim-1.6.2/bin/* - name: Install nim (MacOS) if: runner.os == 'macOS' run: | - echo "CHOOSENIM_CHOOSE_VERSION=1.6.20" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.20 + 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 export PATH=/Users/runner/.nimble/bin:$PATH - chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.20/bin/* + chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.2/bin/* - name: Install deps (Linux) if: runner.os == 'Linux' From 2c7c072edc41c9a4a3c6a7f2d32d12edc520d421 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Sep 2023 18:57:51 +0800 Subject: [PATCH 3/6] fix tendermint tx history --- .../atomicdex/services/mm2/mm2.service.cpp | 41 ++++++++----------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index b60eceee82..4fc37fcd80 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -1298,36 +1298,27 @@ namespace atomic_dex std::size_t limit = 5000; bool requires_v2 = false; std::string method = "my_tx_history"; - if (coin_info.coin_type == CoinTypeGadget::SLP || coin_info.ticker == "tBCH" || coin_info.ticker == "BCH") + if (coin_info.coin_type == CoinTypeGadget::ZHTLC || coin_info.coin_type == CoinTypeGadget::TENDERMINT || coin_info.coin_type == CoinTypeGadget::TENDERMINTTOKEN || coin_info.coin_type == CoinTypeGadget::SLP || coin_info.ticker == "tBCH" || coin_info.ticker == "BCH") { requires_v2 = true; - t_tx_history_request request{.coin = ticker, .limit = limit}; - nlohmann::json j = mm2::template_request(method, requires_v2); - mm2::to_json(j, request); - batch_array.push_back(j); - } - else if (coin_info.is_zhtlc_family) - { - // Don't request balance / history if not completely activated. - if (coin_info.activation_status.at("result").at("status") == "Ok") + if (coin_info.is_zhtlc_family) { - limit = 50; - requires_v2 = true; - method = "z_coin_tx_history"; - t_tx_history_request request{.coin = ticker, .limit = limit}; - nlohmann::json j = mm2::template_request(method, requires_v2); - mm2::to_json(j, request); - batch_array.push_back(j); + // Don't request balance / history if not completely activated. + if (coin_info.activation_status.at("result").at("status") == "Ok") + { + limit = 50; + method = "z_coin_tx_history"; + } + else + { + return std::make_tuple(batch_array, tickers_idx, tokens_to_fetch); + } } } - else - { - t_tx_history_request request{.coin = ticker, .limit = limit}; - nlohmann::json j = mm2::template_request(method, requires_v2); - mm2::to_json(j, request); - batch_array.push_back(j); - } - + t_tx_history_request request{.coin = ticker, .limit = limit}; + nlohmann::json j = mm2::template_request(method, requires_v2); + mm2::to_json(j, request); + batch_array.push_back(j); } if (not only_tx) From de268063a4c0ae4c33f66ee9d884b2fc546e8681 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 23 Sep 2023 02:54:03 +0800 Subject: [PATCH 4/6] fix coins repo refs --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2266087583..e578073320 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ FetchContent_Declare( ) FetchContent_Declare(jl777-coins - URL https://github.com/KomodoPlatform/coins/archive/ssl-only-coins-config.zip) + URL https://github.com/KomodoPlatform/coins/archive/master.zip) #FetchContent_Declare(adex-generics-coins # URL https://github.com/KomodoPlatform/komodo-wallet-desktop/archive/main.zip) @@ -87,7 +87,7 @@ FetchContent_MakeAvailable(mm2 jl777-coins qmaterial) ##! Configure our needs. if (UNIX) - configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_CURRENT_SOURCE_DIR}/assets/config/${PROJECT_VERSION}-coins.json COPYONLY) + 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) file(COPY ${jl777-coins_SOURCE_DIR}/icons/ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/atomic_defi_design/assets/images/coins/) From 7324e0bc520e7a3893f0c29630452106f600c35c Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 23 Sep 2023 03:05:20 +0800 Subject: [PATCH 5/6] tinted windows --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e578073320..2f4f825ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ if (UNIX) configure_file(${mm2_SOURCE_DIR}/mm2 ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/mm2/${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.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY) + 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) From a524a1adf56ba461618f12fba121e26bcf3cf7e9 Mon Sep 17 00:00:00 2001 From: JSKitty Date: Thu, 28 Sep 2023 00:11:22 +0100 Subject: [PATCH 6/6] Fix "Type" typo --- atomic_defi_design/Dex/Support/SupportModal.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Support/SupportModal.qml b/atomic_defi_design/Dex/Support/SupportModal.qml index 0ea8c92c52..1e17485a06 100644 --- a/atomic_defi_design/Dex/Support/SupportModal.qml +++ b/atomic_defi_design/Dex/Support/SupportModal.qml @@ -146,7 +146,7 @@ Network fees can vary greatly depending on your selected trading pair.").arg(API FAQLine { title: qsTr("I see a transaction in my wallet that was marked as 'poison'. What does this mean?") - text: qsTr('Address poisoning is a relatively new tye of phishing attack, where a malicious actor aims to trick you into sending funds to an address that you did not intend to send funds to. + text: qsTr('Address poisoning is a relatively new type of phishing attack, where a malicious actor aims to trick you into sending funds to an address that you did not intend to send funds to. This is often done by sending a zero value transaction to your wallet from an address which looks very similar to your actual address, with the exact same letters at the start and end. This transaction will then appear in your transaction history, with the scammer hoping you will mistake the fake address for your own and send funds to it.