Merge branch 'dev' of github.com:firoorg/FiroDEX-Desktop into firoorg…

…-dev

.github/workflows/atomicdex-desktop-cd.yml → .github/workflows/firodex-desktop-cd.yml

@@ -1,16 +1,16 @@
-name: komodo-wallet-desktop CD releases
+name: FiroDex-Desktop CD releases
 
 on:
   push:
     branches:
     - temporary_disabled
 
 env:
-  DEX_PROJECT_NAME: "komodo-wallet"
-  DEX_DISPLAY_NAME: "Komodo Wallet"
-  DEX_COMPANY: "KomodoPlatform"
+  DEX_PROJECT_NAME: "firodex-desktop"
+  DEX_DISPLAY_NAME: "FiroDex Desktop"
+  DEX_COMPANY: "Firo Core Team"
   DEX_VERSION: "0.7.0"
-  DEX_WEBSITE: "https://atomicdex.io/"
+  DEX_WEBSITE: "https://firo.org/"
 
 jobs:
 

.github/workflows/atomicdex-desktop-ci.yml → .github/workflows/firodex-desktop-ci.yml

@@ -1,27 +1,28 @@
-name: komodo-wallet-desktop CI
+name: FiroDex-Desktop CI
 
 on:
   pull_request:
     types: [ opened, synchronize, reopened ]
   push:
     branches:
+      - dev
       - master
   schedule:
     - cron: '0 0 * * 1'
 
 env:
-  DEX_API: "mm2_kmd"
-  DEX_RPCPORT: 7762
-  DEX_RPC: "http://127.0.0.1:7762"
-  DEX_PROJECT_NAME: "komodo-wallet"
-  DEX_DISPLAY_NAME: "Komodo Wallet"
-  DEX_COMPANY: "KomodoPlatform"
+  DEX_API: "mm2_firo"
+  DEX_RPCPORT: 7653
+  DEX_RPC: "http://127.0.0.1:7653"
+  DEX_PROJECT_NAME: "firodex"
+  DEX_DISPLAY_NAME: "Firo Dex"
+  DEX_COMPANY: "Firo"
   DEX_VERSION: "0.7.0"
-  DEX_WEBSITE: "https://atomicdex.io/"
+  DEX_WEBSITE: "https://firo.org/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
-  RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
-  VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
+  RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\firodex-desktop\ci_tools_atomic_dex\vcpkg-repo
+  VCPKG_ROOT: ${{ github.workspace }}\firodex-desktop\ci_tools_atomic_dex\vcpkg-repo
 
 jobs:
 
@@ -84,9 +85,6 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: 'true'
 
-      - name: Expose GitHub Runtime Env
-        uses: crazy-max/ghaction-github-runtime@v2
-
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -115,7 +113,7 @@ jobs:
 
       - name: Install QT (macOS)
         if: runner.os == 'macOS'
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
           host: ${{ matrix.host }}
@@ -128,7 +126,7 @@ jobs:
 
       - name: Install QT (Linux)
         if: runner.os == 'Linux'
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
           host: ${{ matrix.host }}
@@ -140,7 +138,7 @@ jobs:
 
       - name: Install QT (Windows)
         if: runner.os == 'Windows'
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v3.0.0
         with:
           version: ${{ matrix.qt }}
           host: ${{ matrix.host }}
@@ -156,24 +154,13 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           export SHELL=/bin/bash
-          echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
-          export CHOOSENIM_CHOOSE_VERSION=1.6.2
+          echo "CHOOSENIM_CHOOSE_VERSION=1.6.10" >> $GITHUB_ENV
+          export CHOOSENIM_CHOOSE_VERSION=1.6.10
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
           chmod +x choosenim.sh
           ./choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
-          chmod +x /home/runner/.choosenim/toolchains/nim-1.6.2/bin/*
-
-      - name: Install nim (MacOS)
-        if: runner.os == 'macOS'
-        run: |
-          echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
-          export CHOOSENIM_CHOOSE_VERSION=1.6.2
-          curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
-          chmod +x choosenim.sh
-          ./choosenim.sh -y
-          export PATH=/Users/runner/.nimble/bin:$PATH
-          chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.2/bin/*
+          chmod +x /home/runner/.choosenim/toolchains/nim-1.6.10/bin/*
 
       - name: Install deps (Linux)
         if: runner.os == 'Linux'
@@ -200,33 +187,35 @@ jobs:
           echo "CC=clang-12" >> $GITHUB_ENV
 
       - name: vcpkg deps (All)
-        uses: lukka/run-vcpkg@v11
+        uses: lukka/run-vcpkg@v10
         with:
           vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo'
+          appendedCacheKey: ${{ hashFiles('vcpkg.json') }}
           vcpkgJsonGlob: 'vcpkg.json'
 
-      - name: import code signing certificates (macos)
-        if: runner.os == 'macOS'  && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
-        uses: Apple-Actions/import-codesign-certs@v1
-        with:
-          keychain: ${{ github.run_id }}
-          keychain-password: ${{ github.run_id }}
-          p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-          p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
-
-      - name: import installer code signing certificates (macos)
-        if: runner.os == 'macOS'  && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
-        uses: apple-actions/import-codesign-certs@v1
-        with:
-          keychain: ${{ github.run_id }}
-          keychain-password: ${{ github.run_id }}
-          create-keychain: false
-          p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
-          p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+
+      # - name: import code signing certificates (macos)
+      #   if: runner.os == 'macOS'  && 'firoorg/FiroDEX-Desktop' == github.repository
+      #   uses: Apple-Actions/import-codesign-certs@v1
+      #   with:
+      #     keychain: ${{ github.run_id }}
+      #     keychain-password: ${{ github.run_id }}
+      #     p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
+      #     p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+
+      # - name: import installer code signing certificates (macos)
+      #   if: runner.os == 'macOS'  && 'firoorg/FiroDEX-Desktop' == github.repository
+      #   uses: apple-actions/import-codesign-certs@v1
+      #   with:
+      #     keychain: ${{ github.run_id }}
+      #     keychain-password: ${{ github.run_id }}
+      #     create-keychain: false
+      #     p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
+      #     p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
 
 
 
-      - name: Build Komodo Wallet (MacOS)
+      - name: Build AtomicDEX (MacOS)
         if: runner.os == 'macOS'
         run: |
           xcrun --sdk macosx --show-sdk-path
@@ -241,7 +230,6 @@ jobs:
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
-          export PATH=/Users/runner/.nimble/bin:$PATH
           export MACOSX_DEPLOYMENT_TARGET=10.15
           export CC=clang
           export CXX=clang++
@@ -251,7 +239,7 @@ jobs:
 
 
 
-      - name: Build Komodo Wallet (Linux)
+      - name: Build AtomicDEX (Linux)
         if: runner.os == 'Linux'
         run: |
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/lib/cmake
@@ -269,7 +257,7 @@ jobs:
           ./ci_tools_atomic_dex bundle ${{ matrix.type }}
 
 
-      - name: Build Komodo Wallet (Windows)
+      - name: Build FiroDEX (Windows)
         if: runner.os == 'Windows'
         shell: powershell
         run: |
@@ -283,7 +271,6 @@ jobs:
           echo "artifact_name_zstd=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV
           echo "artifact_name_zip=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV
           echo "artifact_name_appimage=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV
-          echo "target_name_zstd=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV
           echo "target_name_zip=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV
           echo "target_name_appimage=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV
 
@@ -363,7 +350,7 @@ jobs:
       - name: Running Tests (Linux)
         working-directory: ci_tools_atomic_dex
         continue-on-error: true
-        if: runner.os == 'Linux' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
+        if: runner.os == 'Linux' && 'firoorg/FiroDEX-Desktop' == github.repository
         run: |
           export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }}
           export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }}
@@ -382,7 +369,7 @@ jobs:
       - name: Running Tests (MacOS)
         working-directory: ci_tools_atomic_dex
         continue-on-error: true
-        if: runner.os == 'macOS' &&  'KomodoPlatform/komodo-wallet-desktop' == github.repository
+        if: runner.os == 'macOS' &&  'firoorg/FiroDEX-Desktop' == github.repository
         run: |
           export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
@@ -395,7 +382,6 @@ jobs:
           export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }}
           export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
-          export PATH=/Users/runner/.nimble/bin:$PATH
           export CC=clang
           export CXX=clang++
           #echo "Running tests"
@@ -407,12 +393,12 @@ jobs:
       - name: Running Tests (Windows)
         shell: powershell
         continue-on-error: true
-        if: runner.os == 'Windows' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
+        if: runner.os == 'Windows' && 'firoorg/FiroDEX-Desktop' == github.repository
         run: |
           #echo "Running tests"
           $Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
           $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
           #cd b\bin
           #./${{ env.DEX_PROJECT_NAME }}_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
           #Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
-          #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
+          #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"

.github/workflows/atomicdex-desktop-release-vt.yml → .github/workflows/firodex-desktop-release-vt.yml

@@ -1,4 +1,4 @@
-name: komodo-wallet-desktop VirustTotal Release
+name: FiroDex-Desktop VirustTotal Release
 
 on:
   release:

README.md

@@ -47,9 +47,9 @@
 </p>
 
 
-## What is Komodo Wallet?
+## What is FiroDEX?
 
-Komodo Wallet is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
+FiroDEX is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
 trade peer-to-peer with minimal fees and never give up control over your digital assets.
 
 Komodo Wallet has been tested on the following platforms:
@@ -61,8 +61,8 @@ Komodo Wallet has been tested on the following platforms:
 
 ## Get Started
 
-You can [download](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases) the pre-built <b>beta</b> binaries on
-our [GitHub release page](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases).
+You can [download](https://github.com/firoorg/FiroDEX-Desktop/releases) the pre-built <b>beta</b> binaries on
+our [GitHub release page](https://github.com/firoorg/FiroDEX-Desktop/releases).
 
 Build instructions can be found [here](https://github.com/KomodoPlatform/komodo-wallet-desktop/wiki/Build-Instructions)
 

assets/config/cfg.json

@@ -46,7 +46,8 @@
     "ETH_ALT": "Ξ",
     "BTC": "₿",
     "BTC_ALT": "฿",
-    "LTC": "Ł"
+    "LTC": "Ł",
+    "FIRO": "FIRO"
   },
   "available_fiat": [
     "USD",
@@ -96,6 +97,7 @@
     "BTC",
     "KMD",
     "LTC",
-    "DOGE"
+    "DOGE",
+    "FIRO"
   ]
 }

assets/config/game.config.maker.json

@@ -12,7 +12,7 @@
   "native_desktop_mode": false,
   "scale_mode": "fit",
   "window_height": 900.0,
-  "window_title": "Komodo Wallet",
+  "window_title": "firoDEX Desktop",
   "window_width": 1280.0,
   "no_style": false,
   "mouse_grabbed": false,