Skip to content

Commit 3b17aa4

Browse files
smk762smk762
authored
Merge pull request #2296 from KomodoPlatform/dev
v0.5.8 Release candidate
2 parents bea819c + d08ab51 commit 3b17aa4

File tree

107 files changed

+3540
-2863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3540
-2863
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please describe what you expected to happen.
2626
**Operating Environment(s):**
2727
- OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
2828
- OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
29-
- AtomicDEX Version: [e.g. 0.5.7.2]
29+
- AtomicDEX Version: [e.g. 0.5.8]
3030
- Build branch: [e.g. master/dev]
3131

3232

‎.github/workflows/atomicdex-desktop-cd.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99
DEX_PROJECT_NAME: "atomicdex-desktop"
1010
DEX_DISPLAY_NAME: "AtomicDex Desktop"
1111
DEX_COMPANY: "KomodoPlatform"
12+
DEX_VERSION: "0.5.8"
1213
DEX_WEBSITE: "https://atomicdex.io/"
1314

1415
jobs:

‎.github/workflows/atomicdex-desktop-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
DEX_PROJECT_NAME: "atomicdex-desktop"
1717
DEX_DISPLAY_NAME: "AtomicDex Desktop"
1818
DEX_COMPANY: "KomodoPlatform"
19+
DEX_VERSION: "0.5.8"
1920
DEX_WEBSITE: "https://atomicdex.io/"
2021
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
2122
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is used to ignore files which are generated
22
# ----------------------------------------------------------------------------
3-
3+
.vscode/
44
*~
55
*.autosave
66
*.a

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
1111
include(qt_prerequisites)
1212
include(cfg_hash)
1313

14-
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.2)
14+
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.8)
1515
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
1616

1717
include(cmake_default_options)
@@ -60,13 +60,13 @@ endif ()
6060
##! We fetch our dependencies
6161
if (APPLE)
6262
FetchContent_Declare(mm2
63-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Darwin-Release.zip)
63+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-Darwin-Release.zip)
6464
elseif (UNIX AND NOT APPLE)
6565
FetchContent_Declare(mm2
66-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Linux-Release.zip)
66+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-Linux-Release.zip)
6767
else ()
6868
FetchContent_Declare(mm2
69-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.8741/mm2-6e4de5d21-Windows_NT-Release.zip)
69+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/v1.0.5-beta/mm2-1d8bebd15-Win64.zip)
7070
endif ()
7171

7272
#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

‎assets/config/cfg.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"notification_enabled": true,
3+
"spamfilter_enabled": false,
34
"current_currency": "USD",
45
"current_fiat": "USD",
56
"current_currency_sign": "$",

‎atomic_defi_design/Dex/App.qml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ DexRectangle
3232
property var notification_modal: notifications_modal
3333
property var logout_confirm_modal: logout_modal
3434
property var notifications_list: _currentPage === App.ScreenType.Dashboard ? loader.item.notifications_list : []
35-
property bool segwit_on: false
3635

3736
property var _currentPage: API.app.wallet_mgr.log_status() ? App.ScreenType.Dashboard : App.ScreenType.Startup
3837
property var _availablePages: [_startup, dashboard]

‎atomic_defi_design/Dex/Components/CexInfoModal.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ MultipageModal {
1717
Layout.preferredHeight: 200
1818
Layout.fillWidth: true
1919

20-
text: qsTr('Market data (prices, charts, etc.) marked with the ⓘ icon originates from third-party sources.<br><br>Data is sourced via <a href="https://bandprotocol.com/">Band Decentralized Oracle</a> and <a href="https://coingecko.com">CoinGecko</a>.<br><br><b>Oracle Supported Pairs:</b><br>%1<br><br><b>Last reference (Band Oracle):</b><br><a href="%2">%2</a>')
21-
.arg(API.app.portfolio_pg.oracle_price_supported_pairs.join(', '))
22-
.arg(API.app.portfolio_pg.oracle_last_price_reference)
20+
text: qsTr('Market data (prices, charts, etc.) marked with the ⓘ icon originates from third-party sources.<br><br>Data is sourced via <a href="https://coingecko.com">CoinGecko</a>.')
2321
}
2422
}
2523
}

‎atomic_defi_design/Dex/Components/CoinTypeTag.qml

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import QtQuick 2.15
2-
import "../Constants"
3-
import App 1.0
4-
5-
AnimatedRectangle {
6-
property string type
7-
radius: 20
8-
9-
height: type_tag.font.pixelSize * 1.5
10-
width: type_tag.width + 8
11-
12-
color: Style.getCoinTypeColor(type)
13-
14-
DexLabel {
15-
id: type_tag
16-
anchors.verticalCenter: parent.verticalCenter
17-
anchors.horizontalCenter: parent.horizontalCenter
18-
text: type
19-
color: Style.getCoinTypeTextColor(type)
20-
font: DexTypo.overLine
21-
}
22-
}
1+
import QtQuick 2.15
2+
import "../Constants"
3+
import App 1.0
4+
5+
AnimatedRectangle {
6+
property string type
7+
radius: 20
8+
9+
height: type_tag.font.pixelSize * 1.5
10+
width: type_tag.width + 8
11+
12+
color: Style.getCoinTypeColor(type)
13+
14+
DexLabel {
15+
id: type_tag
16+
anchors.verticalCenter: parent.verticalCenter
17+
anchors.horizontalCenter: parent.horizontalCenter
18+
text: type
19+
color: Style.getCoinTypeTextColor(type)
20+
font: DexTypo.overLine
21+
}
22+
}

‎atomic_defi_design/Dex/Constants/DexTheme.qml

-117
Original file line numberDiff line numberDiff line change
@@ -331,121 +331,4 @@ QtObject {
331331
return Style.colorWhite4
332332
}
333333

334-
function getCoinColor(ticker) {
335-
const c = colorCoin[ticker]
336-
return c || Style.colorTheme2
337-
}
338-
339-
readonly property var colorCoin: ({
340-
"ARPA": "#CCD9E2",
341-
"BCH": "#8DC351",
342-
"BTC": "#F7931A",
343-
"CLC": "#0970DC",
344-
"FTC": "#FFFFFF",
345-
"GLEEC": "#8C41FF",
346-
"GRS": "#377E96",
347-
"DOGE": "#C3A634",
348-
"ETH": "#627EEA",
349-
"KMD": "#2B6680",
350-
"MORTY": "#A4764D",
351-
"RICK": "#A5CBDD",
352-
"EMC2": "#00CCFF",
353-
"DASH": "#008CE7",
354-
"RVN": "#384182",
355-
"DGB": "#006AD2",
356-
"FIRO": "#BB2100",
357-
"LTC": "#BFBBBB",
358-
"ZEC": "#ECB244",
359-
"ZER": "#FFFFFF",
360-
"NAV": "#7D59B5",
361-
"DP": "#E41D25",
362-
"ECA": "#A915DC",
363-
"QTUM": "#2E9AD0",
364-
"CHIPS": "#598182",
365-
"AXE": "#C63877",
366-
"PANGEA": "#D88245",
367-
"JUMBLR": "#2B4649",
368-
"DEX": "#43B7B6",
369-
"COQUI": "#79A541",
370-
"CRYPTO": "#F58736",
371-
"LABS": "#C1F6E1",
372-
"MGW": "#854F2F",
373-
"MONA": "#DEC799",
374-
"NMC": "#186C9D",
375-
"RFOX": "#D83331",
376-
"BOTS": "#F69B57",
377-
"MCL": "#EA0000",
378-
"CCL": "#FFE400",
379-
"BET": "#F69B57",
380-
"SUPERNET": "#F69B57",
381-
"OOT": "#25AAE1",
382-
"REVS": "#F69B57",
383-
"ILN": "#523170",
384-
"VRSC": "#3164D3",
385-
"THC": "#819F6F",
386-
"1INCH": "#95A7C5",
387-
"BAT": "#FF5000",
388-
"BUSD": "#EDB70B",
389-
"DAI": "#B68900",
390-
"USDC": "#317BCB",
391-
"PAX": "#EDE70A",
392-
"SUSHI": "#E25DA8",
393-
"TUSD": "#2E3181",
394-
"AWC": "#31A5F6",
395-
"VRA": "#D70A41",
396-
"SPACE": "#E44C65",
397-
"QC": "#00D7B3",
398-
"PBC": "#64A3CB",
399-
"AAVE": "#9C64A6",
400-
"ANT": "#33DAE6",
401-
"AGI": "#6815FF",
402-
"BAND": "#526BFF",
403-
"BLK": "#191919",
404-
"BNT": "#000D2B",
405-
"BTCZ": "#F5B036",
406-
"CEL": "#4055A6",
407-
"CENNZ": "#2E87F1",
408-
"COMP": "#00DBA3",
409-
"CRO": "#243565",
410-
"CVC": "#3AB03E",
411-
"CVT": "#4B0082",
412-
"DODO": "#FFF706",
413-
"ELF": "#2B5EBB",
414-
"ENJ": "#6752C3",
415-
"EURS": "#2F77ED",
416-
"FUN": "#EF1C70",
417-
"GNO": "#00B0CC",
418-
"HOT": "#983EFF",
419-
"IOTX": "#00CDCE",
420-
"KNC": "#117980",
421-
"LEO": "#F79B2C",
422-
"LINK": "#356CE4",
423-
"LRC": "#32C2F8",
424-
"MANA": "#FF3C6C",
425-
"MATIC": "#1E61ED",
426-
"MED": "#00B5FF",
427-
"MKR": "#1BAF9F",
428-
"NPXS": "#F3CB00",
429-
"POWR": "#05BCAA",
430-
"QI": "#FFFFFF",
431-
"QIAIR": "#FEFEFE",
432-
"QKC": "#2175B4",
433-
"QNT": "#46DDC8",
434-
"REP": "#0E0E21",
435-
"REV": "#78034D",
436-
"RLC": "#FFE100",
437-
"SFUSD": "#9881B8",
438-
"SNT": "#596BED",
439-
"SNX": "#00D1FF",
440-
"SOULJA": "#8F734A",
441-
"STORJ": "#2683FF",
442-
"TSL": "#64B082",
443-
"VRM": "#586A7A",
444-
"WSB": "#FEBB84",
445-
"WBTC": "#CCCCCC",
446-
"YFI": "#006BE6",
447-
"ZRX": "#302C2C",
448-
"UNI": "#FF007A",
449-
"RUNES": "#336699"
450-
})
451334
}

‎atomic_defi_design/Dex/Constants/General.qml

+19-4
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@ QtObject {
8787
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_wallet_only
8888
}
8989

90+
function isFaucetCoin(ticker)
91+
{
92+
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
93+
}
94+
95+
function isCoinWithMemo(ticker) {
96+
const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
97+
return coin_info.has_memos
98+
}
99+
90100
function getLanguage()
91101
{
92102
return API.app.settings_pg.lang
@@ -111,17 +121,22 @@ QtObject {
111121
{
112122
let progress = 100
113123
if (!activation_status.hasOwnProperty("result")) return progress
124+
// console.log("["+coin+"] [zhtlcActivationProgress]: " + JSON.stringify(activation_status))
114125
let status = activation_status.result.status
115126
let details = activation_status.result.details
116127

117128
let block_offset = 0
118-
if (coin == 'ARRR') block_offset = 1900000
129+
if (coin == 'ARRR') block_offset = 2000000
119130

120131
// use range from checkpoint block to present
121-
if (status == "Ready")
132+
if (!status)
133+
{
134+
return -1
135+
}
136+
else if (status == "Ok")
122137
{
123138
if (details.hasOwnProperty("error"))
124-
console.log("[zhtlcActivationProgress] Error enabling: " + JSON.stringify(details.error))
139+
console.log("["+coin+"] [zhtlcActivationProgress] Error enabling: " + JSON.stringify(details.error))
125140
}
126141
else if (status == "InProgress")
127142
{
@@ -140,7 +155,7 @@ QtObject {
140155
else if (details.hasOwnProperty("RequestingBalance")) progress = 98
141156
else progress = 5
142157
}
143-
else console.log("[zhtlcActivationProgress] Unexpected status: " + status)
158+
else console.log("["+coin+"] [zhtlcActivationProgress] Unexpected status: " + status)
144159
return progress
145160
}
146161

‎atomic_defi_design/Dex/Constants/Style.qml

+5-1
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ QtObject {
196196
case 'Ethereum Classic': return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"]
197197
case 'Arbitrum': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
198198
case 'ERC-20': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
199+
case 'EWT': return dark_theme ? colorCoinDark["EWT"] : colorCoin["EWT"]
199200
case 'FTM-20': return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"]
200201
case 'Moonbeam': return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"]
201202
case 'HecoChain': return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"]
@@ -237,6 +238,7 @@ QtObject {
237238
case 'Ethereum Classic': return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"]
238239
case 'Arbitrum': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
239240
case 'ERC-20': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"]
241+
case 'EWT': return dark_theme ? colorCoinDark["EWT"] : colorCoin["EWT"]
240242
case 'FTM-20': return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"]
241243
case 'Moonbeam': return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"]
242244
case 'HecoChain': return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"]
@@ -256,7 +258,7 @@ QtObject {
256258

257259
function getCoinColor(ticker) {
258260
let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
259-
if (!info.type) { return dark_theme ? colorCoin["default"] : colorCoinDark["default"] }
261+
if (!info.type) { return colorWhite3 }
260262
let color = getCoinGroupTextColor(info.type)
261263
let base_ticker = atomic_qt_utilities.retrieve_main_ticker(ticker)
262264
if (colorCoin.hasOwnProperty(base_ticker) && !dark_theme)
@@ -278,6 +280,7 @@ QtObject {
278280
"BCH": "#8DC351",
279281
"ETC": "#328432",
280282
"ETH": "#687DE3",
283+
"EWT": "#A466FF",
281284
"FTM": "#13B5EC",
282285
"HECO": "#00953F",
283286
"GLMR": "#F6007C",
@@ -303,6 +306,7 @@ QtObject {
303306
"BCH": "#8DC351",
304307
"ETC": "#328432",
305308
"ETH": "#687DE3",
309+
"EWT": "#A466FF",
306310
"FTM": "#13B5EC",
307311
"HECO": "#00953F",
308312
"GLMR": "#F6007C",

‎atomic_defi_design/Dex/Dashboard/NotificationsModal.qml

+12-20
Original file line numberDiff line numberDiff line change
@@ -234,28 +234,20 @@ DexPopup
234234

235235
function onBalanceUpdateStatus(am_i_sender, amount, ticker, human_date, timestamp)
236236
{
237-
238-
if (!app.segwit_on)
237+
if (amount != 0)
239238
{
240-
if (amount != 0)
241-
{
242-
newNotification(
243-
balanceUpdateStatusNotification,
244-
{
245-
am_i_sender,
246-
amount,
247-
ticker,
248-
human_date,
249-
timestamp
250-
},
251-
timestamp,
239+
newNotification(
240+
balanceUpdateStatusNotification,
241+
{
242+
am_i_sender,
243+
amount,
244+
ticker,
252245
human_date,
253-
"open_wallet_page")
254-
}
255-
}
256-
else
257-
{
258-
app.segwit_on = false
246+
timestamp
247+
},
248+
timestamp,
249+
human_date,
250+
"open_wallet_page")
259251
}
260252
}
261253

0 commit comments

Comments
 (0)