Merge remote-tracking branch 'upstream/slptokens' into cipi

btcz · Sep 27, 2022 · f4e532a · f4e532a
2 parents e7f0969 + 76be1e7
commit f4e532a
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 60 deletions.
diff --git a/assets/config/0.5.6-coins.json b/assets/config/0.5.6-coins.json
@@ -848,51 +848,6 @@
     "active": false,
     "currently_enabled": false
   },
-  "BCH": {
-    "coin": "BCH",
-    "coingecko_id": "bitcoin-cash",
-    "coinpaprika_id": "bch-bitcoin-cash",
-    "nomics_id": "BCH",
-    "active": false,
-    "currently_enabled": false,
-    "electrum": [
-      {
-        "url": "electrum1.cipig.net:10055",
-        "ws_url": "electrum1.cipig.net:30055"
-      },
-      {
-        "url": "electrum2.cipig.net:10055",
-        "ws_url": "electrum2.cipig.net:30055"
-      },
-      {
-        "url": "electrum3.cipig.net:10055",
-        "ws_url": "electrum3.cipig.net:30055"
-      }
-    ],
-    "explorer_url": [
-      "https://explorer.bitcoin.com/bch/"
-    ],
-    "bchd_urls": [
-      "https://bchd.fountainhead.cash:443"
-    ],
-    "allow_slp_unsafe_conf": false,
-    "type": "UTXO",
-    "other_types": ["SLP"],
-    "name": "Bitcoin Cash"
-  },
-  "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": "SLP",
-    "name": "Tether"
-  },
   "BCH-ERC20": {
     "coin": "BCH-ERC20",
     "name": "Bitcoin Cash",
@@ -10783,6 +10738,38 @@
     "currently_enabled": false,
     "wallet_only": false
   },
+  "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": "UTXO",
+    "other_types": ["SLP"],
+    "name": "Bitcoin Cash (Testnet)"
+  },
   "sTST": {
     "coin": "sTST",
     "active": false,
@@ -10811,36 +10798,75 @@
     "type": "SLP",
     "name": "Fake USD (Testnet)"
   },
-  "tBCH": {
-    "coin": "tBCH",
+  "BCH": {
+    "coin": "BCH",
+    "coingecko_id": "bitcoin-cash",
+    "coinpaprika_id": "bch-bitcoin-cash",
+    "nomics_id": "BCH",
     "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": "electrum1.cipig.net:10055",
+        "ws_url": "electrum1.cipig.net:30055"
       },
       {
-        "url": "electroncash.de:50004",
-        "protocol": "SSL"
+        "url": "electrum2.cipig.net:10055",
+        "ws_url": "electrum2.cipig.net:30055"
       },
       {
-        "url": "testnet.bitcoincash.network:60002",
-        "protocol": "SSL"
+        "url": "electrum3.cipig.net:10055",
+        "ws_url": "electrum3.cipig.net:30055"
       }
     ],
     "explorer_url": [
-      "https://tbch.loping.net/"
+      "https://explorer.bitcoin.com/bch/"
     ],
     "bchd_urls": [
-      "https://bchd-testnet.greyh.at:18335"
+      "https://bchd.fountainhead.cash:443"
     ],
     "allow_slp_unsafe_conf": false,
     "type": "UTXO",
     "other_types": ["SLP"],
-    "name": "Bitcoin Cash (Testnet)"
+    "name": "Bitcoin Cash"
+  },
+  "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": "SLP",
+    "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": "SLP",
+    "name": "AtomicSLP"
+  },
+  "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": "SLP",
+    "name": "Tether"
   }
 }
diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp
@@ -508,7 +508,7 @@ namespace atomic_dex
             }
             else if (coin_config.coin_type == CoinType::SLP || (coin_config.other_types && coin_config.other_types->contains(CoinType::SLP)))
             {
-                if (coin_config.is_testnet)
+                if (coin_config.is_testnet.value_or(false))
                 {
                     slp_testnet_coins.push_back(coin_config);
                 }