From b800f5529400c911b75fd6836893b4af1a43f61e Mon Sep 17 00:00:00 2001 From: cipig Date: Mon, 28 Mar 2022 08:13:51 +0000 Subject: [PATCH 1/6] add 2 ABY electrums, add NYAN paprika_id, update BLK+GMS electrums --- assets/config/0.5.5-coins.json | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index f81bb052b6..3af2bce273 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -274,6 +274,18 @@ "protocol": "SSL", "disable_cert_verification": true, "ws_url": "elec-seeder-two.artbytecoin.org:50013" + }, + { + "url": "electrumx-three.artbyte.live:50012", + "protocol": "SSL", + "disable_cert_verification": false, + "ws_url": "electrumx-three.artbyte.live:50013" + }, + { + "url": "electrumx-four.artbyte.live:50012", + "protocol": "SSL", + "disable_cert_verification": false, + "ws_url": "electrumx-four.artbyte.live:50013" } ], "explorer_url": [ @@ -907,17 +919,17 @@ { "url": "electrum1.blackcoin.nl:10002", "protocol": "SSL", - "disable_cert_verification": true + "disable_cert_verification": false }, { "url": "electrum2.blackcoin.nl:20002", "protocol": "SSL", - "disable_cert_verification": true + "disable_cert_verification": false }, { "url": "electrum3.blackcoin.nl:30002", "protocol": "SSL", - "disable_cert_verification": true + "disable_cert_verification": false } ], "explorer_url": [ @@ -3897,12 +3909,9 @@ "electrum": [ { "url": "electrum.gmsmining.pw:17485" - }, - { - "url": "electrum1.gmsmining.pw:17485" }, { - "url": "electrum2.gmsmining.pw:17485" + "url": "electrum1.gmsmining.pw:17485" } ], "explorer_url": [ @@ -5368,7 +5377,7 @@ "NYAN": { "coin": "NYAN", "name": "Nyancoin", - "coinpaprika_id": "test-coin", + "coinpaprika_id": "nyan-nyancoin", "coingecko_id": "test-coin", "nomics_id": "NYAN", "electrum": [ From c8711f81c04288d832e9ae9b2359da1a790ac07b Mon Sep 17 00:00:00 2001 From: cipig Date: Mon, 28 Mar 2022 16:07:36 +0000 Subject: [PATCH 2/6] fix XMY electrum --- assets/config/0.5.5-coins.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index 3af2bce273..49797ef784 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -7445,8 +7445,8 @@ "nomics_id": "XMY", "electrum": [ { - "url": "lenoir.ecoincore.com:10892", - "protocol": "SSL" + "url": "lenoir.ecoincore.com:10891", + "protocol": "TCP" } ], "explorer_url": [ From 5d0405632e6ff41726796f0216934e104380ec2d Mon Sep 17 00:00:00 2001 From: Sztergbaum Date: Tue, 29 Mar 2022 09:26:37 +0200 Subject: [PATCH 3/6] feat(dev): update deps --- ci_tools_atomic_dex/vcpkg-custom-ports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/vcpkg-custom-ports b/ci_tools_atomic_dex/vcpkg-custom-ports index 19453b682d..15ad59b292 160000 --- a/ci_tools_atomic_dex/vcpkg-custom-ports +++ b/ci_tools_atomic_dex/vcpkg-custom-ports @@ -1 +1 @@ -Subproject commit 19453b682d43a354235b20809f59761d899a50ee +Subproject commit 15ad59b2928caaaac104702ee5b46d0ae5c3da71 From c169f53d6b0d94a7ee31804c8ad6df023fcd5a1f Mon Sep 17 00:00:00 2001 From: Sztergbaum Date: Tue, 29 Mar 2022 09:26:49 +0200 Subject: [PATCH 4/6] feat(dev): update deps --- ci_tools_atomic_dex/vcpkg-repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/vcpkg-repo b/ci_tools_atomic_dex/vcpkg-repo index 63e935d967..086ef2a484 160000 --- a/ci_tools_atomic_dex/vcpkg-repo +++ b/ci_tools_atomic_dex/vcpkg-repo @@ -1 +1 @@ -Subproject commit 63e935d967a3410e26bf4a708efa39d8384d2bbb +Subproject commit 086ef2a4845fd12e5164df1876737afa67942208 From 5243511e5c84ac97c9050a5b39349d5d5a68317a Mon Sep 17 00:00:00 2001 From: Sztergbaum Date: Tue, 29 Mar 2022 10:50:13 +0200 Subject: [PATCH 5/6] feat(dev): update deps README.md --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 15df79c508..ab1040c4b2 100644 --- a/README.md +++ b/README.md @@ -86,20 +86,20 @@ Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io ## Self-Hosted Dependencies -| Dependencies | Version | Description | Categories | -|---------------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| -| boost | 1.77 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming | -| doctest | 2.3.8 | The fastest feature-rich C++11/14/17/20 single-header testing framework | Testing | -| fmt | 7.1.0 | A modern formatting library | Formatting | -| nlohmann_json | 3.9.1 | JSON for Modern C++ | Parsing | -| range-v3 | 0.11.0 | Range library for C++14/17/20, basis for C++20's std::ranges | Algorithm | -| date | 2019-11-08 | A date and time library based on the C++11/14/17 header | Timezone/Calendar | -| spdlog | 1.8.0 | Fast C++ logging library. | Logging | -| openssl | 1.1.1h | TLS/SSL and crypto library | Network/Crypto | -| entt | 3.5.1 | Gaming meets modern C++ - a fast and reliable entity component system (ECS) and much more | Architecture | -| cpprestsdk | 2.10.15-1 | The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. | HTTP | -| taskflow | 2.2.0 | Parallel and Heterogeneous Task Programming in Modern C++ | Threading | -| qt | 5.15.2 | Qt is a cross-platform application development framework for desktop, embedded and mobile. | GUI | +| Dependencies | Version | Description | Categories | +|---------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| boost | 1.78 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming | +| doctest | 2.3.8 | The fastest feature-rich C++11/14/17/20 single-header testing framework | Testing | +| fmt | 7.1.0 | A modern formatting library | Formatting | +| nlohmann_json | 3.9.1 | JSON for Modern C++ | Parsing | +| range-v3 | 0.11.0 | Range library for C++14/17/20, basis for C++20's std::ranges | Algorithm | +| date | 2019-11-08 | A date and time library based on the C++11/14/17 header | Timezone/Calendar | +| spdlog | 1.8.5 | Fast C++ logging library. | Logging | +| openssl | 1.1.1h | TLS/SSL and crypto library | Network/Crypto | +| entt | 3.5.1 | Gaming meets modern C++ - a fast and reliable entity component system (ECS) and much more | Architecture | +| cpprestsdk | 2.10.15-1 | The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. | HTTP | +| taskflow | 2.2.0 | Parallel and Heterogeneous Task Programming in Modern C++ | Threading | +| qt | 5.15.2 | Qt is a cross-platform application development framework for desktop, embedded and mobile. | GUI | ## Contributors / Thanks From 2cbb91f8af4f7b5d95aa5d75f8e3f49bc8c3dc37 Mon Sep 17 00:00:00 2001 From: Sztergbaum Date: Tue, 29 Mar 2022 11:32:40 +0200 Subject: [PATCH 6/6] feat(orderbook_proxy): use main ticker for volume retrieve --- src/core/atomicdex/models/qt.orderbook.proxy.model.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/atomicdex/models/qt.orderbook.proxy.model.cpp b/src/core/atomicdex/models/qt.orderbook.proxy.model.cpp index ef97b090ca..08b7805a9b 100644 --- a/src/core/atomicdex/models/qt.orderbook.proxy.model.cpp +++ b/src/core/atomicdex/models/qt.orderbook.proxy.model.cpp @@ -168,13 +168,15 @@ namespace atomic_dex const auto coin_info = this->m_system_mgr.get_system().get_global_cfg()->get_coin_info(ticker); t_float_50 limit("10000"); bool is_cex_id_available = this->sourceModel()->data(idx, orderbook_model::HaveCEXIDRole).toBool(); - + const auto volume = provider.get_total_volume(utils::retrieve_main_ticker(ticker)); if (coin_info.ticker.empty() || coin_info.wallet_only) //< this means it's not present in our cfg - skipping { + SPDLOG_WARN("{} excluded empty", coin_info.ticker); return false; } - if (is_cex_id_available && (rates > 100 || fiat_price <= 0 || ((safe_float(provider.get_total_volume(ticker)) < limit) && coin_info.coin_type != CoinType::SmartChain))) + if (is_cex_id_available && (rates > 100 || fiat_price <= 0 || ((safe_float(volume) < limit) && coin_info.coin_type != CoinType::SmartChain))) { + SPDLOG_WARN("{} excluded rates/fiat {} {} {}", coin_info.ticker, rates.str(), fiat_price.str(), volume); return false; } break;