Merge pull request #183 from ConcealNetwork/development

Development
ConcealNetwork · Aug 3, 2022 · 3981277 · 3981277
2 parents d08b6af + 5d6d93f
commit 3981277
Show file tree

Hide file tree

Showing 72 changed files with 3,474 additions and 3,343 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -28,6 +28,7 @@ jobs:
           ccx_version=$(echo "$GITHUB_REF" | sed 's|refs/tags/||')
           release_name=Conceal_Desktop-v"$ccx_version"-x86_64.AppImage
 
+          lrelease src/languages/*.ts
           make -j2 build-release
 
           echo "::set-output name=ccx_version::$ccx_version"

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -56,8 +56,8 @@ jobs:
           $replace = "set(CMAKE_PREFIX_PATH `"$($qt5_cmake)`")"
           (Get-Content $file) | %{$_ -replace $find, $replace} | Set-Content $file
 
-          # Update installer/windows/installer.iss with the current version
-          $file = "installer/windows/installer.iss"
+          # Update installer/windows/ConcealInstaller.iss with the current version
+          $file = "installer/windows/ConcealInstaller.iss"
           $find = "^#define AppVersion.+"
           $replace = "#define AppVersion '$ccx_version'"
           (Get-Content $file) | %{$_ -replace $find, $replace} | Set-Content $file
@@ -72,6 +72,9 @@ jobs:
           $ccx_version = $sha.SubString(0,7)
           $release_name = "ccx-desktop-win64-dev-$ccx_version"
 
+          lrelease src/languages/cn.ts
+          lrelease src/languages/ru.ts
+          lrelease src/languages/tr.ts
           New-Item "$build_folder\$release_folder" -ItemType Directory
           cd "$build_folder"
 
@@ -100,7 +103,7 @@ jobs:
           mv Final ../../installer/windows/build
           mv conceal-desktop.exe ../../installer/windows/build/
           cd ../../installer/windows/
-          iscc installer.iss
+          iscc ConcealInstaller.iss
           cd ../..
           mkdir $release_name
           mv installer/windows/bin/Conceal*.exe $release_name/
@@ -135,6 +138,7 @@ jobs:
         run: |
           ccx_version=${GITHUB_SHA::7}
 
+          lrelease src/languages/*.ts
           make -j2 build-release
 
           echo "::set-output name=ccx_version::$ccx_version"
@@ -185,6 +189,7 @@ jobs:
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-desktop-ubuntu-1804-dev-"$ccx_version"
 
+          lrelease src/languages/*.ts
           make -j2 build-release
           mkdir $release_name
           mkdir -p $release_name/icon
@@ -225,6 +230,7 @@ jobs:
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-desktop-ubuntu-2004-dev-"$ccx_version"
 
+          lrelease src/languages/*.ts
           make -j2 build-release
           mkdir $release_name
           mkdir -p $release_name/icon
@@ -267,6 +273,7 @@ jobs:
           release_name="ccx-desktop-macOS-dev-$ccx_version"
           app_name="conceal-desktop.app"
 
+          lrelease src/languages/*.ts
           make -j3 build-release
           cd "$build_folder"
           macdeployqt "$app_name"

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-macos:
     name: macOS
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
 
@@ -30,6 +30,7 @@ jobs:
           release_name="ccx-desktop-macOS-v$ccx_version"
           app_name="conceal-desktop.app"
 
+          lrelease src/languages/*.ts
           make -j4 build-release
           cd "$build_folder"
           macdeployqt "$app_name"

diff --git a/.github/workflows/ubuntu18.yml b/.github/workflows/ubuntu18.yml
@@ -29,6 +29,7 @@ jobs:
           release_name=ccx-desktop-ubuntu-1804-v"$ccx_version"
           build_folder="build/release"
 
+          lrelease src/languages/*.ts
           make -j4 build-release
           mkdir $release_name
           mkdir -p $release_name/icon

diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -29,6 +29,7 @@ jobs:
           release_name=ccx-desktop-ubuntu-2004-v"$ccx_version"
           build_folder="build/release"
 
+          lrelease src/languages/*.ts
           make -j4 build-release
           mkdir $release_name
           mkdir -p $release_name/icon

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -52,8 +52,8 @@ jobs:
           $replace = "set(CMAKE_PREFIX_PATH `"$($qt5_cmake)`")"
           (Get-Content $file) | %{$_ -replace $find, $replace} | Set-Content $file
 
-          # Update installer/windows/installer.iss with the current version
-          $file = "installer/windows/installer.iss"
+          # Update installer/windows/ConcealInstaller.iss with the current version
+          $file = "installer/windows/ConcealInstaller.iss"
           $find = "^#define AppVersion.+"
           $replace = "#define AppVersion '$ccx_version'"
           (Get-Content $file) | %{$_ -replace $find, $replace} | Set-Content $file
@@ -67,6 +67,9 @@ jobs:
           $ccx_version = "${{ github.ref }}" -replace 'refs/tags/'
           $release_name = "ccx-desktop-win64-v$ccx_version"
 
+          lrelease src/languages/cn.ts
+          lrelease src/languages/ru.ts
+          lrelease src/languages/tr.ts
           New-Item "$build_folder\$release_folder" -ItemType Directory
           cd "$build_folder"
 
@@ -96,7 +99,7 @@ jobs:
           mv Final ../../installer/windows/build
           mv conceal-desktop.exe ../../installer/windows/build/
           cd ../../installer/windows/
-          iscc installer.iss
+          iscc ConcealInstaller.iss
           cd bin
           Compress-Archive -Path Conceal*.exe -DestinationPath "$release_name.zip"
 

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,26 @@
+dist: focal
+language: cpp
+
+branches:
+  only:
+    - master
+    - travis
+
+addons:
+  apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libboost-all-dev
+      - g++
+      - qt5-default
+      - libqt5charts5-dev
+
+script:
+  - rm -rf cryptonote
+  - git clone https://github.com/ConcealNetwork/conceal-core.git cryptonote
+  - mkdir build
+  - cd build
+  - cmake -DCMAKE_BUILD_TYPE=Release ..
+  - make -j2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -188,6 +188,7 @@ set(CRYPTONOTE_SOURCES
   cryptonote/src/BlockchainExplorer/BlockchainExplorer.cpp
   cryptonote/src/BlockchainExplorer/BlockchainExplorerDataBuilder.cpp
   cryptonote/src/BlockchainExplorer/BlockchainExplorerErrors.cpp
+  cryptonote/src/Mnemonics/Mnemonics.cpp
 )
 
 file(GLOB_RECURSE SOURCES src/*.cpp)

diff --git a/installer/windows/.gitattributes b/installer/windows/.gitattributes
@@ -0,0 +1 @@
+*.iss whitespace=trailing-space,cr-at-eol,diff