Skip to content

Commit

Permalink
Merge pull request #197 from ConcealNetwork/development
Browse files Browse the repository at this point in the history
Version 6.7.3
  • Loading branch information
AxVultis authored Feb 24, 2024
2 parents b7370e9 + b8e2761 commit 8d406d4
Show file tree
Hide file tree
Showing 135 changed files with 727 additions and 1,183 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:
jobs:
build-appimage:
name: AppImage
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master

- name: Install dependencies
run: |
sudo apt update -y
sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
sudo apt install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
- name: Clone conceal-core
run: |
Expand Down
69 changes: 17 additions & 52 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,27 @@ on:
jobs:
build-windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
env:
BOOST_ROOT: C:/tools/boost/x86_64
BOOST_ROOT: C:/local/boost_1_83_0
steps:
- uses: actions/checkout@master

- name: Setup msbuild
uses: microsoft/[email protected]

- name: Restore Boost
uses: actions/cache@v3
id: restore-boost
with:
path: ${{env.BOOST_ROOT}}
key: boost_1_83_0-msvc-14.3-64

- name: Install Boost
if: steps.restore-boost.outputs.cache-hit != 'true'
shell: powershell
run: |
echo "${env:BOOST_ROOT}"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
Expand Down Expand Up @@ -78,7 +85,7 @@ jobs:
New-Item "$build_folder\$release_folder" -ItemType Directory
cd "$build_folder"
cmake -G "Visual Studio 16 2019" ..
cmake -G "Visual Studio 17 2022" ..
msbuild conceal-desktop.sln /p:Configuration=Release /m:2
echo "build_folder=${build_folder}" >> $env:GITHUB_OUTPUT
Expand All @@ -95,9 +102,8 @@ jobs:
cd "$build_folder/$release_folder"
mkdir "Final"
choco install openssl -y
cp "C:\Program Files\OpenSSL-Win64\libcrypto*.dll" "Final/"
cp "C:\Program Files\OpenSSL-Win64\libssl*.dll" "Final/"
cp "C:\Program Files\OpenSSL\libcrypto*.dll" "Final/"
cp "C:\Program Files\OpenSSL\libssl*.dll" "Final/"
windeployqt --release conceal-desktop.exe --dir "Final/" --no-translations --no-opengl-sw
mv Final ../../installer/windows/build
Expand All @@ -118,14 +124,14 @@ jobs:

build-appimage:
name: AppImage
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@master

- name: Install dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev openssl
- name: Clone conceal-core
run: |
Expand Down Expand Up @@ -166,47 +172,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-ubuntu18:
name: Ubuntu 18.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@master

- name: Install dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y qt5-default qttools5-dev qttools5-dev-tools libqt5charts5-dev libboost-all-dev
- name: Clone conceal-core
run: |
rm -rf cryptonote
git clone https://github.com/ConcealNetwork/conceal-core.git cryptonote
./.github/checkout.sh
- name: Build
id: build
run: |
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
mv build/release/conceal-desktop $release_name
cp conceal-desktop.desktop $release_name
cp src/images/conceal.png $release_name/icon
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
- name: Upload To GH Artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ steps.build.outputs.release_name }}
path: ${{ steps.build.outputs.release_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-ubuntu20:
name: Ubuntu 20.04
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -291,7 +256,7 @@ jobs:

build-macos:
name: macOS
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@master

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build-macos:
name: macOS
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@master

Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/ubuntu18.yml

This file was deleted.

22 changes: 14 additions & 8 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,27 @@ on:
jobs:
build-windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
env:
BOOST_ROOT: C:/tools/boost/x86_64
BOOST_ROOT: C:/local/boost_1_83_0
steps:
- uses: actions/checkout@master

- name: Setup msbuild
uses: microsoft/[email protected]

- name: Restore Boost
uses: actions/cache@v3
id: restore-boost
with:
path: ${{env.BOOST_ROOT}}
key: boost_1_83_0-msvc-14.3-64

- name: Install Boost
if: steps.restore-boost.outputs.cache-hit != 'true'
shell: powershell
run: |
echo "${env:BOOST_ROOT}"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"
Expand Down Expand Up @@ -73,7 +80,7 @@ jobs:
New-Item "$build_folder\$release_folder" -ItemType Directory
cd "$build_folder"
cmake -G "Visual Studio 16 2019" ..
cmake -G "Visual Studio 17 2022" ..
msbuild conceal-desktop.sln /p:Configuration=Release /m:2
echo "build_folder=${build_folder}" >> $env:GITHUB_OUTPUT
Expand All @@ -91,9 +98,8 @@ jobs:
cd "$build_folder/$release_folder"
mkdir "Final"
choco install openssl -y
cp "C:\Program Files\OpenSSL-Win64\libcrypto*.dll" "Final/"
cp "C:\Program Files\OpenSSL-Win64\libssl*.dll" "Final/"
cp "C:\Program Files\OpenSSL\libcrypto*.dll" "Final/"
cp "C:\Program Files\OpenSSL\libssl*.dll" "Final/"
windeployqt --release conceal-desktop.exe --dir "Final/" --no-translations --no-opengl-sw
mv Final ../../installer/windows/build
Expand Down
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ set(CRYPTONOTE_SOURCES
cryptonote/src/Common/MemoryInputStream.cpp
cryptonote/src/Common/PathTools.cpp
cryptonote/src/Common/DnsTools.cpp
cryptonote/src/Common/ScopeExit.cpp
cryptonote/src/Common/StdInputStream.cpp
cryptonote/src/Common/StdOutputStream.cpp
cryptonote/src/Common/StreamTools.cpp
Expand Down Expand Up @@ -150,12 +151,13 @@ set(CRYPTONOTE_SOURCES
cryptonote/src/Wallet/LegacyKeysImporter.cpp
cryptonote/src/Wallet/WalletAsyncContextCounter.cpp
cryptonote/src/Wallet/WalletErrors.cpp
cryptonote/src/Wallet/WalletGreen.cpp
cryptonote/src/Wallet/WalletSerializationV1.cpp
cryptonote/src/Wallet/WalletSerializationV2.cpp
cryptonote/src/Wallet/WalletUtils.cpp
cryptonote/src/WalletLegacy/KeysStorage.cpp
cryptonote/src/WalletLegacy/WalletLegacy.cpp
cryptonote/src/WalletLegacy/WalletHelper.cpp
cryptonote/src/WalletLegacy/WalletLegacySerializer.cpp
cryptonote/src/WalletLegacy/WalletLegacySerialization.cpp
cryptonote/src/WalletLegacy/WalletTransactionSender.cpp
cryptonote/src/WalletLegacy/WalletUnconfirmedTransactions.cpp
cryptonote/src/WalletLegacy/WalletUserTransactionsCache.cpp
cryptonote/src/System/ContextGroup.cpp
Expand Down
31 changes: 31 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
COPYRIGHT

© 2018-2023 Conceal Network & Conceal Devs
© 2017-2018 The Circle Foundation & Conceal Devs
© 2011-2017 The Cryptonote developers

LICENSE

MIT

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

Distributed under the MIT/X11 software license http://www.opensource.org/licenses/mit-license.php
14 changes: 7 additions & 7 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Copyright:
COPYRIGHT

© 2011-2017 The Cryptonote developers
© 2014-2016 XDN developers
© 2016-2017 Karbowanec developers
© 2017-2018 The Circle Foundation & Conceal Devs
© 2018-2022 Conceal Network & Conceal Devs
© 2018-2023 Conceal Network & Conceal Devs
© 2017-2018 The Circle Foundation & Conceal Devs
© 2011-2017 The Cryptonote developers

License:
LICENSE

MIT

Expand All @@ -29,3 +27,5 @@ License:
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

Distributed under the MIT/X11 software license http://www.opensource.org/licenses/mit-license.php
2 changes: 1 addition & 1 deletion CryptoNoteWallet.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set(CN_PROJECT_NAME "conceal-desktop")
set(CN_CURRENCY_DISPLAY_NAME "Conceal")
set(CN_CURRENCY_TICKER "CCX")
set(CN_VERSION 6.7.1)
set(CN_VERSION 6.7.3)
14 changes: 7 additions & 7 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Copyright:
COPYRIGHT

© 2011-2017 The Cryptonote developers
© 2014-2016 XDN developers
© 2016-2017 Karbowanec developers
© 2017-2018 The Circle Foundation & Conceal Devs
© 2018-2022 Conceal Network & Conceal Devs
© 2018-2023 Conceal Network & Conceal Devs
© 2017-2018 The Circle Foundation & Conceal Devs
© 2011-2017 The Cryptonote developers

License:
LICENSE

MIT

Expand All @@ -29,3 +27,5 @@ License:
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

Distributed under the MIT/X11 software license http://www.opensource.org/licenses/mit-license.php
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Conceal Desktop (GUI Wallet)

Latest Release: v6.7.1
Latest Release: v6.7.3

Maintained by Conceal Devs.

Expand Down Expand Up @@ -140,3 +140,9 @@ cpack
## Special Thanks

Special thanks goes out to the developers from Cryptonote, Bytecoin, Monero, Forknote, TurtleCoin, and Masari.

## Copyright

© 2018-2023 Conceal Network & Conceal Devs
© 2017-2018 The Circle Foundation & Conceal Devs
© 2011-2017 The Cryptonote developers
Loading

0 comments on commit 8d406d4

Please sign in to comment.