Merge pull request #4545

7db5136 build: prepare v0.18.4.5 (selsta)

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 "4")
+set(VERSION_REVISION "5")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

Dockerfile.linux

@@ -233,9 +233,9 @@ RUN git clone -b v1.0.26 --depth 1 https://github.com/libusb/libusb && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b hidapi-0.13.1 --depth 1 https://github.com/libusb/hidapi && \
+RUN git clone -b hidapi-0.15.0 --depth 1 https://github.com/libusb/hidapi && \
     cd hidapi && \
-    git reset --hard 4ebce6b5059b086d05ca7e091ce04a5fd08ac3ac && \
+    git reset --hard d6b2a974608dec3b76fb1e36c189f22b9cf3650c && \
     ./bootstrap && \
     ./configure --disable-shared --enable-static && \
     make -j$THREADS && \

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.4 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.4.5 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
-    git reset --hard 516e5355a103a2bf0b7e10328ebcaa2945019445 && \
+    git reset --hard 316a98b11ea29b65e61a42cfdc37f762736fd7c1 && \
     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.4`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.5`) 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.4`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.5`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

js/Utils.js

@@ -53,7 +53,7 @@ function ago(epoch) {
     // Returns '<delta> [seconds|minutes|hours|days] ago' string given an epoch
 
     var now = new Date().getTime() / 1000;
-    var delta = now - epoch;
+    var delta = Math.max(now - epoch, 0);
 
     if(delta < 60)
         return qsTr("%n second(s) ago", "0", Math.floor(delta))

qml.qrc

@@ -281,6 +281,7 @@
         <file>images/ledgerNanoS.png</file>
         <file>images/ledgerNanoSPlus.png</file>
         <file>images/ledgerNanoX.png</file>
+        <file>images/ledgerNanoGen5.png</file>
         <file>images/ledgerStax.png</file>
         <file>images/ledgerFlex.png</file>
         <file>images/trezor3.png</file>

share/Info.plist

@@ -38,9 +38,6 @@
   <key>NSSupportsAutomaticGraphicsSwitching</key>
   <true/>
 
-  <key>NSRequiresAquaSystemAppearance</key>
-  <string>True</string>
-
   <key>CFBundleURLTypes</key>
   <array>
     <dict>

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.12/p2pool-v4.12-windows-x64.zip";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-windows-x64.zip";
-            fileName = m_p2poolPath + "/p2pool-v4.12-windows-x64.zip";
+            fileName = m_p2poolPath + "/p2pool-v4.13-windows-x64.zip";
-            validHash = "4ceb1c9f5772f79e3ded081ba1ea3c161586bcbe78863c794659861afde85f24";
+            validHash = "267006cd1259253052e64e9ac5ae27532cf238e71588444c14624b9432325e9f";
         #elif defined(Q_OS_LINUX)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-linux-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-linux-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.12-linux-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.13-linux-x64.tar.gz";
-            validHash = "4a95c5d4ff20d6d8042fea3cb4a8d10a687e980278aa8a36ec0d5fb1e5c395c2";
+            validHash = "d02361ee5f18e3e53af79436af6dc1772b71aa5ad8582ad88b0764ae2c9289c3";
         #elif defined(Q_OS_MACOS_AARCH64)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-macos-aarch64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-macos-aarch64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.12-macos-aarch64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.13-macos-aarch64.tar.gz";
-            validHash = "6f4a9ea650d0cf3afd36d33215c8d2a66c2d3837c9e1a2943bc61b0f68b314f5";
+            validHash = "fddd309566395a8297738f3fd5cd0fe9d792c3005bb664a1a61befa029e802ad";
         #elif defined(Q_OS_MACOS)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-macos-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-macos-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.12-macos-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.13-macos-x64.tar.gz";
-            validHash = "f3174f852cecd600e067ec5e91d8d59fc1511aca0d25344637926cfba288efad";
+            validHash = "374c42bbb409ed2ef3e5e0b4359441929cc574b2fa9bc8b3bdf7695471f8f94d";
         #endif
         QFile file(fileName);
         epee::net_utils::http::http_simple_client http_client;

wizard/WizardCreateDevice1.qml

@@ -55,6 +55,7 @@ Rectangle {
         ListElement { column1: "Ledger Nano S"; column2: "Ledger";}
         ListElement { column1: "Ledger Nano S Plus"; column2: "Ledger";}
         ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
+        ListElement { column1: "Ledger Nano Gen5"; column2: "Ledger";}
         ListElement { column1: "Ledger Stax"; column2: "Ledger";}
         ListElement { column1: "Ledger Flex"; column2: "Ledger";}
         ListElement { column1: "Trezor Model T"; column2: "Trezor";}
@@ -181,6 +182,8 @@ Rectangle {
                                         return "qrc:///images/ledgerNanoSPlus.png";
                                     } else if (ledgerType == "Ledger Nano X") {
                                         return "qrc:///images/ledgerNanoX.png";
+                                    } else if (ledgerType == "Ledger Nano Gen5") {
+                                        return "qrc:///images/ledgerNanoGen5.png";
                                     } else if (ledgerType == "Ledger Stax") {
                                         return "qrc:///images/ledgerStax.png";
                                     } else if (ledgerType == "Ledger Flex") {