Merge pull request #4284

df29170 Dockerfile: bump zlib version to 1.3.1 (selsta)

.github/workflows/build.yml

@@ -2,6 +2,10 @@ name: ci/gh-actions/gui
 
 on: [push, pull_request]
 
+env:
+  FREE_DISKSPACE: |
+    sudo rm -rf /usr/local/.ghcup /usr/share/dotnet /usr/share/swift /usr/share/miniconda
+
 jobs:
   build-macos:
     runs-on: macOS-latest
@@ -107,6 +111,8 @@ jobs:
           docker-linux-static-
     - name: install dependencies
       run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxcb-shape0 libxkbcommon-x11-0
+    - name: free up diskspace
+      run: ${{env.FREE_DISKSPACE}}
     - name: prepare build environment
       run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
     - name: build
@@ -135,6 +141,8 @@ jobs:
         key: docker-windows-static-{hash}
         restore-keys: |
           docker-windows-static-
+    - name: free up diskspace
+      run: ${{env.FREE_DISKSPACE}}
     - name: prepare build environment
       run: docker build --tag monero:build-env-windows --build-arg THREADS=3 --file Dockerfile.windows .
     - name: build
@@ -161,6 +169,8 @@ jobs:
         key: docker-android-static-{hash}
         restore-keys: |
           docker-android-static-
+    - name: free up diskspace
+      run: ${{env.FREE_DISKSPACE}}
     - name: prepare build environment
       run: docker build --tag monero:build-env-android --build-arg THREADS=3 --file Dockerfile.android .
     - name: build

CMakeLists.txt

@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
 set(VERSION_MINOR "3")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "2")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

DEPLOY.md

@@ -10,7 +10,7 @@ Use macOS 10.12 - 10.13 for better backwards compability.
 
 4. Compile `monero-wallet-gui.app`
 
-```
+```bash
 mkdir build && cd build
 cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 ..
 make
@@ -45,3 +45,31 @@ You can check if this step worked by using `codesign -dvvv monero-wallet-gui.app
 5. `xcrun altool --notarization-info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee -u email@address.org`
 
 6. `xcrun stapler staple -v monero-gui-mac-x64-v0.X.Y.Z.dmg`
+
+## Compile Qt for Apple Silicon
+
+Qt does not offer pre-built binaries for Apple Silicon, they have to be manually compiled.
+
+```bash
+git clone https://github.com/qt/qt5.git
+cd qt5
+git checkout v5.15.9-lts-lgpl
+./init-repository
+mkdir build
+cd build
+../configure -prefix /path/to/qt-build-dir/ -opensource -confirm-license -release -nomake examples -nomake tests -no-rpath -skip qtwebengine -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtnetworkauth -skip qtpurchasing -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine
+make
+make install
+cd ../qttools/src/linguist/lrelease
+../../../../build/qtbase/bin/qmake
+make
+make install
+cd ../../../../qttools/src/macdeployqt/macdeployqt/
+../../../../build/qtbase/bin/qmake
+make
+make install
+```
+
+For compilation with Xcode 15 the following patch has to be applied: https://raw.githubusercontent.com/Homebrew/formula-patches/086e8cf/qt5/qt5-qmake-xcode15.patch
+
+The `CMAKE_PREFIX_PATH` has to be set to `/path/to/qt-build-dir/` during monero-gui compilation.

Dockerfile.android

@@ -43,9 +43,9 @@ RUN echo y | ${ANDROID_SDK_ROOT}/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "
 ENV HOST_PATH=${PATH}
 ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
 
-ARG ZLIB_VERSION=1.3
+ARG ZLIB_VERSION=1.3.1
-ARG ZLIB_HASH=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
+ARG ZLIB_HASH=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
-RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+RUN wget -q https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz \
     && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \
     && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
     && rm zlib-${ZLIB_VERSION}.tar.gz \
@@ -125,7 +125,7 @@ RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
     && rm openssl-${OPENSSL_VERSION}.tar.gz \
     && cd openssl-${OPENSSL_VERSION} \
     && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \
-    android-arm64 no-asm no-shared --static \
+    android-arm64 no-shared --static \
     --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \
     --prefix=${PREFIX} --openssldir=${PREFIX} \
     && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \

Dockerfile.linux

@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 ARG THREADS=1
-ARG QT_VERSION=v5.15.10-lts-lgpl
+ARG QT_VERSION=v5.15.12-lts-lgpl
 
 ENV CFLAGS="-fPIC"
 ENV CPPFLAGS="-fPIC"
@@ -170,7 +170,7 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1u.tar.gz && \
     tar -xzf openssl-1.1.1u.tar.gz && \
     rm openssl-1.1.1u.tar.gz && \
     cd openssl-1.1.1u && \
-    ./config no-asm no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \
+    ./config no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)

Dockerfile.windows

@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
 ARG THREADS=1
-ARG QT_VERSION=v5.15.10-lts-lgpl
+ARG QT_VERSION=v5.15.12-lts-lgpl
 ENV SOURCE_DATE_EPOCH=1397818193
 
 RUN apt update && \

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018, The Monero Project
+Copyright (c) 2014-2024, The Monero Project
 
 All rights reserved.
 

LeftPanel.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

MiddlePanel.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

README.md

@@ -1,6 +1,6 @@
 # Monero GUI
 
-Copyright (c) 2014-2022, The Monero Project
+Copyright (c) 2014-2024, The Monero Project
 
 ## Table of Contents
   * [Development resources](#development-resources)
@@ -87,7 +87,7 @@ Status of the translations:
 
 Packages are available for
 * Arch Linux: [monero-gui](https://archlinux.org/packages/extra/x86_64/monero-gui/)
-* Void Linux: `xbps-install -S monero-gui`
+* NixOS: `nix-shell -p monero-gui`
 * Flatpak: [Monero GUI](https://flathub.org/apps/details/org.getmonero.Monero)
 * GuixSD: `guix package -i monero-gui`
 * macOS (homebrew): `brew install --cask monero-wallet`
@@ -107,7 +107,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.3.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -130,7 +130,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.3.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

cmake/32-bit-toolchain.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2019, The Monero Project
+# Copyright (c) 2014-2024, The Monero Project
 # 
 # All rights reserved.
 # 

cmake/64-bit-toolchain.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2019, The Monero Project
+# Copyright (c) 2014-2024, The Monero Project
 # 
 # All rights reserved.
 # 

cmake/Deploy.cmake

@@ -89,31 +89,20 @@ if(APPLE OR (WIN32 AND NOT STATIC))
             libdouble-conversion.dll
             libgcrypt-20.dll
             libgpg-error-0.dll
-            libsodium-23.dll
+            libsodium-26.dll
             libzmq.dll
             #platform files
             libgcc_s_seh-1.dll
             #openssl files
             libssl-3-x64.dll
             libcrypto-3-x64.dll
+            #icu
+            libicudt74.dll
+            libicuin74.dll
+            libicuio74.dll
+            libicutu74.dll
+            libicuuc74.dll
         )
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            list(APPEND WIN_DEPLOY_DLLS
-                libicudtd73.dll
-                libicuind73.dll
-                libicuiod73.dll
-                libicutud73.dll
-                libicuucd73.dll
-            )
-        else() # assume release
-            list(APPEND WIN_DEPLOY_DLLS
-                libicudt73.dll
-                libicuin73.dll
-                libicuio73.dll
-                libicutu73.dll
-                libicuuc73.dll
-            )
-        endif()
         list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")
         add_custom_command(TARGET deploy
                            POST_BUILD

cmake/VersionGui.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2019, The Monero Project
+# Copyright (c) 2014-2024, The Monero Project
 # 
 # All rights reserved.
 # 

components/CheckBox.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/CheckBox2.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/DaemonManagerDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/DatePicker.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/DevicePassphraseDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/Dialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

components/IconButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/InlineButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/Input.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/InputDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/InputMulti.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/Label.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/LabelButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/LabelSubheader.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/LanguageButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
 //
 // All rights reserved.
 //

components/LanguageSidebar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/LineEdit.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/LineEditMulti.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/MenuBar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/MenuButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/Navbar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2021, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/NavbarItem.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

components/NetworkStatusItem.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/PasswordDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/ProcessingSplash.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/ProgressBar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/QRCodeScanner.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/RadioButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/RemoteNodeDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

components/RemoteNodeEdit.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/RemoteNodeList.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

components/StandardButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/StandardDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/StandardDropdown.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/SuccessfulTxDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/TipItem.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/TitleBar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

components/Tooltip.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

components/TxConfirmationDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/UpdateDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
 //
 // All rights reserved.
 //

components/effects/ColorTransition.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/effects/GradientBackground.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

components/effects/ImageMask.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

installers/windows/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020, The Monero Project
+Copyright (c) 2014-2024, The Monero Project
 
 All rights reserved.
 

installers/windows/Monero.iss

@@ -1,5 +1,5 @@
 ; Monero Fluorine Fermi GUI Wallet Installer for Windows
-; Copyright (c) 2017-2020, The Monero Project
+; Copyright (c) 2017-2024, The Monero Project
 ; See LICENSE
 #define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe")
 

installers/windows/README.md

@@ -1,6 +1,6 @@
 # Monero GUI Wallet Windows Installer #
 
-Copyright (c) 2017-2020, The Monero Project
+Copyright (c) 2017-2024, The Monero Project
 
 ## Introduction ##
 

installers/windows/ReadMe.htm

@@ -6,7 +6,7 @@
 <body style="font-family: Arial, Helvetica, sans-serif">
 <h1>Monero Fluorine Fermi GUI Wallet</h1>
 
-  <p>Copyright (c) 2014-2020, The Monero Project</p>
+  <p>Copyright (c) 2014-2024, The Monero Project</p>
 
 <h2>Preface</h2>
 

js/TxUtils.js

@@ -70,11 +70,14 @@ function checkSignature(signature) {
 }
 
 function isValidOpenAliasAddress(address) {
-    address = address.trim()
+    var regex = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure
-    // we can get an awful lot of valid domains, including non ASCII chars... accept anything
+
-    // there should be something after the .
+    if (!regex.test(address)) {
-    // make sure it is not some kind of floating number
+        return false;
-    return address.length > 2 && isNaN(parseFloat(address)) && address.indexOf('.') >= 0
+    }
+
+    const lastPart = address.substring(address.lastIndexOf('.') + 1);
+    return isNaN(parseInt(lastPart)) || lastPart !== parseInt(lastPart).toString();
 }
 
 function handleOpenAliasResolution(address, descriptionText) {

main.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //
@@ -586,6 +586,9 @@ ApplicationWindow {
     }
 
     function onWalletUpdate() {
+        if (!currentWallet)
+            return;
+
         console.log(">>> wallet updated")
         updateBalance();
         // Update history if new block found since last update

pages/Account.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/AddressBook.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/Advanced.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/History.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/Keys.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/Mining.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/Receive.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/SharedRingDB.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, The Monero Project
+// Copyright (c) 2018-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/Sign.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/Transfer.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/TxKey.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/merchant/MerchantTitlebar.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

pages/settings/Settings.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/settings/SettingsInfo.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/settings/SettingsLayout.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/settings/SettingsLog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/settings/SettingsNode.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

pages/settings/SettingsWallet.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 

qml.qrc

@@ -282,8 +282,9 @@
         <file>images/ledgerNanoSPlus.png</file>
         <file>images/ledgerNanoX.png</file>
         <file>images/ledgerStax.png</file>
-        <file>images/trezor.png</file>
+        <file>images/trezor3.png</file>
-        <file>images/trezor@2x.png</file>
+        <file>images/trezorT.png</file>
+        <file>images/trezorT@2x.png</file>
         <file>qtquickcontrols2.conf</file>
         <file>images/write-down.png</file>
         <file>images/write-down-white.png</file>

src/NetworkType.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/Decoder.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/Decoder.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/QrCodeScanner.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/QrCodeScanner.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/QrScanThread.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/QR-Code-scanner/QrScanThread.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/TranslationManager.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/TranslationManager.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/daemon/DaemonManager.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //
@@ -117,17 +117,8 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
     connect(m_daemon.get(), SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput()));
     connect(m_daemon.get(), SIGNAL(readyReadStandardError()), this, SLOT(printError()));
 
-#if defined(Q_OS_MAC) && defined(__aarch64__)
+    // Start monerod
-    // RandomX crashes with JIT enabled when started as a detached process, disable it for now
+    bool started = m_daemon->startDetached(m_monerod, arguments);
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("MONERO_RANDOMX_UMASK", "8");
-    m_daemon->setProcessEnvironment(env);
-#endif
-
-    m_daemon->setProgram(m_monerod);
-    m_daemon->setArguments(arguments);
-    bool started = m_daemon->startDetached();
-
 
     // add state changed listener
     connect(m_daemon.get(), SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(stateChanged(QProcess::ProcessState)));

src/daemon/DaemonManager.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/libwalletqt/AddressBook.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/libwalletqt/AddressBook.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //

src/libwalletqt/PassphraseHelper.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 //
 // All rights reserved.
 //