Trying to fix build fails

firoorg · Mar 28, 2022 · 64ef3f6 · 64ef3f6
2 parents 966bf39 + bd0343c
commit 64ef3f6
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 18 deletions.
diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -58,16 +58,17 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
-
-      - uses: actions/setup-python@v2
+      - name: Setup Python
+        uses: actions/setup-python@v3
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
       - name: Install QT (Linux)
         if: runner.os == 'Linux'
         uses: KomodoPlatform/[email protected]
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'linux'
           target: 'desktop'
           dir: '${{ github.workspace }}'
@@ -80,6 +81,7 @@ jobs:
         uses: KomodoPlatform/[email protected]
         with:
           version: ${{ matrix.qt }}
+          setup-python: 'false'
           host: 'mac'
           target: 'desktop'
           dir: '${{ github.workspace }}'

diff --git a/.github/workflows/firodex-desktop-release-vt.yml b/.github/workflows/firodex-desktop-release-vt.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       -
         name: VirusTotal Scan
-        uses: crazy-max/ghaction-virustotal@v2.2.1
+        uses: crazy-max/ghaction-virustotal@v2.4.1
         with:
           vt_api_key: ${{ secrets.VT_API_KEY }}
           github_token: ${{ github.token }}
@@ -20,4 +20,4 @@ jobs:
             .zip$
             .tar.zst$
             .dmg$
-            .7z$
+            .7z$
diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json
@@ -233,9 +233,9 @@
     "active": false,
     "currently_enabled": false
   },
-  "ABY": {
-    "coin": "ABY",
-    "name": "ArtByte",
+  "ABY-OLD": {
+    "coin": "ABY-OLD",
+    "name": "ArtByte (OLD)",
     "coinpaprika_id": "aby-artbyte",
     "coingecko_id": "artbyte",
     "electrum": [
@@ -257,6 +257,34 @@
     "active": false,
     "currently_enabled": false
   },
+  "ABY": {
+    "coin": "ABY",
+    "name": "ArtByte",
+    "coinpaprika_id": "aby-artbyte",
+    "coingecko_id": "artbyte",
+    "electrum": [
+      {
+        "url": "elec-seeder-one.artbytecoin.org:50012",
+        "protocol": "SSL",
+        "disable_cert_verification": true,
+        "ws_url": "elec-seeder-one.artbytecoin.org:50013"
+      },
+      {
+        "url": "elec-seeder-two.artbytecoin.org:50012",
+        "protocol": "SSL",
+        "disable_cert_verification": true,
+        "ws_url": "elec-seeder-two.artbytecoin.org:50013"
+      }
+    ],
+    "explorer_url": [
+      "https://chainz.cryptoid.info/aby/"
+    ],
+    "explorer_tx_url": "tx.dws?",
+    "explorer_address_url": "address.dws?",
+    "type": "UTXO",
+    "active": false,
+    "currently_enabled": false
+  },
   "ADA-BEP20": {
     "coin": "ADA-BEP20",
     "name": "Cardano",
@@ -3526,12 +3554,6 @@
       {
         "url": "spv1.lbry.com:50001"
       },
-      {
-        "url": "spv13.lbry.com:50001"
-      },
-      {
-        "url": "spv15.lbry.com:50001"
-      },
       {
         "url": "spv17.lbry.com:50001"
       },
@@ -5466,6 +5488,40 @@
       "active": false,
       "currently_enabled": false
   },
+  "PPC-ERC20": {
+    "coin": "PPC-ERC20",
+    "name": "Peercoin",
+    "coinpaprika_id": "ppc-peercoin",
+    "coingecko_id": "peercoin",
+    "nomics_id": "PPC",
+    "nodes": [
+      "http://eth1.cipig.net:8555",
+      "http://eth2.cipig.net:8555",
+      "http://eth3.cipig.net:8555"
+    ],
+    "explorer_url": [
+      "https://etherscan.io/"
+    ],
+    "type": "ERC-20",
+    "active": false,
+    "currently_enabled": false
+  },
+  "PPC-PLG20": {
+    "coin": "PPC-PLG20",
+    "name": "Peercoin",
+    "coinpaprika_id": "ppc-peercoin",
+    "coingecko_id": "peercoin",
+    "nomics_id": "PPC",
+    "nodes": [
+      "https://polygon-rpc.com"
+    ],
+    "explorer_url": [
+      "https://polygonscan.com/"
+    ],
+    "type": "Matic",
+    "active": false,
+    "currently_enabled": false
+  },
   "PRUX": {
       "coin": "PRUX",
       "name": "PRUX",

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -1346,7 +1346,7 @@ QtObject {
                                                 "FIL/EURS": "COINBASE:FILEUR",
                                                 "FIL/JEUR": "COINBASE:FILEUR",
                                                 "FIRO/BTC": "BINANCE:FIROBTC",
-                                                "FIRO/ETH": "BINANCE:FIROETH",
+                                                "FIRO/ETH": "HUOBI:FIROETH",
                                                 "FIRO/USDT": "BITTREX:FIROUSD",
                                                 "FIRO/BUSD": "BITTREX:FIROUSD",
                                                 "FIRO/USDC": "BITTREX:FIROUSD",

diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -3,9 +3,13 @@
 brew update
 brew tap-new $USER/local-nim
 brew extract --version=1.4.8 nim $USER/local-nim
+
+brew unlink libtool
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
+brew install libtool.rb
+
 brew install autoconf \
             automake \
-            libtool \
             pkgconfig \
             wget \
             [email protected] \

diff --git a/src/core/atomicdex/models/qt.orders.proxy.model.cpp b/src/core/atomicdex/models/qt.orders.proxy.model.cpp
@@ -280,7 +280,7 @@ namespace atomic_dex
         SPDLOG_INFO("exporting csv with path: {}", csv_path.string());
         std::ofstream ofs(csv_path.string(), std::ios::out | std::ios::trunc);
         int           nb_items = this->rowCount();
-        ofs << "Date, BaseCoin, BaseAmount, Status, RelCoin, RelAmount, UUID, ErrorState" << std::endl;
+        ofs << "Date,BaseCoin,BaseAmount,Status,RelCoin,RelAmount,UUID,ErrorState" << std::endl;
         for (int cur_idx = 0; cur_idx < nb_items; ++cur_idx)
         {
             QModelIndex idx = this->index(cur_idx, 0);

diff --git a/src/core/atomicdex/services/exporter/exporter.service.cpp b/src/core/atomicdex/services/exporter/exporter.service.cpp
@@ -90,7 +90,7 @@ namespace atomic_dex
                 ofs.setFileName(std_path_to_qstring(csv_path));
                 ofs.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Truncate);
                 std::stringstream ss;
-                ss << "Date, BaseCoin, BaseAmount, Status, RelCoin, RelAmount, UUID, ErrorState" << std::endl;
+                ss << "Date,BaseCoin,BaseAmount,Status,RelCoin,RelAmount,UUID,ErrorState" << std::endl;
                 for (auto&& cur_swap: result.swaps)
                 {
                     ss << cur_swap.human_date.toStdString() << ",";