Merge pull request #1775 from KomodoPlatform/zombie_pirates

Pirate (ARRR) integration
KomodoPlatform · Sep 9, 2022 · 1ec41dd · 1ec41dd
2 parents 83c2776 + 369320d
commit 1ec41dd
Show file tree

Hide file tree

Showing 116 changed files with 3,795 additions and 776 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
@@ -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)
diff --git a/assets/config/0.5.6-coins.json b/assets/config/0.5.6-coins.json
@@ -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",
@@ -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"
       }
     ],
@@ -5979,7 +6081,7 @@
       "type": "UTXO",
       "active": false,
       "currently_enabled": false
-  },	
+  },
   "QIAIR": {
     "coin": "QIAIR",
     "name": "Qi Airdrop Token",
@@ -10571,7 +10673,7 @@
     "active": false,
     "currently_enabled": false
   },
-    "IC": {
+  "IC": {
     "coin": "IC",
     "name": "Ignition",
     "coingecko_id": "ignition",
@@ -10667,12 +10769,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": [
@@ -10698,5 +10800,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-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
   }
-}
+}
diff --git a/atomic_defi_design/Dex/Components/CoinMenu.qml b/atomic_defi_design/Dex/Components/CoinMenu.qml
@@ -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 {

diff --git a/atomic_defi_design/Dex/Components/DefaultCopyIcon.qml b/atomic_defi_design/Dex/Components/DefaultCopyIcon.qml
@@ -23,7 +23,7 @@ Qaterial.Icon
         hoverEnabled: true
         onClicked:
         {
-            Qaterial.Clipboard.text = control.text
+            Qaterial.Clipboard.text = copyText
             app.notifyCopy(notifyTitle, notifyMsg)
         }
     }

diff --git a/atomic_defi_design/Dex/Components/DefaultProgressBar.qml b/atomic_defi_design/Dex/Components/DefaultProgressBar.qml
@@ -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'
+    }
+}
diff --git a/atomic_defi_design/Dex/Components/MultipageModalContent.qml b/atomic_defi_design/Dex/Components/MultipageModalContent.qml
@@ -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
 
@@ -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