Skip to content

Commit cc7ba3e

Browse files
smk762smk762
committed
isolate testcoins in bestorders
1 parent 22df4dd commit cc7ba3e

File tree

4 files changed

+36
-30
lines changed

4 files changed

+36
-30
lines changed

‎atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import AtomicDEX.MarketMode 1.0
1414
Item
1515
{
1616
id: _control
17-
18-
property bool coinEnable: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled
17+
property bool _isCoinEnabled: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled
1918
property bool isAsk
2019

2120
AnimatedRectangle
@@ -46,7 +45,7 @@ Item
4645
height: 24
4746
anchors.verticalCenter: parent.verticalCenter
4847
source: General.coinIcon(coin)
49-
opacity: !_control.coinEnable? .1 : 1
48+
opacity: !_control._isCoinEnabled? .1 : 1
5049
}
5150

5251
Dex.Text
@@ -137,7 +136,7 @@ Item
137136
{
138137
if (API.app.enable_coins([coin]) === true)
139138
{
140-
_control.coinEnable = true;
139+
_control._isCoinEnabled = true;
141140
_tooltip.close();
142141
}
143142
else {

‎src/core/atomicdex/config/coins.cfg.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -286,21 +286,21 @@ namespace atomic_dex
286286
{
287287
case CoinType::QRC20:
288288
cfg.has_parent_fees_ticker = true;
289-
cfg.fees_ticker = cfg.is_testnet.value() ? "tQTUM" : "QTUM";
289+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "tQTUM" : "QTUM";
290290
break;
291291
case CoinType::ERC20:
292292
cfg.has_parent_fees_ticker = true;
293-
cfg.fees_ticker = cfg.is_testnet.value() ? "ETHR" : "ETH";
293+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "ETHR" : "ETH";
294294
cfg.is_erc_family = true;
295295
break;
296296
case CoinType::BEP20:
297297
cfg.has_parent_fees_ticker = true;
298-
cfg.fees_ticker = cfg.is_testnet.value() ? "BNBT" : "BNB";
298+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "BNBT" : "BNB";
299299
cfg.is_erc_family = true;
300300
break;
301301
case CoinType::PLG20:
302302
cfg.has_parent_fees_ticker = true;
303-
cfg.fees_ticker = cfg.is_testnet.value() ? "MATICTEST" : "MATIC";
303+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "MATICTEST" : "MATIC";
304304
cfg.is_erc_family = true;
305305
break;
306306
case CoinType::Optimism:
@@ -320,62 +320,62 @@ namespace atomic_dex
320320
break;
321321
case CoinType::AVX20:
322322
cfg.has_parent_fees_ticker = true;
323-
cfg.fees_ticker = cfg.is_testnet.value() ? "AVAXT" : "AVAX";
323+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "AVAXT" : "AVAX";
324324
cfg.is_erc_family = true;
325325
break;
326326
case CoinType::FTM20:
327327
cfg.has_parent_fees_ticker = true;
328-
cfg.fees_ticker = cfg.is_testnet.value() ? "FTMT" : "FTM";
328+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "FTMT" : "FTM";
329329
cfg.is_erc_family = true;
330330
break;
331331
case CoinType::HRC20:
332332
cfg.has_parent_fees_ticker = true;
333-
cfg.fees_ticker = cfg.is_testnet.value() ? "ONET" : "ONE";
333+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "ONET" : "ONE";
334334
cfg.is_erc_family = true;
335335
break;
336336
case CoinType::Ubiq:
337337
cfg.has_parent_fees_ticker = true;
338-
cfg.fees_ticker = cfg.is_testnet.value() ? "UBQT" : "UBQ";
338+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "UBQT" : "UBQ";
339339
cfg.is_erc_family = true;
340340
break;
341341
case CoinType::KRC20:
342342
cfg.has_parent_fees_ticker = true;
343-
cfg.fees_ticker = cfg.is_testnet.value() ? "KCST" : "KCS";
343+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "KCST" : "KCS";
344344
cfg.is_erc_family = true;
345345
break;
346346
case CoinType::Moonriver:
347347
cfg.has_parent_fees_ticker = true;
348-
cfg.fees_ticker = cfg.is_testnet.value() ? "MOVRT" : "MOVR";
348+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "MOVRT" : "MOVR";
349349
cfg.is_erc_family = true;
350350
break;
351351
case CoinType::Moonbeam:
352352
cfg.has_parent_fees_ticker = true;
353-
cfg.fees_ticker = cfg.is_testnet.value() ? "GLMRT" : "GLMR";
353+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "GLMRT" : "GLMR";
354354
cfg.is_erc_family = true;
355355
break;
356356
case CoinType::HecoChain:
357357
cfg.has_parent_fees_ticker = true;
358-
cfg.fees_ticker = cfg.is_testnet.value() ? "HTT" : "HT";
358+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "HTT" : "HT";
359359
cfg.is_erc_family = true;
360360
break;
361361
case CoinType::SmartBCH:
362362
cfg.has_parent_fees_ticker = true;
363-
cfg.fees_ticker = cfg.is_testnet.value() ? "SBCHT" : "SBCH";
363+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "SBCHT" : "SBCH";
364364
cfg.is_erc_family = true;
365365
break;
366366
case CoinType::EthereumClassic:
367367
cfg.has_parent_fees_ticker = true;
368-
cfg.fees_ticker = cfg.is_testnet.value() ? "ETCT" : "ETC";
368+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "ETCT" : "ETC";
369369
cfg.is_erc_family = true;
370370
break;
371371
case CoinType::RSK:
372372
cfg.has_parent_fees_ticker = true;
373-
cfg.fees_ticker = cfg.is_testnet.value() ? "RBTCT" : "RBTC";
373+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "RBTCT" : "RBTC";
374374
cfg.is_erc_family = true;
375375
break;
376376
case CoinType::SLP:
377377
cfg.has_parent_fees_ticker = true;
378-
cfg.fees_ticker = cfg.is_testnet.value() ? "tBCH" : "BCH";
378+
cfg.fees_ticker = cfg.is_testnet.value_or(false) ? "tBCH" : "BCH";
379379
break;
380380
case CoinType::TENDERMINT:
381381
cfg.has_parent_fees_ticker = true;

‎src/core/atomicdex/models/qt.orderbook.proxy.model.cpp

+16-9
Original file line numberDiff line numberDiff line change
@@ -155,27 +155,34 @@ namespace atomic_dex
155155
case orderbook_model::kind::bids:
156156
break;
157157
case orderbook_model::kind::best_orders:
158-
t_float_50 rates = safe_float(this->sourceModel()->data(idx, orderbook_model::CEXRatesRole).toString().toStdString());
159-
t_float_50 fiat_price = safe_float(this->sourceModel()->data(idx, orderbook_model::PriceFiatRole).toString().toStdString());
160-
std::string ticker = this->sourceModel()->data(idx, orderbook_model::CoinRole).toString().toStdString();
161-
const auto& provider = this->m_system_mgr.get_system<komodo_prices_provider>();
162-
const auto coin_info = this->m_system_mgr.get_system<portfolio_page>().get_global_cfg()->get_coin_info(ticker);
163158
t_float_50 limit("10000");
159+
t_float_50 rates = safe_float(this->sourceModel()->data(idx, orderbook_model::CEXRatesRole).toString().toStdString());
160+
t_float_50 fiat_price = safe_float(this->sourceModel()->data(idx, orderbook_model::PriceFiatRole).toString().toStdString());
164161
bool is_cex_id_available = this->sourceModel()->data(idx, orderbook_model::HaveCEXIDRole).toBool();
165-
const auto volume = provider.get_total_volume(utils::retrieve_main_ticker(ticker));
162+
const auto& provider = this->m_system_mgr.get_system<komodo_prices_provider>();
163+
std::string ticker = this->sourceModel()->data(idx, orderbook_model::CoinRole).toString().toStdString();
164+
const auto coin_info = this->m_system_mgr.get_system<portfolio_page>().get_global_cfg()->get_coin_info(ticker);
165+
const auto volume = provider.get_total_volume(utils::retrieve_main_ticker(ticker));
166+
std::string left_ticker = this->m_system_mgr.get_system<trading_page>().get_market_pairs_mdl()->get_left_selected_coin().toStdString();
167+
const auto left_coin_info = this->m_system_mgr.get_system<portfolio_page>().get_global_cfg()->get_coin_info(left_ticker);
168+
166169
if (coin_info.ticker.empty() || coin_info.wallet_only) //< this means it's not present in our cfg - skipping
167170
{
168171
return false;
169172
}
170-
if (coin_info.is_testnet)
173+
if (left_coin_info.is_testnet.value_or(false))
171174
{
172-
break;
175+
if (coin_info.is_testnet.value_or(false))
176+
{
177+
return true;
178+
}
179+
return false;
173180
}
174181
if (is_cex_id_available && (rates > 100 || fiat_price <= 0 || ((safe_float(volume) < limit) && coin_info.coin_type != CoinType::SmartChain)))
175182
{
176183
return false;
177184
}
178-
break;
185+
return true;
179186
}
180187
}
181188

‎src/core/atomicdex/services/mm2/mm2.service.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3019,7 +3019,7 @@ namespace atomic_dex
30193019
const coin_config_t cfg = this->get_coin_info(ticker);
30203020
if (cfg.coin_type == CoinType::QRC20)
30213021
{
3022-
if (cfg.is_testnet.value())
3022+
if (cfg.is_testnet.value_or(false))
30233023
{
30243024
SPDLOG_INFO("{} is from testnet picking tQTUM electrum", ticker);
30253025
servers = std::move(get_coin_info("tQTUM").electrum_urls.value());

0 commit comments

Comments
 (0)