Skip to content

Commit 8ecd226

Browse files
satindergrewalsatindergrewal
authored
Merge pull request #2 from Komodian/dev
0.5.4 updates
2 parents 3087d28 + bb5e850 commit 8ecd226

Some content is hidden

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

61 files changed

+1214
-825
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
$Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
286286
$Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
287287
cd b\bin
288-
./atomicdex-desktop_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
288+
./${{ env.DEX_PROJECT_NAME }}_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
289289
#Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
290290
#python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
291291

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "ci_tools_atomic_dex/vcpkg-custom-ports"]
55
path = ci_tools_atomic_dex/vcpkg-custom-ports
66
url = https://github.com/KomodoPlatform/vcpkg-custom-ports
7+
[submodule "atomic_defi_design/imports/bignumberjs/bignumber.js"]
8+
path = atomic_defi_design/imports/bignumberjs/bignumber.js
9+
url = https://github.com/KomodoPlatform/bignumber.js.git

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ endif ()
6161
##! We fetch our dependencies
6262
if (APPLE)
6363
FetchContent_Declare(mm2
64-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5048/mm2-213bfddd5-Darwin-Release.zip)
64+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Darwin-Release.zip)
6565
elseif (UNIX AND NOT APPLE)
6666
FetchContent_Declare(mm2
67-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5048/mm2-213bfddd5-Linux-Release.zip)
67+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Linux-Release.zip)
6868
else ()
6969
FetchContent_Declare(mm2
70-
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5048/mm2-213bfddd5-Windows_NT-Release.zip)
70+
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Windows_NT-Release.zip)
7171
endif ()
7272

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

‎README.md‎

Lines changed: 117 additions & 85 deletions
Large diffs are not rendered by default.

‎assets/config/0.5.4-coins.json‎

Lines changed: 149 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,6 +1985,37 @@
19851985
"active": false,
19861986
"currently_enabled": false
19871987
},
1988+
"DIMI-BEP20": {
1989+
"coin": "DIMI-BEP20",
1990+
"name": "DiminutiveCoin",
1991+
"coinpaprika_id": "dimi-diminutive-coin",
1992+
"coingecko_id": "diminutive-coin",
1993+
"nomics_id": "DIMI",
1994+
"nodes": [
1995+
"http://bsc1.cipig.net:8655",
1996+
"http://bsc2.cipig.net:8655",
1997+
"http://bsc3.cipig.net:8655"
1998+
],
1999+
"explorer_url": [
2000+
"https://bscscan.com/"
2001+
],
2002+
"type": "BEP-20",
2003+
"active": false,
2004+
"currently_enabled": false
2005+
},
2006+
"DIMI-QRC20": {
2007+
"coin": "DIMI-QRC20",
2008+
"name": "DiminutiveCoin",
2009+
"coinpaprika_id": "dimi-diminutive-coin",
2010+
"coingecko_id": "diminutive-coin",
2011+
"nomics_id": "DIMI",
2012+
"explorer_url": [
2013+
"https://explorer.qtum.org/"
2014+
],
2015+
"type": "QRC-20",
2016+
"active": false,
2017+
"currently_enabled": false
2018+
},
19882019
"DODO-BEP20": {
19892020
"coin": "DODO-BEP20",
19902021
"name": "DODO",
@@ -2180,7 +2211,7 @@
21802211
"disable_cert_verification": true
21812212
},
21822213
{
2183-
"url": "electrum3.egulden.org:50002",
2214+
"url": "electrum2.egulden.org:50002",
21842215
"protocol": "SSL",
21852216
"disable_cert_verification": true
21862217
},
@@ -2765,10 +2796,10 @@
27652796
"nomics_id": "GRS",
27662797
"electrum": [
27672798
{
2768-
"url": "electrum10.groestlcoin.org:50001"
2799+
"url": "electrum11.groestlcoin.org:50001"
27692800
},
27702801
{
2771-
"url": "electrum11.groestlcoin.org:50001"
2802+
"url": "electrum12.groestlcoin.org:50001"
27722803
},
27732804
{
27742805
"url": "electrum13.groestlcoin.org:50001"
@@ -4875,6 +4906,24 @@
48754906
"active": false,
48764907
"currently_enabled": false
48774908
},
4909+
"MINDS": {
4910+
"coin": "MINDS",
4911+
"name": "Minds",
4912+
"coinpaprika_id": "minds-minds",
4913+
"coingecko_id": "minds",
4914+
"nomics_id": "MINDS",
4915+
"nodes": [
4916+
"http://eth1.cipig.net:8555",
4917+
"http://eth2.cipig.net:8555",
4918+
"http://eth3.cipig.net:8555"
4919+
],
4920+
"explorer_url": [
4921+
"https://etherscan.io/"
4922+
],
4923+
"type": "ERC-20",
4924+
"active": false,
4925+
"currently_enabled": false
4926+
},
48784927
"MGW": {
48794928
"coin": "MGW",
48804929
"name": "MGW",
@@ -4981,6 +5030,43 @@
49815030
"active": false,
49825031
"currently_enabled": false
49835032
},
5033+
"NYAN": {
5034+
"coin": "NYAN",
5035+
"name": "Nyancoin",
5036+
"coinpaprika_id": "test-coin",
5037+
"coingecko_id": "test-coin",
5038+
"nomics_id": "NYAN",
5039+
"electrum": [
5040+
{
5041+
"url": "txserver.live:50022",
5042+
"protocol": "SSL"
5043+
},
5044+
{
5045+
"url": "txserver.live:50020",
5046+
"protocol": "TCP"
5047+
},
5048+
{
5049+
"url": "electrumx.live:50022",
5050+
"protocol": "SSL"
5051+
},
5052+
{
5053+
"url": "electrumx.live:50020",
5054+
"protocol": "TCP"
5055+
},
5056+
{
5057+
"url": "electrumxnyan01.ddns.net:50020",
5058+
"protocol": "TCP"
5059+
}
5060+
],
5061+
"explorer_url": [
5062+
"https://www.nyanchain.com/"
5063+
],
5064+
"explorer_tx_url": "tx.nyan?",
5065+
"explorer_address_url": "ad.nyan?",
5066+
"type": "UTXO",
5067+
"active": false,
5068+
"currently_enabled": false
5069+
},
49845070
"PANGEA": {
49855071
"coin": "PANGEA",
49865072
"name": "Pangea",
@@ -5054,6 +5140,41 @@
50545140
"active": false,
50555141
"currently_enabled": false
50565142
},
5143+
"PRUX": {
5144+
"coin": "PRUX",
5145+
"name": "PRUX",
5146+
"coinpaprika_id": "prux-prux-coin",
5147+
"coingecko_id": "test-coin",
5148+
"nomics_id": "PRUX",
5149+
"electrum": [
5150+
{
5151+
"url": "txserver.live:50002",
5152+
"protocol": "SSL"
5153+
},
5154+
{
5155+
"url": "electrumx.live:50012",
5156+
"protocol": "SSL"
5157+
},
5158+
{
5159+
"url": "txserver.live:50001",
5160+
"protocol": "TCP"
5161+
},
5162+
{
5163+
"url": "electrumx.live:50010",
5164+
"protocol": "TCP"
5165+
},
5166+
{
5167+
"url": "electrumxprux02.sytes.net:50001",
5168+
"protocol": "TCP"
5169+
}
5170+
],
5171+
"explorer_url": [
5172+
"https://explorer.prux.info/"
5173+
],
5174+
"type": "UTXO",
5175+
"active": false,
5176+
"currently_enabled": false
5177+
},
50575178
"QIAIR": {
50585179
"coin": "QIAIR",
50595180
"name": "Qi Airdrop Token",
@@ -5712,13 +5833,24 @@
57125833
"nomics_id": "NAV",
57135834
"electrum": [
57145835
{
5715-
"url": "electrum1.cipig.net:10056"
5836+
"url": "electrum.nav.community:40002",
5837+
"protocol": "SSL",
5838+
"ws_url": "electrum.nav.community:40004"
57165839
},
57175840
{
5718-
"url": "electrum2.cipig.net:10056"
5841+
"url": "electrum2.nav.community:40002",
5842+
"protocol": "SSL",
5843+
"ws_url": "electrum2.nav.community:40004"
57195844
},
57205845
{
5721-
"url": "electrum3.cipig.net:10056"
5846+
"url": "electrum3.nav.community:40002",
5847+
"protocol": "SSL",
5848+
"ws_url": "electrum3.nav.community:40004"
5849+
},
5850+
{
5851+
"url": "electrum4.nav.community:40002",
5852+
"protocol": "SSL",
5853+
"ws_url": "electrum4.nav.community:40004"
57225854
}
57235855
],
57245856
"explorer_url": [
@@ -6243,6 +6375,7 @@
62436375
"name": "Spacecoin",
62446376
"coingecko_id": "test-coin",
62456377
"coinpaprika_id": "space-spacecoin7367",
6378+
"nomics_id": "SPACE7",
62466379
"electrum": [
62476380
{
62486381
"url": "electrum1.spaceworks.co:50001"
@@ -6333,7 +6466,7 @@
63336466
"coin": "TKL",
63346467
"name": "Tokel",
63356468
"coinpaprika_id": "tkl-tokel",
6336-
"coingecko_id": "test-coin",
6469+
"coingecko_id": "tokel",
63376470
"nomics_id": "TKL2",
63386471
"electrum": [
63396472
{
@@ -7205,6 +7338,10 @@
72057338
"url": "failover.zet.ewmci.xyz:50002",
72067339
"protocol": "SSL",
72077340
"disable_cert_verification": true
7341+
},
7342+
{
7343+
"url": "electrumx.zet.ewmcx.info:50001",
7344+
"protocol": "TCP"
72087345
}
72097346
],
72107347
"explorer_url": [
@@ -8895,12 +9032,11 @@
88959032
"currently_enabled": false
88969033
},
88979034
"USBL": {
8898-
"active": false,
88999035
"coin": "USBL",
8900-
"name": "Balanced",
9036+
"name": "Balanced Dollar",
89019037
"coingecko_id": "test-coin",
89029038
"coinpaprika_id": "test-coin",
8903-
"currently_enabled": false,
9039+
"nomics_id": "USBL",
89049040
"electrum": [
89059041
{
89069042
"url": "swap.softbalanced.com:50001",
@@ -8916,7 +9052,9 @@
89169052
"https://softbalanced.com:3001/insight/"
89179053
],
89189054
"explorer_tx_url": "tx/",
8919-
"type": "UTXO"
9055+
"type": "UTXO",
9056+
"active": false,
9057+
"currently_enabled": false
89209058
},
89219059
"UTK": {
89229060
"coin": "UTK",

‎assets/themes/Default - Dark/colors.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@
4444
"modalPageCounterGradientStartColor": "#1D80B0",
4545
"modalPageCounterGradientEndColor": "#5B69E6",
4646

47+
"notifPopupBackgroundColor": "#24273DFF",
48+
"notifPopupTextColor": "#FFFFFFFF",
49+
"notifPopupTimerColor": "#8790B2FF",
50+
"notifPopupTimerBackgroundColor": "#94A3B11F",
51+
"notifPopupIconStartColor": "#FFFFFFFF",
52+
"notifPopupIconEndColor": "#FFFFFFFF",
53+
4754
"scrollBarIndicatorColor": "#8790B2FF",
4855
"scrollBarBackgroundColor": "#94A3B11F",
4956

‎assets/themes/Default - Light/colors.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
"modalPageCounterGradientStartColor": "#9DD4F3",
4242
"modalPageCounterGradientEndColor": "#9DD4F3",
4343

44+
"notifPopupBackgroundColor": "#EDF4FFFF",
45+
"notifPopupTextColor": "#456078FF",
46+
"notifPopupTimerColor": "#DBE0E4FF",
47+
"notifPopupTimerBackgroundColor": "#93A3B1FF",
48+
"notifPopupIconStartColor": "#000000FF",
49+
"notifPopupIconEndColor": "#000000FF",
50+
4451
"scrollBarIndicatorColor": "#DBE0E4FF",
4552
"scrollBarBackgroundColor": "#93A3B1FF",
4653

0 commit comments

Comments
 (0)