Merge pull request #116 from KomodoPlatform/dev

sync master

.gitignore

@@ -82,3 +82,4 @@ ci_tools_atomic_dex/installer/linux/packages/com.komodoplatform.atomicdexpro/dat
 cmake-build-debug
 cmake-build-release
 .idea
+.gitconfig

assets/config/coins.json

@@ -47,6 +47,78 @@
     "type": "UTXO",
     "name": "Bitcoin Cash"
   },
+  "BET": {
+    "coin": "BET",
+    "name": "BET",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10012"
+      },
+      {
+        "url": "electrum2.cipig.net:10012"
+      },
+      {
+        "url": "electrum3.cipig.net:10012"
+      }
+    ],
+    "explorer_url": [
+      "https://bet.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
+  "BOTS": {
+    "coin": "BOTS",
+    "name": "BOTS",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10007"
+      },
+      {
+        "url": "electrum2.cipig.net:10007"
+      },
+      {
+        "url": "electrum3.cipig.net:10007"
+      }
+    ],
+    "explorer_url": [
+      "https://bots.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
+  "CRYPTO": {
+    "coin": "CRYPTO",
+    "name": "CRYPTO",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10008"
+      },
+      {
+        "url": "electrum2.cipig.net:10008"
+      },
+      {
+        "url": "electrum3.cipig.net:10008"
+      }
+    ],
+    "explorer_url": [
+      "https://crypto.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
   "DASH": {
     "active": false,
     "coin": "DASH",
@@ -71,6 +143,30 @@
     "is_erc_20": false,
     "type": "UTXO"
   },
+  "JUMBLR": {
+    "coin": "JUMBLR",
+    "name": "JUMBLR",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10004"
+      },
+      {
+        "url": "electrum2.cipig.net:10004"
+      },
+      {
+        "url": "electrum3.cipig.net:10004"
+      }
+    ],
+    "explorer_url": [
+      "https://jumblr.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
   "LTC": {
     "active": false,
     "coin": "LTC",
@@ -219,6 +315,32 @@
     "active": false,
     "currently_enabled": false
   },
+  "MGW": {
+    "coin": "MGW",
+    "name": "MGW",
+    "type": "Smart Chain",
+    "rpcport": 12386,
+    "mm2": 1,
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10015"
+      },
+      {
+        "url": "electrum2.cipig.net:10015"
+      },
+      {
+        "url": "electrum3.cipig.net:10015"
+      }
+    ],
+    "explorer_url": [
+      "https://mgw.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
   "VOTE2020": {
     "coin": "VOTE2020",
     "name": "Vote2020",
@@ -317,6 +439,54 @@
     "active": false,
     "currently_enabled": false
   },
+  "PANGEA": {
+    "coin": "PANGEA",
+    "name": "Pangea",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10010"
+      },
+      {
+        "url": "electrum2.cipig.net:10010"
+      },
+      {
+        "url": "electrum3.cipig.net:10010"
+      }
+    ],
+    "explorer_url": [
+      "https://pangea.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
+  "REVS": {
+    "coin": "REVS",
+    "name": "REVS",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10003"
+      },
+      {
+        "url": "electrum2.cipig.net:10003"
+      },
+      {
+        "url": "electrum3.cipig.net:10003"
+      }
+    ],
+    "explorer_url": [
+      "https://revs.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
   "CHIPS": {
     "coin": "CHIPS",
     "type": "UTXO",
@@ -365,6 +535,30 @@
     "active": false,
     "currently_enabled": false
   },
+  "SUPERNET": {
+    "coin": "SUPERNET",
+    "name": "Supernet",
+    "type": "Smart Chain",
+    "coingecko_id": "test-coin",
+    "coinpaprika_id": "test-coin",
+    "is_erc_20": false,
+    "electrum": [
+      {
+        "url": "electrum1.cipig.net:10005"
+      },
+      {
+        "url": "electrum2.cipig.net:10005"
+      },
+      {
+        "url": "electrum3.cipig.net:10005"
+      }
+    ],
+    "explorer_url": [
+      "https://supernet.explorer.dexstats.info/"
+    ],
+    "active": false,
+    "currently_enabled": false
+  },
   "VRSC": {
     "coin": "VRSC",
     "type": "Smart Chain",

atomic_qt_design/qml/Components/WalletNameField.qml

@@ -8,7 +8,7 @@ TextFieldWithTitle {
     id: input_wallet_name
     title: API.get().empty_string + (qsTr("Wallet Name"))
     field.placeholderText: API.get().empty_string + (qsTr("Enter the name of your wallet here"))
-    field.validator: RegExpValidator { regExp: /\w+/ }
+    field.validator: RegExpValidator { regExp: /[a-zA-Z0-9]+/ }
 
     function reset() {
         field.text = ''

ci_tools_atomic_dex/create_installer.bat

@@ -1,11 +1,12 @@
 set build_folder=build-Release\bin
 set root_folder=installer
-set icon_file=app_icon.ico
 set installer_target=%root_folder%\AtomicDEX-Pro-Installer.exe
 set installer_folder=%root_folder%\windows
 set installer_data=%installer_folder%\packages\com.komodoplatform.atomicdexpro\data
 set config_file=%installer_folder%\config\config.xml
 set packages_folder=%installer_folder%\packages
+set icon_file=%root_folder%\app_icon.ico
+set manifest_file=%installer_folder%\atomic_qt.exe.manifest
 
 REM Delete old data
 @RD /S /Q "%installer_data%"
@@ -14,6 +15,9 @@ REM Copy new data
 echo D | xcopy "%build_folder%" "%installer_data%" /E
 
 REM Copy icon
-xcopy "%root_folder%\%icon_file%" "%installer_data%"
+xcopy "%icon_file%" "%installer_data%"
+
+REM Copy exe manifest
+xcopy "%manifest_file%" "%installer_data%"
 
 call %QT_IFW_PATH%\bin\binarycreator.exe -c "%config_file%" -p "%packages_folder%" "%installer_target%"

ci_tools_atomic_dex/installer/windows/atomic_qt.exe.manifest

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="2.0.0.0" processorArchitecture="amd64"
+  name="atomic_qt" type="win32" />
+  <description>AtomicDEX PRO, a desktop wallet application</description>
+  <dependency />
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="requireAdministrator"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+   </trustInfo>
+</assembly>

qml.qrc

@@ -33,16 +33,24 @@
         <file>atomic_qt_design/assets/images/coins/awc.png</file>
         <file>atomic_qt_design/assets/images/coins/btc.png</file>
         <file>atomic_qt_design/assets/images/coins/bch.png</file>
+        <file>atomic_qt_design/assets/images/coins/bet.png</file>
+        <file>atomic_qt_design/assets/images/coins/bots.png</file>
+        <file>atomic_qt_design/assets/images/coins/crypto.png</file>
         <file>atomic_qt_design/assets/images/coins/dash.png</file>
+        <file>atomic_qt_design/assets/images/coins/jumblr.png</file>
         <file>atomic_qt_design/assets/images/coins/ltc.png</file>
         <file>atomic_qt_design/assets/images/coins/eth.png</file>
         <file>atomic_qt_design/assets/images/coins/kmd.png</file>
         <file>atomic_qt_design/assets/images/coins/chips.png</file>
         <file>atomic_qt_design/assets/images/coins/dex.png</file>
         <file>atomic_qt_design/assets/images/coins/labs.png</file>
         <file>atomic_qt_design/assets/images/coins/rick.png</file>
+        <file>atomic_qt_design/assets/images/coins/mgw.png</file>
         <file>atomic_qt_design/assets/images/coins/morty.png</file>
+        <file>atomic_qt_design/assets/images/coins/pangea.png</file>
+        <file>atomic_qt_design/assets/images/coins/revs.png</file>
         <file>atomic_qt_design/assets/images/coins/hush.png</file>
+        <file>atomic_qt_design/assets/images/coins/supernet.png</file>
         <file>atomic_qt_design/assets/images/coins/usdc.png</file>
         <file>atomic_qt_design/assets/images/coins/vrsc.png</file>
         <file>atomic_qt_design/assets/images/coins/vote2020.png</file>