Merge pull request #188 from ConcealNetwork/development

Version 6.7.0
ConcealNetwork · Oct 31, 2022 · b275a35 · b275a35
2 parents e523718 + 21db33d
commit b275a35
Show file tree

Hide file tree

Showing 124 changed files with 639 additions and 576 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -248,6 +248,47 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y qtbase5-dev 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-2204-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 "::set-output name=release_name::${release_name}"
+
+      - name: Upload To GH Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.build.outputs.release_name }}
+          path: ${{ steps.build.outputs.release_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   build-macos:
     name: macOS
     runs-on: macos-11

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,4 +71,4 @@ jobs:
           make -j2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
@@ -0,0 +1,57 @@
+name: Ubuntu 22.04
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt update -y
+          sudo apt install -y qtbase5-dev 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
+
+      - name: Build
+        id: build
+        run: |
+          ccx_version=$(echo "$GITHUB_REF" | sed 's|refs/tags/||')
+          release_name=ccx-desktop-ubuntu-2204-v"$ccx_version"
+          build_folder="build/release"
+
+          lrelease src/languages/*.ts
+          make -j4 build-release
+          mkdir $release_name
+          mkdir -p $release_name/icon
+          mv $build_folder/conceal-desktop $release_name
+          cp conceal-desktop.desktop $release_name
+          cp src/images/conceal.png $release_name/icon
+          tar -czf "$release_name".tar.gz "$release_name"
+          sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
+
+          echo "::set-output name=sha256::${sha256}"
+          echo "::set-output name=release_name::${release_name}.tar.gz"
+          echo "::set-output name=ccx_version::${ccx_version}"
+
+      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
+      # use v0.1.12 for now
+      - name: Create Release
+        uses: softprops/action-gh-release@v0.1.12
+        with:
+          files: ${{ steps.build.outputs.release_name }}
+          name: Conceal Desktop v${{ steps.build.outputs.ccx_version }}
+          body: |
+            [Download for Ubuntu 22.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
+            `SHA256 : ${{ steps.build.outputs.sha256 }}`
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -2,9 +2,9 @@ Copyright:
 
     © 2011-2017 The Cryptonote developers
     © 2014-2016 XDN developers
-    © 2016-2017 Krypt0x
+    © 2016-2017 Karbowanec developers
     © 2017-2018 The Circle Foundation & Conceal Devs
-    © 2018-2021 Conceal Network & Conceal Devs
+    © 2018-2022 Conceal Network & Conceal Devs
 
 License:
 

diff --git a/CryptoNoteWallet.cmake b/CryptoNoteWallet.cmake
@@ -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.6.5)
+set(CN_VERSION 6.7.0)
diff --git a/LICENSE b/LICENSE
@@ -2,9 +2,9 @@ Copyright:
 
     © 2011-2017 The Cryptonote developers
     © 2014-2016 XDN developers
-    © 2016-2017 Krypt0x
+    © 2016-2017 Karbowanec developers
     © 2017-2018 The Circle Foundation & Conceal Devs
-    © 2018-2021 Conceal Network & Conceal Devs
+    © 2018-2022 Conceal Network & Conceal Devs
 
 License:
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Conceal Desktop (GUI Wallet)
 
-Latest Release: v6.6.5
+Latest Release: v6.7.0
 
 Maintained by Conceal Devs.
 

diff --git a/src/AddressProvider.cpp b/src/AddressProvider.cpp
@@ -1,6 +1,9 @@
-// Copyright (c) 2011-2016 The Cryptonote developers
-// Copyright (c) 2015-2016 XDN developers
-// Copyright (c) 2016 Karbowanec developers
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/AddressProvider.h b/src/AddressProvider.h
@@ -1,6 +1,9 @@
-// Copyright (c) 2011-2016 The Cryptonote developers
-// Copyright (c) 2015-2016 XDN developers
-// Copyright (c) 2016 Karbowanec developers
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/AliasProvider.cpp b/src/AliasProvider.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
-// Copyright (c) 2014-2017 XDN developers 
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2019 Conceal Network & Conceal Devs
-//
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -32,7 +33,6 @@ void AliasProvider::getAddresses(const QString& _urlString) {
   if (!url.isValid()) {
     return;
   }
-
   QNetworkRequest request(url);
   QNetworkReply* reply = m_networkManager.get(request);
   connect(reply, &QNetworkReply::readyRead, this, &AliasProvider::readyRead);

diff --git a/src/AliasProvider.h b/src/AliasProvider.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-//  
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2019 Conceal Network & Conceal Devs
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/CommandLineParser.cpp b/src/CommandLineParser.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2019 Conceal Network & Conceal Devs
-//
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/CommandLineParser.h b/src/CommandLineParser.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-//  
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2019 Conceal Network & Conceal Devs
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/CryptoNoteWalletConfig.h.in b/src/CryptoNoteWalletConfig.h.in
@@ -1,3 +1,11 @@
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #pragma once
 

diff --git a/src/CryptoNoteWrapper.cpp b/src/CryptoNoteWrapper.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-//  
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2020 Conceal Network & Conceal Devs
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/CryptoNoteWrapper.h b/src/CryptoNoteWrapper.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-//  
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2019 Conceal Network & Conceal Devs
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/CurrencyAdapter.cpp b/src/CurrencyAdapter.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2021 Conceal Network & Conceal Devs
-//
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -46,7 +47,7 @@ QString CurrencyAdapter::getCurrencyTicker() const {
 }
 
 quint64 CurrencyAdapter::calculateInterest(quint64 _amount, quint32 _term, uint32_t height) const {
-  return m_currency.calculateInterest(_amount, _term, height);
+  return m_currency.calculateInterest(_amount, _term, height - _term);
 }
 
 quint64 CurrencyAdapter::getMinimumFee() const {

diff --git a/src/CurrencyAdapter.h b/src/CurrencyAdapter.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2011-2017 The Cryptonote developers
 // Copyright (c) 2014-2017 XDN developers
-// Copyright (c) 2018 The Circle Foundation & Conceal Devs
-// Copyright (c) 2018-2021 Conceal Network & Conceal Devs
-// 
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -23,7 +24,7 @@ class CurrencyAdapter {
   QString getCurrencyDisplayName() const;
   QString getCurrencyName() const;
   QString getCurrencyTicker() const;
-  quint64 calculateInterest(quint64 _amount, quint32 _term, uint32_t height) const;
+  quint64 calculateInterest(quint64 _amount, quint32 _term, uint32_t lockheight) const;
   quint64 getMinimumFee() const;
   quint64 getMinimumFeeV1() const;  
   quint64 getMinimumFeeBanking() const;  

diff --git a/src/ExchangeProvider.cpp b/src/ExchangeProvider.cpp
@@ -1,6 +1,9 @@
-// Copyright (c) 2011-2016 The Cryptonote developers
-// Copyright (c) 2015-2016 XDN developers
-// Copyright (c) 2016 Karbowanec developers
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/ExchangeProvider.h b/src/ExchangeProvider.h
@@ -1,6 +1,9 @@
-// Copyright (c) 2011-2016 The Cryptonote developers
-// Copyright (c) 2015-2016 XDN developers
-// Copyright (c) 2016 Karbowanec developers
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/LogFileWatcher.cpp b/src/LogFileWatcher.cpp
@@ -1,20 +1,11 @@
-// Copyright (c) 2015-2017, The Bytecoin developers
-// Copyright (c) 2017-2018, The Karbo developers
-//
-// This file is part of Karbo.
-//
-// Karbovanets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Karbovanets is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Karbovanets.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (c) 2011-2017 The Cryptonote developers
+// Copyright (c) 2014-2017 XDN developers
+// Copyright (c) 2017 Karbowanec developers
+// Copyright (c) 2017-2018 The Circle Foundation & Conceal Devs
+// Copyright (c) 2018-2022 Conceal Network & Conceal Devs
+
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <QFile>
 #include <QFileSystemWatcher>