Skip to content

Commit

Permalink
Merge branch 'KomodoPlatform:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@firstcryptoman
firstcryptoman authored Mar 31, 2022
2 parents 64ef3f6 + 7f6a663 commit 9bffe72
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 28 deletions.
28 changes: 14 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <chrono> 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 <chrono> 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
Expand Down
29 changes: 19 additions & 10 deletions assets/config/0.5.5-coins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -7436,8 +7445,8 @@
"nomics_id": "XMY",
"electrum": [
{
"url": "lenoir.ecoincore.com:10892",
"protocol": "SSL"
"url": "lenoir.ecoincore.com:10891",
"protocol": "TCP"
}
],
"explorer_url": [
Expand Down
2 changes: 1 addition & 1 deletion ci_tools_atomic_dex/vcpkg-custom-ports
Submodule vcpkg-custom-ports updated 2 files
+1 −1 ports/range-v3/CONTROL
+2 −2 ports/range-v3/portfile.cmake
2 changes: 1 addition & 1 deletion ci_tools_atomic_dex/vcpkg-repo
Submodule vcpkg-repo updated 3710 files
6 changes: 4 additions & 2 deletions src/core/atomicdex/models/qt.orderbook.proxy.model.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,15 @@ namespace atomic_dex
const auto coin_info = this->m_system_mgr.get_system<portfolio_page>().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;
Expand Down

0 comments on commit 9bffe72

Please sign in to comment.