Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pirate (ARRR) integration #1775

Merged
merged 123 commits into from
Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from 114 commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
5c17ffc
ZHTLC
smk762 May 17, 2022
f9e5f97
init_z_coin rpc
smk762 May 17, 2022
35ba22b
add to client
smk762 May 17, 2022
93b4ae5
add init_z_coin
smk762 May 17, 2022
859bea7
enabling zhtlc
smk762 May 24, 2022
05f6ed5
add v2 withdraw
smk762 May 26, 2022
bed7198
fix enable/disable state
smk762 May 27, 2022
3c444ba
clean up prints
smk762 May 27, 2022
7372d7c
add v2 withdraw process
smk762 May 29, 2022
35d8e01
use other mm2 for testing
smk762 May 29, 2022
6bd7285
use 20.04 for testing
smk762 May 29, 2022
392dd0f
use v2 RPC for bestorders and orderbook
smk762 May 31, 2022
915085a
cater for shielded addresses
smk762 Jun 1, 2022
be1aa34
use dev mm2
smk762 Jun 15, 2022
8595061
add notification
smk762 Jun 15, 2022
ed47843
fix conflicts
smk762 Jul 28, 2022
d1e5810
merge from devtatusq
smk762 Jul 28, 2022
bfe6d9e
fix conflicts
smk762 Jul 28, 2022
804d43c
conflict space
smk762 Jul 28, 2022
2989e9a
Merge branch 'dev' into zombie_pirates
smk762 Jul 28, 2022
c327cea
fix merge conflict
smk762 Jul 28, 2022
8cc6301
bigger loop to wait for pirates to come ashore
smk762 Aug 1, 2022
1ba433b
Merge branch 'dev' into zombie_pirates
smk762 Aug 1, 2022
3d70092
rm bad log
smk762 Aug 1, 2022
7b60955
add v2 z_coin_tx_history method
smk762 Aug 3, 2022
6375513
add initial tx history display
smk762 Aug 4, 2022
a529b6f
set fetching busy for zhtlc
smk762 Aug 4, 2022
ebcff3b
avoid locking on enable
smk762 Aug 4, 2022
2b4d1ff
update mm2, add block sync progress logs
smk762 Aug 5, 2022
7b41410
add SLP coins
smk762 Aug 6, 2022
a80e14d
add SLP icons
smk762 Aug 6, 2022
4519286
add SLP related configs
smk762 Aug 6, 2022
5fe088b
more SLP related code
smk762 Aug 7, 2022
a70968c
re-implement SLP enabling
smk762 Aug 7, 2022
f533b5c
Merge branch 'whitelabel-rpcport' into zombie_pirates
smk762 Aug 7, 2022
8b1de1a
fix mac ci error, make zhtlc tradable
smk762 Aug 7, 2022
697e2a8
fix ci error
smk762 Aug 8, 2022
f1f0690
limit z coin tx history response
smk762 Aug 8, 2022
c867887
Add enable slp rpc
Aug 8, 2022
37b9011
Refactoring
Aug 8, 2022
91aa8d7
update zombie image
smk762 Aug 9, 2022
b0d0ac1
update init_z_coin and zombie icon
smk762 Aug 9, 2022
1710f1d
Merge branch 'dev' into zombie_pirates
smk762 Aug 9, 2022
e2649b1
fix slp conflicts
smk762 Aug 9, 2022
221ec1b
clean up old slp overlap code
smk762 Aug 10, 2022
d26cf40
Merge branch 'dev' into zombie_pirates
smk762 Aug 10, 2022
f92ec4b
restore balance updates for zhtlc coins
smk762 Aug 16, 2022
fa05eec
use current date/time for unconfirmed z tx
smk762 Aug 16, 2022
6f7b578
add defauls for status
smk762 Aug 17, 2022
8e6eea7
include qrc fees
smk762 Aug 17, 2022
b8e0f44
add m_coin_enabling_status
smk762 Aug 18, 2022
813f8f0
ensure activated persists
smk762 Aug 18, 2022
debfde3
show ZHTLC in portfolio once UpdatingBlocksCache
smk762 Aug 18, 2022
a37c64d
track activation_status
smk762 Aug 19, 2022
dec8226
fix typo
smk762 Aug 20, 2022
cadc3c5
ack fail
smk762 Aug 20, 2022
b7184eb
js functions for activation trcking
smk762 Aug 20, 2022
152e60d
hide logs, sleep less, tell me when its ready
smk762 Aug 20, 2022
48607cf
block buttons in zhtlc wallet page until fully activated
smk762 Aug 20, 2022
4b3dd4b
add zhtlc activation status to portfolio model
smk762 Aug 21, 2022
71ca1ae
add activation status to portfolio model
smk762 Aug 21, 2022
268a40d
add activation status to portfolio model
smk762 Aug 21, 2022
cebedfc
show activation progress in portfolio page
smk762 Aug 21, 2022
9d664cf
block disabling if activation not complete
smk762 Aug 21, 2022
300df15
Merge branch 'zombie_pirates' of https://github.com/KomodoPlatform/at…
smk762 Aug 21, 2022
6225096
rm activation tag
smk762 Aug 21, 2022
2afa289
fix coin menu vars
smk762 Aug 21, 2022
5613f66
add activation effect to wallet sidebar
smk762 Aug 21, 2022
71fdc00
add activation effect to wallet header and message in tx history area
smk762 Aug 21, 2022
42a77b4
add activation progress effect to dex selectors
smk762 Aug 22, 2022
d6fe312
fix spelling
smk762 Aug 23, 2022
98cf61b
handle app exiting or logging out while zhtlc activation incomplete
smk762 Aug 23, 2022
9071df8
block order form if zhtlc not fully enabled; show error msg
smk762 Aug 23, 2022
550cf89
add validation error message when zhtlc coin not fully activated
smk762 Aug 23, 2022
3f0ac08
temp logs for slow fees
smk762 Aug 24, 2022
9e401d2
fix adress overflow in recieve modal
smk762 Aug 24, 2022
7501dcc
show partial activation progress in balance col
smk762 Aug 24, 2022
02e55d5
hide explorer link if not fully activated
smk762 Aug 24, 2022
33754b5
fix address overflows in send modal
smk762 Aug 24, 2022
3a9b1a5
fix overflows on sent tx modal
smk762 Aug 24, 2022
858f35b
calc public address to cover zhtlc
smk762 Aug 24, 2022
f296f56
code style
smk762 Aug 24, 2022
0408f2f
rework privkey modal to fix zhtlc overflow
smk762 Aug 24, 2022
2ca28a4
fix param nesting
smk762 Aug 24, 2022
bdcc089
hide custom fee switch for zhtlc
smk762 Aug 24, 2022
b5137be
fix copytext background
smk762 Aug 24, 2022
2e34ea9
fix tx history zhtlc overflows
smk762 Aug 24, 2022
0884df3
zcash params service
smk762 Aug 26, 2022
a6e8d13
initial modal for zcash params
smk762 Aug 26, 2022
d0d77c3
merge in dev, fix conflicts
smk762 Aug 26, 2022
687b72c
rm dup code
smk762 Aug 27, 2022
e20a641
add buttons to zcash params modal
smk762 Aug 27, 2022
aa13a9c
add initial download_zcash_params func
smk762 Aug 27, 2022
c0109c7
align qt_downoad_manager
smk762 Aug 27, 2022
f15dfd8
downloading with console logs
smk762 Aug 27, 2022
7783b7f
needs separation
smk762 Aug 28, 2022
017bd72
download manager renaming done
smk762 Aug 28, 2022
a33553a
debugging signal
smk762 Aug 29, 2022
0bcb32b
frontend d/l pct text
smk762 Aug 29, 2022
6acaab5
add progress bars
smk762 Aug 29, 2022
7592bb1
Add status bar
smk762 Aug 30, 2022
232a63a
add statusbar combined download progress
smk762 Aug 30, 2022
ff83042
clean up
smk762 Aug 30, 2022
390d252
disable button while downloading
smk762 Aug 30, 2022
9f2c6c8
use official release mm2 and coins file
smk762 Aug 30, 2022
5ea747a
use ubuntu 18 again
smk762 Aug 30, 2022
790c5dd
ensure button state correct when relaunching download modal
smk762 Aug 30, 2022
d63f0ef
fix tx history bug
smk762 Sep 1, 2022
b6af5c1
fix explorer link on sent modal
smk762 Sep 1, 2022
942c71e
Add ARRR Nomics ID
smk762 Sep 1, 2022
efa777b
code style, rm comments, clean up
smk762 Sep 1, 2022
f8770c6
auto-enable coins after download
smk762 Sep 2, 2022
ac9a179
fix crash when enabling bulk coins
smk762 Sep 2, 2022
35f0e71
track zhtlc coin withdraw status
smk762 Sep 3, 2022
dd108fa
rm log
smk762 Sep 3, 2022
2574d6f
Merge branch 'dev' into zombie_pirates
smk762 Sep 6, 2022
1b309ff
resolve conflicts
smk762 Sep 6, 2022
0990953
rm logs
smk762 Sep 6, 2022
444e64f
add text for shielded addresses
smk762 Sep 6, 2022
d9b2cd6
fix maxvol bug
smk762 Sep 6, 2022
cfb4d4b
try orderbook fix
smk762 Sep 6, 2022
99c2b98
fix bestorders bug
smk762 Sep 7, 2022
369320d
fix paprika id
smk762 Sep 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ endif ()
##! We fetch our dependencies
if (APPLE)
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Darwin-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Darwin-Release.zip)
elseif (UNIX AND NOT APPLE)
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Linux-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Linux-Release.zip)
else ()
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Windows_NT-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Windows_NT-Release.zip)
endif ()

#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
Expand Down Expand Up @@ -129,4 +129,4 @@ endif ()
add_library(antara_qrcode STATIC)
target_sources(antara_qrcode PRIVATE vendor/qrcode/QrCode.cpp)
target_include_directories(antara_qrcode PUBLIC vendor/qrcode)
target_link_libraries(antara_qrcode PUBLIC antara::default_settings)
target_link_libraries(antara_qrcode PUBLIC antara::default_settings)
156 changes: 149 additions & 7 deletions assets/config/0.5.6-coins.json
Original file line number Diff line number Diff line change
Expand Up @@ -897,9 +897,111 @@
"explorer_url": [
"https://explorer.bitcoin.com/bch/"
],
"type": "UTXO",
"bchd_urls": [
"https://bchd.fountainhead.cash:443"
],
"allow_slp_unsafe_conf": false,
"type": "BCH",
"name": "Bitcoin Cash"
},
"sTST": {
"coin": "sTST",
"active": false,
"is_testnet": true,
"coingecko_id": "test-coin",
"coinpaprika_id": "test-coin",
"currently_enabled": false,
"explorer_url": [
"https://testnet.simpleledger.info/"
],
"explorer_tx_url": "#tx/",
"type": "tBCH",
"name": "sTST"
},
"HONK": {
"coin": "HONK",
"active": false,
"coingecko_id": "test-coin",
"coinpaprika_id": "test-coin",
"currently_enabled": false,
"explorer_url": [
"https://simpleledger.info/"
],
"explorer_tx_url": "#tx/",
"type": "BCH",
"name": "HONK HONK"
},
"ASLP": {
"coin": "ASLP",
"active": false,
"coingecko_id": "test-coin",
"coinpaprika_id": "test-coin",
"currently_enabled": false,
"explorer_url": [
"https://simpleledger.info/"
],
"explorer_tx_url": "#tx/",
"type": "BCH",
"name": "AtomicSLP"
},
"USDF": {
"coin": "USDF",
"active": false,
"is_testnet": true,
"coingecko_id": "test-coin",
"coinpaprika_id": "test-coin",
"currently_enabled": false,
"explorer_url": [
"https://testnet.simpleledger.info/"
],
"explorer_tx_url": "#tx/",
"type": "tBCH",
"name": "Fake USD (Testnet)"
},
"tBCH": {
"coin": "tBCH",
"active": false,
"is_testnet": true,
"coingecko_id": "test-coin",
"coinpaprika_id": "test-coin",
"currently_enabled": false,
"electrum": [
{
"url": "tbch.loping.net:60002",
"protocol": "SSL"
},
{
"url": "electroncash.de:50004",
"protocol": "SSL"
},
{
"url": "testnet.bitcoincash.network:60002",
"protocol": "SSL"
}
],
"explorer_url": [
"https://tbch.loping.net/"
],
"bchd_urls": [
"https://bchd-testnet.greyh.at:18335"
],
"allow_slp_unsafe_conf": false,
"type": "BCH",
"name": "Bitcoin Cash (Testnet)"
},
"USDT-SLP": {
"coin": "USDT-SLP",
"active": false,
"coingecko_id": "tether",
"coinpaprika_id": "usdt-tether",
"currently_enabled": false,
"explorer_url": [
"https://simpleledger.info/"
],
"explorer_tx_url": "#tx/",
"type": "BCH",
"name": "Tether"
},
"BCH-ERC20": {
"coin": "BCH-ERC20",
"name": "Bitcoin Cash",
Expand Down Expand Up @@ -2142,7 +2244,7 @@
"ws_url": "78.141.233.64:9001"
},
{
"url": "192.248.166.207:10001",
"url": "192.248.166.207:10001",
"ws_url": "192.248.166.207:9001"
}
],
Expand Down Expand Up @@ -5925,7 +6027,7 @@
"type": "UTXO",
"active": false,
"currently_enabled": false
},
},
"QIAIR": {
"coin": "QIAIR",
"name": "Qi Airdrop Token",
Expand Down Expand Up @@ -10475,7 +10577,7 @@
"active": false,
"currently_enabled": false
},
"IC": {
"IC": {
"coin": "IC",
"name": "Ignition",
"coingecko_id": "ignition",
Expand Down Expand Up @@ -10571,12 +10673,12 @@
"url": "electrumx2.actioncoin.com:30001",
"ws_url": "electrumx2.actioncoin.com:20001",
"protocol": "SSL"
},
},
{
"url": "electrumx1.actioncoin.com:10001"
},
{
"url": "electrumx2.actioncoin.com:10001"
"url": "electrumx2.actioncoin.com:10001"
}
],
"explorer_url": [
Expand All @@ -10602,5 +10704,45 @@
],
"active": false,
"currently_enabled": false
},
"ZOMBIE": {
"coin": "ZOMBIE",
"name": "Zombie",
"coinpaprika_id": "test-coin",
"coingecko_id": "test-coin",
"is_testnet": true,
"light_wallet_d_servers": [
"http://zombie.sirseven.me:443"
],
"electrum": [
{"url":"zombie.sirseven.me:10033"}
],
"explorer_url": [
"https://zombie.explorer.lordofthechains.com/"
],
"type": "ZHTLC",
"active": false,
"currently_enabled": false,
"wallet_only": false
},
"ARRR": {
"coin": "ARRR",
"name": "Pirate",
"nomics_id": "ARRR",
"coinpaprika_id": "arrr-coin",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id is arrr-pirate, like in https://coinpaprika.com/coin/arrr-pirate/

"coingecko_id": "pirate-chain",
"light_wallet_d_servers": [
"http://pirate.sirseven.me:443"
],
"electrum": [
{"url":"pirate.sirseven.me:10032"}
],
"explorer_url": [
"https://pirate.explorer.dexstats.info/"
],
"type": "ZHTLC",
"active": false,
"currently_enabled": false,
"wallet_only": false
}
}
}
10 changes: 9 additions & 1 deletion atomic_defi_design/Dex/Components/CoinMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ Menu {
id: disable_action
text: qsTr("Disable %1", "TICKER").arg(ticker)
onTriggered: API.app.disable_coins([ticker])
enabled: General.canDisable(ticker)
enabled:
{
let progress = General.zhtlcActivationProgress(current_ticker_infos.activation_status, ticker)
if (General.isZhtlc(ticker))
{
if (progress != 100) return false
}
return General.canDisable(ticker, progress)
}
}

MenuItem {
Expand Down
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Components/DefaultCopyIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Qaterial.Icon
hoverEnabled: true
onClicked:
{
Qaterial.Clipboard.text = control.text
Qaterial.Clipboard.text = copyText
app.notifyCopy(notifyTitle, notifyMsg)
}
}
Expand Down
69 changes: 69 additions & 0 deletions atomic_defi_design/Dex/Components/DefaultProgressBar.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Qt Imports
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15

// Project Imports
import "../Constants" as Dex
import "../Components" as Dex
import App 1.0

RowLayout
{
id: root
property double label_width: 175
property double bar_width_pct: 0
property color bar_color: Dex.DexTheme.greenColor
property alias label: _label
property alias pct_bar: _pct_bar
property alias pct_value: _pct_value
anchors.leftMargin: 10
anchors.rightMargin: 10
width: parent.width
height: 42
spacing: 10

Dex.DexLabel
{
id: _label
font.bold: true
Layout.preferredWidth: label_width
Layout.alignment: Qt.AlignVCenter
Component.onCompleted: font.weight = Font.Bold
}

// Progress bar
Item
{
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true
height: 5

Rectangle
{
id: bg_bar
anchors.fill: parent
radius: 5
opacity: 0.1
color: DexTheme.foregroundColorLightColor5
}

Rectangle
{
id: _pct_bar
height: parent.height
radius: 5
width: bar_width_pct / 100 * parent.width
color: root.bar_color
}
}

Dex.DexLabel
{
id: _pct_value
Layout.preferredWidth: 60
text: "0.00 %"
Layout.alignment: Qt.AlignVCenter
Component.onCompleted: font.family = 'lato'
}
}
14 changes: 14 additions & 0 deletions atomic_defi_design/Dex/Components/MultipageModalContent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@ import QtQuick.Layouts 1.15

import "../Constants"
import App 1.0
import Dex.Themes 1.0 as Dex

ColumnLayout
{
id: root

property alias title: _title
property alias titleText: _title.text
property alias subtitle: _subtitle
property alias subtitleText: _subtitle.text
property var titleAlignment: Qt.AlignLeft
property var subtitleAlignment: Qt.AlignLeft
property int titleTopMargin: 20
property int topMarginAfterTitle: 30

Expand All @@ -35,6 +39,16 @@ ColumnLayout
visible: text != ''
}

DefaultText
{
id: _subtitle
Layout.topMargin: 5
Layout.alignment: root.subtitleAlignment
color: Dex.CurrentTheme.foregroundColor2
font.pixelSize: 13
visible: text != ''
}

// Header

ColumnLayout
Expand Down
Loading