Merge pull request #4471

1afc8e6 build: prepare v0.18.4.1 (selsta)

.github/workflows/build.yml

@@ -99,7 +99,7 @@ jobs:
         path: build/bin/monero-wallet-gui.tar
 
   docker-linux-static:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -131,7 +131,7 @@ jobs:
           /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod
 
   docker-windows-static:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -159,7 +159,7 @@ jobs:
           /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
 
   docker-android:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
       with:
@@ -185,7 +185,7 @@ jobs:
         path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
 
   source-archive:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
       with:

CMakeLists.txt

@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
 set(VERSION_MINOR "4")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "1")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")
@@ -20,7 +20,7 @@ if(DEV_MODE)
   # DEV_MODE checks out the monero submodule to master, which requires C++17.
   set(CMAKE_CXX_STANDARD 17)
 else()
-  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD 14)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

Dockerfile.android

@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM ubuntu:20.04
 
 ARG THREADS=1
 ARG ANDROID_NDK_REVISION=23c
@@ -20,6 +20,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
 ENV PATH=${JAVA_HOME}/bin:${PATH}
 ENV PREFIX=${WORKDIR}/prefix
 ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
     && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \

Dockerfile.windows

@@ -12,9 +12,9 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
     update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
 
-RUN git clone -b v0.18.4.0 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.4.1 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
-    git reset --hard f1311d4237404ab7da76241dbf10e92a65132cc4 && \
+    git reset --hard ec870e50706a29768a65f597155ed5c7ad7e6326 && \
     cp -a contrib/depends / && \
     cd .. && \
     rm -rf monero

README.md

@@ -105,7 +105,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -128,7 +128,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

cmake/Deploy.cmake

@@ -96,11 +96,11 @@ if(APPLE OR (WIN32 AND NOT STATIC))
             libssl-3-x64.dll
             libcrypto-3-x64.dll
             #icu
-            libicudt76.dll
+            libicudt77.dll
-            libicuin76.dll
+            libicuin77.dll
-            libicuio76.dll
+            libicuio77.dll
-            libicutu76.dll
+            libicutu77.dll
-            libicuuc76.dll
+            libicuuc77.dll
         )
 
         # Boost Regex is header-only since 1.77

components/PasswordDialog.qml

@@ -204,7 +204,7 @@ Item {
                 font.family: MoneroComponents.Style.fontLight.name
                 Layout.fillWidth: true
                 wrapMode: Text.Wrap
-                text: qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
+                text: qsTr("CAPS LOCK IS ON.") + translationManager.emptyString;
             }
 
             MoneroComponents.LineEdit {

js/TxUtils.js

@@ -21,7 +21,6 @@ function addressTruncatePretty(address, blocks){
     if(typeof(address) === "undefined") return "";
     if(typeof(blocks) === "undefined") blocks = 2;
     blocks = blocks <= 1 ? 1 : blocks >= 23 ? 23 : blocks;
-    var ret = "";
     return address.substring(0, 4 * blocks).match(/.{1,4}/g).join(' ') + " .. " + address.substring(address.length - 4 * blocks).match(/.{1,4}/g).join(' ');
 }
 

lang/languages.xml

@@ -22,7 +22,7 @@ Lojban
         <!-- <language display_name="English (ZA)" locale="en_SA" wallet_language="English" flag="/lang/flags/za.png" qs="none"/> -->
         <!-- <language display_name="العربية (PS)" locale="ar_PS" wallet_language="English" flag="/lang/flags/ps.png" qs="none"/> -->
         <language display_name="Deutsch" locale="de_DE" wallet_language="Deutsch" flag="/lang/flags/de.png" qs="none"/>
-        <language display_name="Esperanto" locale="eo" wallet_language="Esperanto" flag="/lang/flags/esperanto.png" qs="none"/>
+        <language display_name="Esperanto" locale="eo_EO" wallet_language="Esperanto" flag="/lang/flags/eo.png" qs="none"/>
         <language display_name="Español" locale="es_ES" wallet_language="Español" flag="/lang/flags/es.png" qs="none"/>
         <language display_name="Français" locale="fr_FR" wallet_language="Français" flag="/lang/flags/fr.png" qs="none"/>
         <language display_name="Svenska" locale="sv_SE" wallet_language="English" flag="/lang/flags/se.png" qs="none"/>

main.qml

@@ -94,7 +94,7 @@ ApplicationWindow {
     readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype)
     property string currentDaemonAddress;
     property int disconnectedEpoch: 0
-    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 55 : 150 // GB
+    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 100 : 225 // GB
     property alias viewState: rootItem.state
     property string prevSplashText;
     property bool splashDisplayedBeforeButtonRequest;

pages/History.qml

@@ -1447,7 +1447,6 @@ Rectangle {
         var txs = [];
         for (var i = 0; i < root.txData.length; i++){
             var item = root.txData[i];
-            var matched = "";
 
             // daterange filtering
             if(item.timestamp < fromDate || item.timestamp > toDate){

qml.qrc

@@ -64,7 +64,7 @@
         <file>lang/flags/cz.png</file>
         <file>lang/flags/dk.png</file>
         <file>lang/flags/eg.png</file>
-        <file>lang/flags/esperanto.png</file>
+        <file>lang/flags/eo.png</file>
         <file>lang/flags/fi.png</file>
         <file>lang/flags/fr.png</file>
         <file>lang/flags/de.png</file>

src/p2pool/P2PoolManager.cpp

@@ -53,21 +53,21 @@ void P2PoolManager::download() {
         QString fileName;
         QString validHash;
         #ifdef Q_OS_WIN
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.4/p2pool-v4.4-windows-x64.zip";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-windows-x64.zip";
-            fileName = m_p2poolPath + "/p2pool-v4.4-windows-x64.zip";
+            fileName = m_p2poolPath + "/p2pool-v4.8.1-windows-x64.zip";
-            validHash = "2f04ec3f4b28edf6f70bfc369b6ffba8d38af53d7a787d9ef5d630e5925e51de";
+            validHash = "a5378296a202625014623235ac347ddb5d9618b9ac8d1159a6cd9511966f86c0";
         #elif defined(Q_OS_LINUX)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.4/p2pool-v4.4-linux-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-linux-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.4-linux-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.8.1-linux-x64.tar.gz";
-            validHash = "a3495e19b2587a38ac9afdb73de8e2eadc90f21e2c348cb972a3ece678cad5f1";
+            validHash = "2c182de88aac7fbd5a3f9a8ac1840b5f9d6050a2d1829c7b177f7a6df8b32117";
         #elif defined(Q_OS_MACOS_AARCH64)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.4/p2pool-v4.4-macos-aarch64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-macos-aarch64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.4-macos-aarch64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.8.1-macos-aarch64.tar.gz";
-            validHash = "b8496fe1c5312fa3678e3d0e5ba0cfb7b498b1358dc7ed76a20a38574fef35d4";
+            validHash = "38d63384cb183477593460a917183ddb8345f242231efe54020f8e93c399700a";
         #elif defined(Q_OS_MACOS)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.4/p2pool-v4.4-macos-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-macos-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.4-macos-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.8.1-macos-x64.tar.gz";
-            validHash = "8ab40faf7d1032835a3b3319b193ad2e14901e0b01e1e802c6b8333c8b75dfad";
+            validHash = "da7eea2a0b5ec0fc5f51deff63903d2cbe0ead9be04a18327a0fbb4004fba399";
         #endif
         QFile file(fileName);
         epee::net_utils::http::http_simple_client http_client;

wizard/WizardAskPassword.qml

@@ -47,7 +47,7 @@ ColumnLayout {
         return passwordInput.text === passwordInputConfirm.text;
     }
 
-    function calcPasswordStrength(inp) {
+    function calcPasswordStrength() {
         if(!progressLayout.visible) return;
         if(passwordInput.text.length <= 1){
             root.passwordFill = 0;

wizard/WizardRestoreWallet1.qml

@@ -46,7 +46,6 @@ Rectangle {
             return false;
         }
 
-        var valid = false;
         if(wizardController.walletRestoreMode === "keys") {
             return wizardWalletInput.verify() && wizardRestoreWallet1.verifyFromKeys();
         } else if(wizardController.walletRestoreMode === "seed") {