Merge remote-tracking branch 'origin/develop' into bugfix/changeInsta…

…llerTool
aliascash · Nov 26, 2021 · 6bb65d2 · 6bb65d2
2 parents ce6b34f + 65d2b21
commit 6bb65d2
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 53 deletions.
diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -222,12 +222,13 @@ jobs:
           setup-python: 'false'
           modules: 'qtwebengine'
 
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows
           vcpkgTriplet: x64-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
 
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win.bat
@@ -236,7 +237,7 @@ jobs:
           QTDIR: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
 
       - name: Create zip archive and sha256 checksum
         run: |
@@ -287,12 +288,13 @@ jobs:
           modules: 'qtwebengine'
           arch: 'win32_msvc2017'
 
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows
           vcpkgTriplet: x86-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
 
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win-x86.bat
@@ -301,7 +303,7 @@ jobs:
           QTDIR_x86: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR_x86: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
 
       - name: Create zip archive and sha256 checksum
         run: |

diff --git a/.github/workflows/build-featurebranch.yml b/.github/workflows/build-featurebranch.yml
@@ -90,26 +90,30 @@ jobs:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
           version: '5.12.9'
           setup-python: 'false'
           modules: 'qtwebengine'
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows
           vcpkgTriplet: x64-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
+
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win.bat
         env:
           VCPKG_DEFAULT_TRIPLET: x64-windows
           QTDIR: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
 
   # ==========================================================================
   # Build Windows x86 version
@@ -119,24 +123,28 @@ jobs:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
           version: '5.12.9'
           setup-python: 'false'
           modules: 'qtwebengine'
           arch: 'win32_msvc2017'
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows
           vcpkgTriplet: x86-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
+
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win-x86.bat
         env:
           VCPKG_DEFAULT_TRIPLET: x86-windows
           QTDIR_x86: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR_x86: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -218,12 +218,13 @@ jobs:
           setup-python: 'false'
           modules: 'qtwebengine'
 
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x64-windows boost:x64-windows leveldb:x64-windows openssl:x64-windows
           vcpkgTriplet: x64-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
 
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win.bat
@@ -232,7 +233,7 @@ jobs:
           QTDIR: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
 
       - name: Create zip archive and sha256 checksum
         run: |
@@ -283,12 +284,13 @@ jobs:
           modules: 'qtwebengine'
           arch: 'win32_msvc2017'
 
-      - name: Install vcpkg and packages with cache
-        uses: lukka/run-vcpkg@v6
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v7
         with:
-          vcpkgArguments: 'berkeleydb boost leveldb openssl'
-          vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
+          vcpkgArguments: berkeleydb:x86-windows boost:x86-windows leveldb:x86-windows openssl:x86-windows
           vcpkgTriplet: x86-windows
+          vcpkgDirectory: 'C:\vcpkg'
+          vcpkgGitCommitId: aa028e94d733b03852ea441b2474468f43d94c5b
 
       - name: Build Windows binaries
         run: ./scripts/cmake-build-win-x86.bat
@@ -297,7 +299,7 @@ jobs:
           QTDIR_x86: ${{ env.Qt5_Dir }}
           VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
           CMAKEDIR_x86: 'C:\Program Files\CMake\bin'
-          VCPKGDIR: ${{ github.workspace }}/vcpkg
+          VCPKGDIR: 'C:\vcpkg'
 
       - name: Create zip archive and sha256 checksum
         run: |

diff --git a/Docker/CentOS/Dockerfile b/Docker/CentOS/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-centos-8:latest as build
+FROM aliascash/alias-wallet-builder-centos-8:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/CentOS/Dockerfile_noUpload b/Docker/CentOS/Dockerfile_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-centos-8:latest
+FROM aliascash/alias-wallet-builder-centos-8:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Debian/Dockerfile_Buster b/Docker/Debian/Dockerfile_Buster
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-debian-buster:latest as build
+FROM aliascash/alias-wallet-builder-debian-buster:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Debian/Dockerfile_Buster_noUpload b/Docker/Debian/Dockerfile_Buster_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-debian-buster:latest
+FROM aliascash/alias-wallet-builder-debian-buster:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Debian/Dockerfile_Stretch b/Docker/Debian/Dockerfile_Stretch
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-debian-stretch:latest as build
+FROM aliascash/alias-wallet-builder-debian-stretch:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Debian/Dockerfile_Stretch_noUpload b/Docker/Debian/Dockerfile_Stretch_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-debian-stretch:latest
+FROM aliascash/alias-wallet-builder-debian-stretch:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Fedora/Dockerfile b/Docker/Fedora/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-fedora:latest as build
+FROM aliascash/alias-wallet-builder-fedora:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Fedora/Dockerfile_noUpload b/Docker/Fedora/Dockerfile_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-fedora:latest
+FROM aliascash/alias-wallet-builder-fedora:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/OpenSUSE/Dockerfile b/Docker/OpenSUSE/Dockerfile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:latest as build
+FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/OpenSUSE/Dockerfile_noUpload b/Docker/OpenSUSE/Dockerfile_noUpload
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:latest
+FROM aliascash/alias-wallet-builder-opensuse-tumbleweed:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/RaspberryPi/Dockerfile_Buster b/Docker/RaspberryPi/Dockerfile_Buster
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-raspi-buster:latest as build
+FROM aliascash/alias-wallet-builder-raspi-buster:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/RaspberryPi/Dockerfile_Buster_noUpload b/Docker/RaspberryPi/Dockerfile_Buster_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-raspi-buster:latest
+FROM aliascash/alias-wallet-builder-raspi-buster:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Ubuntu/Dockerfile_18_04 b/Docker/Ubuntu/Dockerfile_18_04
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-ubuntu-18-04:latest as build
+FROM aliascash/alias-wallet-builder-ubuntu-18-04:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Ubuntu/Dockerfile_18_04_noUpload b/Docker/Ubuntu/Dockerfile_18_04_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-ubuntu-18-04:latest
+FROM aliascash/alias-wallet-builder-ubuntu-18-04:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Ubuntu/Dockerfile_20_04 b/Docker/Ubuntu/Dockerfile_20_04
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-ubuntu-20-04:latest as build
+FROM aliascash/alias-wallet-builder-ubuntu-20-04:2.7 as build
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/Docker/Ubuntu/Dockerfile_20_04_noUpload b/Docker/Ubuntu/Dockerfile_20_04_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-ubuntu-20-04:latest
+FROM aliascash/alias-wallet-builder-ubuntu-20-04:2.7
 MAINTAINER HLXEasy <hlxeasy@gmail.com>
 
 # Build parameters

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -141,7 +141,7 @@ void RPCExecutor::request(const QString &command)
     std::vector<std::string> args;
     if(!parseCommandLine(args, command.toStdString()))
     {
-        emit reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \""));
+        Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \""));
         return;
     }
 
@@ -165,21 +165,21 @@ void RPCExecutor::request(const QString &command)
         else
             strPrint = write_string(result, true);
 
-        emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));
+        Q_EMIT reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));
     } catch (const json_spirit::Object& objError)
     {
         try // Nice formatting for standard-format error
         {
             int code = find_value(objError, "code").get_int();
             std::string message = find_value(objError, "message").get_str();
-            emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")");
+            Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")");
         } catch (const std::runtime_error&) // raised when converting to invalid type, i.e. missing code or message
         {   // Show raw JSON object
-            emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
+            Q_EMIT reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
         };
     } catch (const std::exception& e)
     {
-        emit reply(RPCConsole::CMD_ERROR, QString("Error: ") + QString::fromStdString(e.what()));
+        Q_EMIT reply(RPCConsole::CMD_ERROR, QString("Error: ") + QString::fromStdString(e.what()));
     };
 }
 
@@ -227,7 +227,7 @@ RPCConsole::RPCConsole(QWidget *parent) :
 RPCConsole::~RPCConsole()
 {
     //GUIUtil::saveWindowGeometry("nRPCConsoleWindow", this);
-    emit stopExecutor();
+    Q_EMIT stopExecutor();
     delete ui;
 }
 
@@ -406,7 +406,7 @@ void RPCConsole::on_lineEdit_returnPressed()
     if(!cmd.isEmpty())
     {
         message(CMD_REQUEST, cmd);
-        emit cmdRequest(cmd);
+        Q_EMIT cmdRequest(cmd);
         // Remove command, if already in history
         history.removeOne(cmd);
         // Append command to history