Sync upstream

.dockerignore

@@ -0,0 +1,2 @@
+.git
+.github

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ Please describe what you expected to happen.
 **Operating Environment(s):**
  - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
  - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- - Komodo Wallet Version: [e.g. 0.7.0]
+ - Komodo Wallet Desktop Version: [e.g. 0.8.2]
  - Build branch: [e.g. master/dev] 
 
 

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

@@ -9,9 +9,8 @@ env:
   DEX_PROJECT_NAME: "firodex-desktop"
   DEX_DISPLAY_NAME: "FiroDex Desktop"
   DEX_COMPANY: "Firo Core Team"
-  DEX_VERSION: "0.7.0"
+  DEX_VERSION: "0.7.2"
   DEX_WEBSITE: "https://firo.org/"
-
 jobs:
 
   linux-release:
@@ -127,7 +126,7 @@ jobs:
           zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer
 
       - name: Upload artifacts (Linux)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: AtomicDEX-Pro-Installer-linux-release
           path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
@@ -239,7 +238,7 @@ jobs:
           zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer
 
       - name: Upload artifacts (Linux/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: AtomicDEX-Pro-Installer-linux-debug
           path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
@@ -303,7 +302,7 @@ jobs:
           ls bundle-Release/atomicDEX-Pro.dmg
 
       - name: Upload artifacts (MacOS/Release)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-mac-release.dmg
           path: ./ci_tools_atomic_dex/bundle-Release/atomicDEX-Pro.dmg
@@ -367,14 +366,14 @@ jobs:
           ls bundle-Debug/atomicDEX-Pro.dmg
 
       - name: Upload artifacts (MacOS/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-mac-debug.dmg
           path: ./ci_tools_atomic_dex/bundle-Debug/atomicDEX-Pro.dmg
 
   windows-release:
     name: Win Build/Release
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2
@@ -445,14 +444,14 @@ jobs:
           ls bundle-Release/bundle.zip
 
       - name: Upload artifacts (Win/Release)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-win-release
           path: ./ci_tools_atomic_dex/bundle-Release/bundle.zip
 
   windows-debug:
     name: Win Build/Debug
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v2
@@ -523,7 +522,7 @@ jobs:
           ls bundle-Debug/bundle.zip
 
       - name: Upload artifacts (Windows/Debug)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dexpro-win-debug
           path: ./ci_tools_atomic_dex/bundle-Debug/bundle.zip

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

@@ -9,6 +9,7 @@ on:
       - master
   schedule:
     - cron: '0 0 * * 1'
+  workflow_dispatch:
 
 env:
   DEX_API: "mm2_firo"
@@ -17,7 +18,7 @@ env:
   DEX_PROJECT_NAME: "firodex"
   DEX_DISPLAY_NAME: "Firo Dex"
   DEX_COMPANY: "Firo"
-  DEX_VERSION: "0.7.0"
+  DEX_VERSION: "0.7.2"
   DEX_WEBSITE: "https://firo.org/"
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
   VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
@@ -56,25 +57,25 @@ jobs:
             host: 'linux'
 
           - name: osx-release
-            os: macos-12
+            os: macos-13
             qt: '5.15.2'
             type: 'Release'
             host: 'mac'
 
           - name: osx-debug
-            os: macos-12
+            os: macos-13
             qt: '5.15.2'
             type: 'Debug'
             host: 'mac'
 
           - name: windows-release
-            os: windows-latest
+            os: windows-2019
             qt: '5.15.2'
             type: 'Release'
             host: 'windows'
 
           - name: windows-debug
-            os: windows-latest
+            os: windows-2019
             qt: '5.15.2'
             type: 'Debug'
             host: 'windows'
@@ -117,7 +118,6 @@ jobs:
           cl /utf-8 /DUSE_ECMULT_STATIC_PRECOMPUTATION /DECMULT_WINDOW_SIZE=15 /DWALLY_CORE_BUILD /DHAVE_CONFIG_H /DSECP256K1_BUILD /I$env:LIBWALLY_DIR\src\wrap_js\windows_config /I$env:LIBWALLY_DIR /I$env:LIBWALLY_DIR\src /I$env:LIBWALLY_DIR\include /I$env:LIBWALLY_DIR\src\ccan /I$env:LIBWALLY_DIR\src\ccan\base64 /I$env:LIBWALLY_DIR\src\secp256k1 /Zi /LD src/aes.c src/anti_exfil.c src/base58.c src/base64.c src/bech32.c src/bip32.c src/bip38.c src/bip39.c src/blech32.c src/ecdh.c src/elements.c src/hex.c src/hmac.c src/internal.c src/mnemonic.c src/pbkdf2.c src/pullpush.c src/psbt.c src/script.c src/scrypt.c src/sign.c src/symmetric.c src/transaction.c src/wif.c src/wordlist.c src/ccan/ccan/crypto/ripemd160/ripemd160.c src/ccan/ccan/crypto/sha256/sha256.c src/ccan/ccan/crypto/sha512/sha512.c src/ccan/ccan/base64/base64_.c src\ccan\ccan\str\hex\hex_.c src/secp256k1/src/secp256k1.c src/secp256k1/src/precomputed_ecmult_gen.c src/secp256k1/src/precomputed_ecmult.c /Fewally.dll
           Copy-Item "${{ github.workspace }}\libwally-core\wally.dll" -Destination "${{ github.workspace }}\wally\wally.dll" -force
 
-
       - name: Install QT (macOS)
         if: runner.os == 'macOS'
         uses: jurplel/[email protected]
@@ -161,13 +161,20 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           export SHELL=/bin/bash
-          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
+          echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
+          export CHOOSENIM_CHOOSE_VERSION=1.6.2
+          ./ci_tools_atomic_dex/ci_scripts/choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
-          chmod +x /home/runner/.choosenim/toolchains/nim-1.6.10/bin/*
+          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
+          ./ci_tools_atomic_dex/ci_scripts/choosenim.sh -y
+          export PATH=/Users/runner/.nimble/bin:$PATH
+          chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.2/bin/*
 
       - name: Install deps (Linux)
         if: runner.os == 'Linux'
@@ -200,51 +207,51 @@ jobs:
           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@v3
+        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@v3
+        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 AtomicDEX (MacOS)
+      - name: Build Komodo Wallet (MacOS)
         if: runner.os == 'macOS'
         run: |
           xcrun --sdk macosx --show-sdk-path
           export SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
-          ls /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+          echo $SDK_PATH
+          ls $SDK_PATH
           echo $HOME/sdk
-          ls $HOME/sdk
+          ls $HOME/sdk || true
+          ls $(xcrun --show-sdk-path)/usr/include/c++
           export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
-          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
+          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
           export APPLE_ID="${{ secrets.APPLE_ID }}"
           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 MACOSX_DEPLOYMENT_TARGET=10.15
+          export PATH=/Users/runner/.nimble/bin:$PATH
+          export MACOSX_DEPLOYMENT_TARGET=14.2
           export CC=clang
           export CXX=clang++
+          export CXXFLAGS=-stdlib=libc++
+          export LDFLAGS=-stdlib=libc++
           cd ci_tools_atomic_dex
           nimble build -y
-          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX10.15.sdk --compiler=clang++
-
-
+          ./ci_tools_atomic_dex bundle ${{ matrix.type }} --osx_sdk=$HOME/sdk/MacOSX14.2.sdk --compiler=clang++
 
       - name: Build AtomicDEX (Linux)
         if: runner.os == 'Linux'
@@ -263,7 +270,6 @@ jobs:
           ./ci_tools_atomic_dex build ${{ matrix.type }}
           ./ci_tools_atomic_dex bundle ${{ matrix.type }}
 
-
       - name: Build FiroDEX (Windows)
         if: runner.os == 'Windows'
         shell: powershell
@@ -281,27 +287,25 @@ jobs:
           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
 
-
-
       - name: Upload bundle artifact (Linux ZSTD)
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         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@v3
+        uses: actions/upload-artifact@v4
         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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_appimage }}
           path: ./bundled/linux/${{ env.target_name_appimage }}
@@ -315,15 +319,15 @@ jobs:
 
       - name: Upload artifacts (MacOS dmg)
         if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
@@ -338,22 +342,20 @@ jobs:
 
       - name: Upload artifacts (Windows zip)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_zip }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}.zip
           retention-days: 7
 
       - name: Upload artifacts (Windows installer)
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
           retention-days: 7
 
-
-
       - name: Running Tests (Linux)
         working-directory: ci_tools_atomic_dex
         continue-on-error: true
@@ -379,11 +381,11 @@ jobs:
         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 }}"
+          export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
           export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
           export APPLE_ID="${{ secrets.APPLE_ID }}"
           export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
-          export MACOSX_DEPLOYMENT_TARGET=10.13
+          export MACOSX_DEPLOYMENT_TARGET=14.2
           export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }}
           export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }}
           export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }}

.gitignore

@@ -69,7 +69,7 @@ Thumbs.db
 # --------
 *.exe
 
-/assets/tools/mm2/
+/assets/tools/kdf/
 /ci_tools_atomic_dex/vcpkg-repo/
 /ci_tools_atomic_dex/ci_tools_atomic_dex
 ci_tools_atomic_dex/build-Release
@@ -88,3 +88,11 @@ atomic_legacy_imgui
 .vscode/settings.json
 .vscode/tasks.json
 bundled
+build.log
+.venv
+.venv/*
+cmake-3.19.0-rc3-Linux-x86_64
+ci_tools_atomic_dex/cmake-3.19.0-rc3-Linux-x86_64
+ci_tools_atomic_dex/cmake-3.19.0-rc3-Linux-x86_64/*
+.venv/*
+cmake-3.19.0-rc3-Linux-x86_64/*