Merge branch 'KomodoPlatform-master'

marmarachain · Sep 28, 2021 · a9f391e · a9f391e
2 parents 793576a + 92101a4
commit a9f391e
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 27 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -300,20 +300,23 @@ jobs:
         with:
           name: ${{ env.artifact_name_zstd }}
           path: ./bundled/linux/${{ env.target_name_zstd }}
+          retention-days: 7
 
       - name: Upload bundle artifact (Linux ZIP)
         if: runner.os == 'Linux'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/linux/${{ env.target_name_zip }}
+          retention-days: 7
 
       - name: Upload bundle artifact (Linux AppImage)
         if: runner.os == 'Linux'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.artifact_name_appimage }}
           path: ./bundled/linux/${{ env.target_name_appimage }}
+          retention-days: 7
 
       - name: Upload env variable for artifacts (macOS)
         if: runner.os == 'macOS'
@@ -328,13 +331,15 @@ jobs:
         with:
           name: ${{ env.artifact_name_dmg }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg
+          retention-days: 7
 
       - name: Upload artifacts (MacOS installer)
         if: runner.os == 'macOS'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
+          retention-days: 7
 
       - name: Upload env variable for artifacts (Windows)
         if: runner.os == 'Windows'
@@ -349,12 +354,14 @@ jobs:
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/windows/bin.zip
+          retention-days: 7
 
       - name: Upload artifacts (Windows installer)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
+          retention-days: 7
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
 include(qt_prerequisites)
 include(cfg_hash)
 
-project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.1)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.2)
 message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
 
 include(cmake_default_options)
@@ -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.4270/mm2-3a3f159bf-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4270/mm2-3a3f159bf-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4270/mm2-3a3f159bf-Windows_NT-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4315/mm2-9fe6e9402-Windows_NT-Release.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)

diff --git a/assets/config/0.5.1-coins.json → assets/config/0.5.2-coins.json b/assets/config/0.5.1-coins.json → assets/config/0.5.2-coins.json
@@ -142,6 +142,24 @@
     "active": false,
     "currently_enabled": false
   },
+  "ARRR-BEP20": {
+      "coin": "ARRR-BEP20",
+      "name": "Pirate",
+      "coinpaprika_id": "arrr-pirate",
+      "coingecko_id": "pirate-chain",
+      "nodes": [
+        "http://bsc1.cipig.net:8655",
+        "http://bsc2.cipig.net:8655",
+        "http://bsc3.cipig.net:8655"
+      ],
+      "explorer_url": [
+        "https://bscscan.com/"
+      ],
+      "type": "BEP-20",
+      "active": false,
+      "currently_enabled": false,
+      "wallet_only": true
+  },
   "AXS-BEP20": {
       "coin": "AXS-BEP20",
       "name": "Axie Infinity",
@@ -1588,6 +1606,23 @@
     "active": false,
     "currently_enabled": false
   },
+  "FJCB": {
+    "coin": "FJCB",
+    "name": "FJCB Fujicoin",
+    "coinpaprika_id": "test-coin",
+    "coingecko_id": "test-coin",
+    "nodes": [
+      "http://bsc1.cipig.net:8655",
+      "http://bsc2.cipig.net:8655",
+      "http://bsc3.cipig.net:8655"
+    ],
+    "explorer_url": [
+      "https://bscscan.com/"
+    ],
+    "type": "BEP-20",
+    "active": false,
+    "currently_enabled": false
+  },
   "STFIRO": {
     "coin": "STFIRO",
     "name": "StakedFIRO",

diff --git a/atomic_defi_design/assets/images/coins/arrr.png b/atomic_defi_design/assets/images/coins/arrr.png
diff --git a/atomic_defi_design/assets/images/coins/fjcb.png b/atomic_defi_design/assets/images/coins/fjcb.png
diff --git a/atomic_defi_design/qml/Constants/General.qml b/atomic_defi_design/qml/Constants/General.qml
@@ -35,6 +35,11 @@ QtObject {
         }
     }
 
+    function isIDO(ticker) {
+        let IDO_chains = []
+        return IDO_chains.includes(ticker)
+    }
+
     // Returns the icon full path of a coin type.
     // If the given coin type has spaces, it will be replaced by '-' characters.
     // If the given coin type is empty, returns an empty string.
@@ -566,6 +571,14 @@ QtObject {
                                                 "ARPA/DAI": "BINANCE:ARPAUSD",
                                                 "ARPA/PAX": "BINANCE:ARPAUSD",
                                                 "ARPA/TRYB": "BINANCE:ARPATRY",
+                                                "ARRR/BTC": "KUCOIN:ARRRBTC",
+                                                "ARRR/USDT": "KUCOIN:ARRRUSDT",
+                                                "ARRR/BUSD": "KUCOIN:ARRRUSDT",
+                                                "ARRR/USDC": "KUCOIN:ARRRUSDT",
+                                                "ARRR/TUSD": "KUCOIN:ARRRUSDT",
+                                                "ARRR/HUSD": "KUCOIN:ARRRUSDT",
+                                                "ARRR/DAI": "KUCOIN:ARRRUSDT",
+                                                "ARRR/PAX": "KUCOIN:ARRRUSDT",
                                                 "ATOM/BTC": "BINANCE:ATOMBTC",
                                                 "ATOM/ETH": "KRAKEN:ATOMETH",
                                                 "ATOM/USDT": "COINBASE:ATOMUSD",

diff --git a/atomic_defi_design/qml/Constants/Style.qml b/atomic_defi_design/qml/Constants/Style.qml
@@ -274,6 +274,7 @@ QtObject {
                                           "ADX": "#1B75BC",
                                           "ANKR": "#2075E8",
                                           "ARPA": "#CCD9E2",
+                                          "ARRR": "#C7A34C",
                                           "ATOM": "#474B6C",
                                           "AUR": "#0A6C5E",
                                           "AVA": "#5B567F",
@@ -396,6 +397,7 @@ QtObject {
                                           "EURS": "#2F77ED",
                                           "FIL": "#4CCAD2",
                                           "FJC": "#00AFEC",
+                                          "FJCB": "#FFCC33",
                                           "FUN": "#EF1C70",
                                           "GNO": "#00B0CC",
                                           "HOT": "#983EFF",

diff --git a/atomic_defi_design/qml/Portfolio/AssetsList.qml b/atomic_defi_design/qml/Portfolio/AssetsList.qml
@@ -147,7 +147,7 @@ Dex.DefaultListView
 
                     Dex.DexLabel
                     {
-                        enabled: name === "Tokel"
+                        enabled: Dex.General.isIDO(ticker)
                         visible: enabled
                         anchors.left: parent.right
                         anchors.leftMargin: 5
@@ -219,8 +219,13 @@ Dex.DefaultListView
 
                     Dex.DexTooltip
                     {
+                        contentItem: Dex.DexLabel {
+                           text: qsTr("Price provider is: %1").arg(DexString.capitalizeFirstLetter(priceProvider))
+                           font: Dex.DexTypo.caption
+                           color: Dex.DexTheme.colorWhite7
+                           padding: 5
+                        }
                         visible: priceProviderIconMouseArea.containsMouse
-                        text: qsTr("Price provider is: %1").arg(DexString.capitalizeFirstLetter(priceProvider))
                     }
                 }
             }

diff --git a/atomic_defi_design/qml/Portfolio/TableDex.qml b/atomic_defi_design/qml/Portfolio/TableDex.qml
@@ -222,7 +222,7 @@ Item {
 
                             DefaultText
                             {
-                                enabled: name === "Tokel"
+                                enabled: General.isIDO(ticker)
                                 visible: enabled
                                 anchors.left: parent.right
                                 anchors.leftMargin: 5

diff --git a/atomic_defi_design/qml/Wallet/EnableCoinModal.qml b/atomic_defi_design/qml/Wallet/EnableCoinModal.qml
@@ -129,7 +129,7 @@ BasicModal {
                     anchors.left: typeTag.right
                     anchors.leftMargin: 3
                     anchors.verticalCenter: parent.verticalCenter
-                    enabled: model.ticker === "TKL"
+                    enabled: General.isIDO(ticker)
                     visible: enabled
                     type: "IDO"
                 }

diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>${DEX_DISPLAY_NAME}</Name>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Title>${DEX_DISPLAY_NAME} Installer</Title>
     <ProductUrl>${DEX_WEBSITE}</ProductUrl>
     <Publisher>${DEX_COMPANY}</Publisher>
@@ -14,4 +14,4 @@
     <InstallerApplicationIcon>install_icon</InstallerApplicationIcon>
     <Logo>install_icon.png</Logo>
     <WizardStyle>Mac</WizardStyle>
-</Installer>
+</Installer>
diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,11 +2,11 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.1</Version>
-    <ReleaseDate>2021-09-06</ReleaseDate>
+    <Version>0.5.2</Version>
+    <ReleaseDate>2021-09-23</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>
 	<Default>true</Default>
 	<Script>installscript.qs</Script>
-</Package>
+</Package>
diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>@DEX_DISPLAY_NAME@</Name>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Title>@DEX_DISPLAY_NAME@ Installer</Title>
     <ProductUrl>@DEX_WEBSITE@</ProductUrl>
     <Publisher>@DEX_COMPANY@</Publisher>
@@ -14,4 +14,4 @@
     <InstallerApplicationIcon>install_icon</InstallerApplicationIcon>
     <Logo>install_icon.png</Logo>
     <WizardStyle>Mac</WizardStyle>
-</Installer>
+</Installer>
diff --git a/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,11 +2,11 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.1</Version>
-    <ReleaseDate>2021-09-06</ReleaseDate>
+    <Version>0.5.2</Version>
+    <ReleaseDate>2021-09-23</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />
     </Licenses>
 	<Default>true</Default>
 	<Script>installscript.qs</Script>
-</Package>
+</Package>
diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake
@@ -4,8 +4,8 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
             RESOURCE ${ICON}
             MACOSX_BUNDLE_ICON_FILE dex-logo
-            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.1
-            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.1
+            MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.2
+            MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.2
             MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in")
     add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD COMMAND

diff --git a/qml.qrc b/qml.qrc
@@ -25,6 +25,7 @@
         <file>atomic_defi_design/assets/images/coins/ankr.png</file>
         <file>atomic_defi_design/assets/images/coins/ant.png</file>
         <file>atomic_defi_design/assets/images/coins/arpa.png</file>
+        <file>atomic_defi_design/assets/images/coins/arrr.png</file>
         <file>atomic_defi_design/assets/images/coins/atom.png</file>
         <file>atomic_defi_design/assets/images/coins/aur.png</file>
         <file>atomic_defi_design/assets/images/coins/ava.png</file>
@@ -98,6 +99,7 @@
         <file>atomic_defi_design/assets/images/coins/fil.png</file>
         <file>atomic_defi_design/assets/images/coins/firo.png</file>
         <file>atomic_defi_design/assets/images/coins/fjc.png</file>
+        <file>atomic_defi_design/assets/images/coins/fjcb.png</file>
         <file>atomic_defi_design/assets/images/coins/ftc.png</file>
         <file>atomic_defi_design/assets/images/coins/ftm.png</file>
         <file>atomic_defi_design/assets/images/coins/gleec.png</file>

diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp
@@ -414,7 +414,7 @@ namespace atomic_dex
                     "ETH"s, "ERC20"s);
             case CoinTypeGadget::BEP20:
                 return std::make_tuple(
-                    &::mm2::api::g_etherscan_proxy_http_client, "/api/v1/token_infos/bep20/"s + contract_address.toStdString(), "BEP20"s, "ETH"s, "BEP-20"s,
+                    &::mm2::api::g_etherscan_proxy_http_client, "/api/v1/token_infos/bep20/"s + contract_address.toStdString(), "BEP20"s, "BNB"s, "BEP-20"s,
                     "BNB"s, "ERC20"s);
             default:
                 return std::make_tuple(&::mm2::api::g_etherscan_proxy_http_client, ""s, ""s, ""s, ""s, ""s, ""s);

diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp
@@ -21,24 +21,24 @@ namespace atomic_dex
     constexpr const char*
     get_version()
     {
-        return "0.5.1-beta";
+        return "0.5.2-beta";
     }
 
     constexpr int
     get_num_version() noexcept
     {
-        return 51;
+        return 52;
     }
 
     constexpr const char*
     get_raw_version()
     {
-        return "0.5.1";
+        return "0.5.2";
     }
 
     constexpr const char*
     get_precedent_raw_version()
     {
-        return "0.5.0";
+        return "0.5.1";
     }
 } // namespace atomic_dex
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "atomicdex-desktop",
-  "version-string": "0.5.1",
+  "version-string": "0.5.2",
   "dependencies": [
     "entt",
     "boost-multiprecision",
@@ -34,4 +34,4 @@
     "cpprestsdk",
     "taskflow"
   ]
-}
+}