From 24c02d1317df60838355d5b79da7706bb1e33902 Mon Sep 17 00:00:00 2001 From: cipig Date: Thu, 17 Mar 2022 21:30:58 +0000 Subject: [PATCH 01/25] add PPC-ERC20 and PPC-PLG20 --- assets/config/0.5.5-coins.json | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index fca6840e18..640f5ac593 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -5466,6 +5466,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", From 584990d7287eb37db864b05f86564118e8b43a64 Mon Sep 17 00:00:00 2001 From: cipig Date: Fri, 18 Mar 2022 01:44:24 +0000 Subject: [PATCH 02/25] remove bad LBC electrum --- assets/config/0.5.5-coins.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index 640f5ac593..18f36678b0 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -3526,9 +3526,6 @@ { "url": "spv1.lbry.com:50001" }, - { - "url": "spv13.lbry.com:50001" - }, { "url": "spv15.lbry.com:50001" }, From 4b236d884ea6d40023993ccce9c5de22b1c54395 Mon Sep 17 00:00:00 2001 From: cipig Date: Fri, 18 Mar 2022 03:28:37 +0000 Subject: [PATCH 03/25] remove bad LBC electrum --- assets/config/0.5.5-coins.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index 18f36678b0..2c067c0c94 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -3526,9 +3526,6 @@ { "url": "spv1.lbry.com:50001" }, - { - "url": "spv15.lbry.com:50001" - }, { "url": "spv17.lbry.com:50001" }, From a1693bbbbb706f0e38ed1956536216f6bcaddac0 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sat, 19 Mar 2022 01:20:08 +0800 Subject: [PATCH 04/25] update version New version has fix for max body length. Ref: https://github.com/crazy-max/ghaction-virustotal/pull/64 --- .github/workflows/atomicdex-desktop-release-vt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-release-vt.yml b/.github/workflows/atomicdex-desktop-release-vt.yml index 9215686717..8ce53e0185 100644 --- a/.github/workflows/atomicdex-desktop-release-vt.yml +++ b/.github/workflows/atomicdex-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$ \ No newline at end of file + .7z$ From da11442f4c2abe91ec4a5199ad54f002286b093d Mon Sep 17 00:00:00 2001 From: cipig Date: Sat, 19 Mar 2022 20:34:42 +0000 Subject: [PATCH 05/25] ABY migration --- assets/config/0.5.5-coins.json | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index 2c067c0c94..efa53d09b0 100644 --- 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,32 @@ "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 + }, + { + "url": "elec-seeder-two.artbytecoin.org:50012", + "protocol": "SSL", + "disable_cert_verification": true + } + ], + "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", From 63dcbc2b522f8cf24f3cd50be43fb7fef99ab4ab Mon Sep 17 00:00:00 2001 From: cipig Date: Sun, 20 Mar 2022 01:20:47 +0000 Subject: [PATCH 06/25] add ws_url for ABY --- assets/config/0.5.5-coins.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/config/0.5.5-coins.json b/assets/config/0.5.5-coins.json index efa53d09b0..f81bb052b6 100644 --- a/assets/config/0.5.5-coins.json +++ b/assets/config/0.5.5-coins.json @@ -266,12 +266,14 @@ { "url": "elec-seeder-one.artbytecoin.org:50012", "protocol": "SSL", - "disable_cert_verification": true + "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 + "disable_cert_verification": true, + "ws_url": "elec-seeder-two.artbytecoin.org:50013" } ], "explorer_url": [ From c716b01cbc79851e284ed5b94442a28682f64ca6 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 22 Mar 2022 18:25:47 +0800 Subject: [PATCH 07/25] remove header spaces for csv exports --- src/core/atomicdex/models/qt.orders.proxy.model.cpp | 2 +- src/core/atomicdex/services/exporter/exporter.service.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/atomicdex/models/qt.orders.proxy.model.cpp b/src/core/atomicdex/models/qt.orders.proxy.model.cpp index 7409d7cd4d..0801b43a0c 100644 --- 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 index fb40e3a33b..46461044ba 100644 --- 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() << ","; From 0b2289c560b46c41ba9387ef299d7dcbb4f5e971 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Wed, 23 Mar 2022 00:25:58 +0800 Subject: [PATCH 08/25] extra config flags --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index c6d84279ab..20e21fc599 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -57,7 +57,7 @@ cmake --version git clone https://github.com/KomodoPlatform/libwally-core.git cd libwally-core ./tools/autogen.sh -./configure --disable-shared +./configure --enable-debug --enable-export-all --enable-swig-python --enable-swig-java --enable-coverage --disable-shared sudo make -j3 install cd .. From 43115c6ddc62c8fcb81bcdec91a4def81936bd14 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Wed, 23 Mar 2022 00:26:27 +0800 Subject: [PATCH 09/25] revert --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index 20e21fc599..c6d84279ab 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -57,7 +57,7 @@ cmake --version git clone https://github.com/KomodoPlatform/libwally-core.git cd libwally-core ./tools/autogen.sh -./configure --enable-debug --enable-export-all --enable-swig-python --enable-swig-java --enable-coverage --disable-shared +./configure --disable-shared sudo make -j3 install cd .. From df65ba3e1f85995c02dbc0cc3a0a7edbbd4ad7a1 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:25:57 +0800 Subject: [PATCH 10/25] Update osx_script.sh --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index a9491921db..90686467a9 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -20,7 +20,7 @@ brew install autoconf \ pip3 install yq export CC=clang export CXX=clang++ -export MACOSX_DEPLOYMENT_TARGET=10.14 +export MACOSX_DEPLOYMENT_TARGET=10.15 # get curl #git clone https://github.com/KomodoPlatform/curl.git @@ -31,8 +31,9 @@ export MACOSX_DEPLOYMENT_TARGET=10.14 #make -j3 install #cd ../ -git clone https://github.com/KomodoPlatform/libwally-core.git +git clone https://github.com/smk762/libwally-core.git cd libwally-core +git checkout test ./tools/autogen.sh ./configure --disable-shared sudo make -j3 install From 01cc8b06bfc1be09fa18223bea81d7362e43fae4 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:32:15 +0800 Subject: [PATCH 11/25] Update osx_script.sh --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 90686467a9..e8ebb32ebd 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -20,7 +20,7 @@ brew install autoconf \ pip3 install yq export CC=clang export CXX=clang++ -export MACOSX_DEPLOYMENT_TARGET=10.15 +export MACOSX_DEPLOYMENT_TARGET=10.14 # get curl #git clone https://github.com/KomodoPlatform/curl.git @@ -31,9 +31,8 @@ export MACOSX_DEPLOYMENT_TARGET=10.15 #make -j3 install #cd ../ -git clone https://github.com/smk762/libwally-core.git +git clone --branch test https://github.com/smk762/libwally-core.git --recursive cd libwally-core -git checkout test ./tools/autogen.sh ./configure --disable-shared sudo make -j3 install From 7f0476d9b74e119eae632ae27a1a3a797eaf2289 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:34:04 +0800 Subject: [PATCH 12/25] Update linux_script.sh --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index c6d84279ab..e2cf8b31be 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -54,7 +54,7 @@ sudo cp -r * /usr/local/ cmake --version # get libwally -git clone https://github.com/KomodoPlatform/libwally-core.git +git clone --branch test https://github.com/smk762/libwally-core.git --recursive cd libwally-core ./tools/autogen.sh ./configure --disable-shared From 46340858bc2fa581552f55fdc551cb86fbc1ee1f Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 13:17:25 +0800 Subject: [PATCH 13/25] use macos-10.15 --- .github/workflows/atomicdex-desktop-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index eab7cc84b8..a912f9ce5f 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -37,7 +37,7 @@ jobs: type: 'release' - name: osx-qt-5-15-2 - os: macos-latest + os: macos-10.15 qt: '5.15.2' type: 'release' From 0d90790250af84f5c2b927663f5ff20f162adbe3 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:00:54 +0800 Subject: [PATCH 14/25] change deployment target and use KP fork --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index e8ebb32ebd..b04b7f3196 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -20,7 +20,7 @@ brew install autoconf \ pip3 install yq export CC=clang export CXX=clang++ -export MACOSX_DEPLOYMENT_TARGET=10.14 +export MACOSX_DEPLOYMENT_TARGET=10.15 # get curl #git clone https://github.com/KomodoPlatform/curl.git @@ -31,7 +31,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.14 #make -j3 install #cd ../ -git clone --branch test https://github.com/smk762/libwally-core.git --recursive +git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive cd libwally-core ./tools/autogen.sh ./configure --disable-shared From 5e66a75dad21a3c08022b677e176a7a4e7844f00 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:01:42 +0800 Subject: [PATCH 15/25] use KP fork --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index e2cf8b31be..5fb028fc8e 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -54,7 +54,7 @@ sudo cp -r * /usr/local/ cmake --version # get libwally -git clone --branch test https://github.com/smk762/libwally-core.git --recursive +git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive cd libwally-core ./tools/autogen.sh ./configure --disable-shared From 89ff52fb1b77322d6148dc7683e345d13cf64fc5 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:48:32 +0800 Subject: [PATCH 16/25] latest setup python --- .github/workflows/atomicdex-desktop-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index a912f9ce5f..60d7c3aa7b 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -37,7 +37,7 @@ jobs: type: 'release' - name: osx-qt-5-15-2 - os: macos-10.15 + os: macos-latest qt: '5.15.2' type: 'release' @@ -58,15 +58,16 @@ jobs: submodules: 'true' - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: - python-version: '3.8' + python-version: '3.10' - name: Install QT (Linux) if: runner.os == 'Linux' uses: KomodoPlatform/install-qt-action@v2.14.0 with: version: ${{ matrix.qt }} + setup-python: 'false' host: 'linux' target: 'desktop' dir: '${{ github.workspace }}' @@ -79,6 +80,7 @@ jobs: uses: KomodoPlatform/install-qt-action@v2.14.0 with: version: ${{ matrix.qt }} + setup-python: 'false' host: 'mac' target: 'desktop' dir: '${{ github.workspace }}' From 131766633b8a23568152dcb51dafef583e3b47e0 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:05:04 +0800 Subject: [PATCH 17/25] try older aqt / py7zr versions in macos --- .github/workflows/atomicdex-desktop-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 60d7c3aa7b..969ec784a5 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -85,6 +85,8 @@ jobs: target: 'desktop' dir: '${{ github.workspace }}' modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine' + aqtversion: '==0.8' + py7zrversion: '==0.6' - name: Install QT IFW (MacOS) if: runner.os == 'macOS' From 83fee8d1a4e4d5edc341a4b3d2a778fc1d70bcb7 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:26:21 +0800 Subject: [PATCH 18/25] use macos-10.15, dont setup python on macos --- .github/workflows/atomicdex-desktop-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 969ec784a5..c47d2279a8 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -37,7 +37,7 @@ jobs: type: 'release' - name: osx-qt-5-15-2 - os: macos-latest + os: macos-10.15 qt: '5.15.2' type: 'release' @@ -57,10 +57,11 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} submodules: 'true' - - - uses: actions/setup-python@v3 + - name: Setup Python + if: runner.os != 'macOS' + uses: actions/setup-python@v3 with: - python-version: '3.10' + python-version: '3.8' - name: Install QT (Linux) if: runner.os == 'Linux' @@ -85,8 +86,6 @@ jobs: target: 'desktop' dir: '${{ github.workspace }}' modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine' - aqtversion: '==0.8' - py7zrversion: '==0.6' - name: Install QT IFW (MacOS) if: runner.os == 'macOS' From abffa5a3a4eb714f30fda4fd88f1bc7ea056fd72 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:10:14 +0800 Subject: [PATCH 19/25] try python 3.9 --- .github/workflows/atomicdex-desktop-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index c47d2279a8..68500fd41c 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -58,10 +58,9 @@ jobs: submodules: 'true' - name: Setup Python - if: runner.os != 'macOS' uses: actions/setup-python@v3 with: - python-version: '3.8' + python-version: '3.9' - name: Install QT (Linux) if: runner.os == 'Linux' From e06a871ccf6e5cd86f417c3ac3bbb3e1cb02f1a9 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sat, 26 Mar 2022 00:53:41 +0800 Subject: [PATCH 20/25] older brew --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index b04b7f3196..b7d1b76210 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -5,9 +5,12 @@ 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 \ nim@1.4.8 \ @@ -16,11 +19,11 @@ brew install autoconf \ coreutils \ llvm \ gnu-getopt - + pip3 install yq export CC=clang export CXX=clang++ -export MACOSX_DEPLOYMENT_TARGET=10.15 +export MACOSX_DEPLOYMENT_TARGET=10.14 # get curl #git clone https://github.com/KomodoPlatform/curl.git @@ -31,7 +34,8 @@ export MACOSX_DEPLOYMENT_TARGET=10.15 #make -j3 install #cd ../ -git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive +git clone https://github.com/KomodoPlatform/libwally-core +#git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive cd libwally-core ./tools/autogen.sh ./configure --disable-shared From 85758549368cdec5601e39c2be986a315aef4322 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sat, 26 Mar 2022 01:39:55 +0800 Subject: [PATCH 21/25] use mac-latest --- .github/workflows/atomicdex-desktop-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 68500fd41c..fef7645c6b 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -37,7 +37,7 @@ jobs: type: 'release' - name: osx-qt-5-15-2 - os: macos-10.15 + os: macos-latest qt: '5.15.2' type: 'release' From 5507a258abcfb783d5a7b4211fc68017b6fd8b52 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sat, 26 Mar 2022 03:30:10 +0800 Subject: [PATCH 22/25] test ubuntu old forked libwally --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index 5fb028fc8e..1c06878ffb 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -54,7 +54,7 @@ sudo cp -r * /usr/local/ cmake --version # get libwally -git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive +git clone https://github.com/KomodoPlatform/libwally-core.git cd libwally-core ./tools/autogen.sh ./configure --disable-shared From a2c1485e8f687bf92e8686e592d51043f0945d78 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 26 Mar 2022 04:20:33 +0800 Subject: [PATCH 23/25] clean up --- ci_tools_atomic_dex/ci_scripts/linux_script.sh | 2 +- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh index 1c06878ffb..c6d84279ab 100755 --- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh @@ -54,7 +54,7 @@ sudo cp -r * /usr/local/ cmake --version # get libwally -git clone https://github.com/KomodoPlatform/libwally-core.git +git clone https://github.com/KomodoPlatform/libwally-core.git cd libwally-core ./tools/autogen.sh ./configure --disable-shared diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index b7d1b76210..3ad6c6aad0 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -35,7 +35,6 @@ export MACOSX_DEPLOYMENT_TARGET=10.14 #cd ../ git clone https://github.com/KomodoPlatform/libwally-core -#git clone --branch update https://github.com/KomodoPlatform/libwally-core --recursive cd libwally-core ./tools/autogen.sh ./configure --disable-shared From 1f523aad9978db7bc924d221432e8ce737939641 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 26 Mar 2022 04:31:31 +0800 Subject: [PATCH 24/25] rm whitespace --- ci_tools_atomic_dex/ci_scripts/osx_script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh index 3ad6c6aad0..f78dc9d382 100755 --- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh +++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh @@ -19,7 +19,7 @@ brew install autoconf \ coreutils \ llvm \ gnu-getopt - + pip3 install yq export CC=clang export CXX=clang++ @@ -34,7 +34,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.14 #make -j3 install #cd ../ -git clone https://github.com/KomodoPlatform/libwally-core +git clone https://github.com/KomodoPlatform/libwally-core.git cd libwally-core ./tools/autogen.sh ./configure --disable-shared From db9721d7aba28c8812c186a9fb4f5ba11621a7e7 Mon Sep 17 00:00:00 2001 From: cipig Date: Sat, 26 Mar 2022 20:03:56 +0000 Subject: [PATCH 25/25] fix FIRO/ETH chart --- atomic_defi_design/Dex/Constants/General.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index 6a4994f796..81f13ef72d 100644 --- 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",