diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a0b8511..709ebd05 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,7 +91,7 @@ jobs:
- name: create .tar
run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
working-directory: build/bin
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}
path: build/bin/monero-wallet-gui.tar
@@ -121,7 +121,7 @@ jobs:
run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
- name: test qml
run: xvfb-run -a /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui --test-qml
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}
path: |
@@ -149,7 +149,7 @@ jobs:
run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3'
- name: sha256sum
run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}
path: |
@@ -177,7 +177,7 @@ jobs:
run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android
- name: Remove obsolete docker layers
run: docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi || true
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}
path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
@@ -195,7 +195,7 @@ jobs:
export OUTPUT="$VERSION.tar"
echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
/home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
with:
name: ${{ env.OUTPUT }}
path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e9a100d..55f426cc 100644
--- a/CMakeLists.txt
+++ b/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 "1")
+set(VERSION_REVISION "4")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
option(STATIC "Link libraries statically, requires static Qt")
diff --git a/DEPLOY.md b/DEPLOY.md
index b5b36ff5..1902c8cb 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -2,7 +2,7 @@
Use macOS 10.12 - 10.13 for better backwards compability.
-1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`
+1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf@21 libgcrypt hidapi libusb cmake pkg-config && brew link protobuf@21`
2. Get the latest LTS from here: https://www.qt.io/offline-installers and install
@@ -12,7 +12,7 @@ Use macOS 10.12 - 10.13 for better backwards compability.
```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 ..
+cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=/path/to/Qt5.12.8/5.12.8/clang_64 ..
make
make deploy
```
diff --git a/Dockerfile.android b/Dockerfile.android
index f4fe72bf..d4497f71 100644
--- a/Dockerfile.android
+++ b/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_HASH=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
-RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+ARG ZLIB_VERSION=1.3.1
+ARG ZLIB_HASH=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+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 \
diff --git a/Dockerfile.linux b/Dockerfile.linux
index 5344b1b4..e1c4bdb5 100644
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
ARG THREADS=1
-ARG QT_VERSION=v5.15.12-lts-lgpl
+ARG QT_VERSION=v5.15.14-lts-lgpl
ENV CFLAGS="-fPIC"
ENV CPPFLAGS="-fPIC"
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 3fc3356b..7a4404fa 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,7 +1,7 @@
FROM ubuntu:20.04
ARG THREADS=1
-ARG QT_VERSION=v5.15.12-lts-lgpl
+ARG QT_VERSION=v5.15.14-lts-lgpl
ENV SOURCE_DATE_EPOCH=1397818193
RUN apt update && \
diff --git a/LICENSE b/LICENSE
index 3b764162..f5fccf94 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018, The Monero Project
+Copyright (c) 2014-2024, The Monero Project
All rights reserved.
diff --git a/LeftPanel.qml b/LeftPanel.qml
index 5fc3c2e7..4365f996 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index b6e29994..cd703a16 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/README.md b/README.md
index 6a3047ff..bfcd6a4e 100644
--- a/README.md
+++ b/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)
@@ -60,9 +60,7 @@ The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`
GUI development funding and/or some supporting services are also graciously provided by [sponsors](https://www.getmonero.org/community/sponsorships/):
[](https://tarilabs.com/)
-[](https://globee.com/)
[](https://symas.com/)
-[](http://www.forked.net/)
[](https://www.macstadium.com/)
There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).
@@ -87,7 +85,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 +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.3.1`) to build the release binaries.
+ \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
@@ -130,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.3.1`) to build the release binaries.
+ \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake
index 2d53adf0..852b151f 100644
--- a/cmake/32-bit-toolchain.cmake
+++ b/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.
#
diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake
index 7c56eef9..81e226e3 100644
--- a/cmake/64-bit-toolchain.cmake
+++ b/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.
#
diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake
index e225bf2b..4a554a8f 100644
--- a/cmake/VersionGui.cmake
+++ b/cmake/VersionGui.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2019, The Monero Project
+# Copyright (c) 2014-2024, The Monero Project
#
# All rights reserved.
#
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 121bbab6..d0615e0f 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml
index 08c86e7b..3764b99f 100644
--- a/components/CheckBox2.qml
+++ b/components/CheckBox2.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml
index 1d7dc0eb..683318df 100644
--- a/components/DaemonManagerDialog.qml
+++ b/components/DaemonManagerDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index 1df7d38a..a9eba5f4 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/DevicePassphraseDialog.qml b/components/DevicePassphraseDialog.qml
index 4bbe2fab..75db3988 100644
--- a/components/DevicePassphraseDialog.qml
+++ b/components/DevicePassphraseDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/Dialog.qml b/components/Dialog.qml
index 7853788f..0cd712fa 100644
--- a/components/Dialog.qml
+++ b/components/Dialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/IconButton.qml b/components/IconButton.qml
index 917c5d03..334f0da5 100644
--- a/components/IconButton.qml
+++ b/components/IconButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/InlineButton.qml b/components/InlineButton.qml
index b7d28240..3fd75538 100644
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/Input.qml b/components/Input.qml
index b33a821e..3fb83af1 100644
--- a/components/Input.qml
+++ b/components/Input.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/InputDialog.qml b/components/InputDialog.qml
index 847180af..40e3e445 100644
--- a/components/InputDialog.qml
+++ b/components/InputDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/InputMulti.qml b/components/InputMulti.qml
index 5d530b1d..6f07dd3a 100644
--- a/components/InputMulti.qml
+++ b/components/InputMulti.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/Label.qml b/components/Label.qml
index c4a967ec..22778113 100644
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LabelButton.qml b/components/LabelButton.qml
index eaa51677..b7a40651 100644
--- a/components/LabelButton.qml
+++ b/components/LabelButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml
index 0e93daa4..a7432c5a 100644
--- a/components/LabelSubheader.qml
+++ b/components/LabelSubheader.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LanguageButton.qml b/components/LanguageButton.qml
index adbd0a39..aa33ea85 100644
--- a/components/LanguageButton.qml
+++ b/components/LanguageButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LanguageSidebar.qml b/components/LanguageSidebar.qml
index 8372d474..630d1fb4 100644
--- a/components/LanguageSidebar.qml
+++ b/components/LanguageSidebar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index ae2f0114..0274103d 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index e45b0a9a..d937b6dd 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/MenuBar.qml b/components/MenuBar.qml
index 9ad2a54e..e605f01e 100644
--- a/components/MenuBar.qml
+++ b/components/MenuBar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/MenuButton.qml b/components/MenuButton.qml
index b9916f66..5f6381f3 100644
--- a/components/MenuButton.qml
+++ b/components/MenuButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/Navbar.qml b/components/Navbar.qml
index 3ea7c07a..3383d560 100644
--- a/components/Navbar.qml
+++ b/components/Navbar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2021, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/NavbarItem.qml b/components/NavbarItem.qml
index 5d4cae06..b1a56239 100644
--- a/components/NavbarItem.qml
+++ b/components/NavbarItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml
index 46e9fbd6..c22a4b2d 100644
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index b2c815f3..27978a8c 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index 7cf7a567..469cc1fa 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml
index 57c5a14c..7600d683 100644
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml
index f3dd4a0d..7479c75f 100644
--- a/components/QRCodeScanner.qml
+++ b/components/QRCodeScanner.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/RadioButton.qml b/components/RadioButton.qml
index 02cf2b83..465477bc 100644
--- a/components/RadioButton.qml
+++ b/components/RadioButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/RemoteNodeDialog.qml b/components/RemoteNodeDialog.qml
index a940feef..015f122d 100644
--- a/components/RemoteNodeDialog.qml
+++ b/components/RemoteNodeDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml
index 255f6673..7d68cd2c 100644
--- a/components/RemoteNodeEdit.qml
+++ b/components/RemoteNodeEdit.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/RemoteNodeList.qml b/components/RemoteNodeList.qml
index b46b414a..f1779e0c 100644
--- a/components/RemoteNodeList.qml
+++ b/components/RemoteNodeList.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 00fe0c89..0df44194 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index e2d58bca..6f515f51 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index f4b7a83e..f7bf831b 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/SuccessfulTxDialog.qml b/components/SuccessfulTxDialog.qml
index 3587a116..bd59b7ef 100644
--- a/components/SuccessfulTxDialog.qml
+++ b/components/SuccessfulTxDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/TipItem.qml b/components/TipItem.qml
index 2fe39597..a6223b48 100644
--- a/components/TipItem.qml
+++ b/components/TipItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index b7485465..640641ef 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/Tooltip.qml b/components/Tooltip.qml
index c19d05e2..8903cb53 100644
--- a/components/Tooltip.qml
+++ b/components/Tooltip.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/TxConfirmationDialog.qml b/components/TxConfirmationDialog.qml
index 711aba78..dc55a6f5 100644
--- a/components/TxConfirmationDialog.qml
+++ b/components/TxConfirmationDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/UpdateDialog.qml b/components/UpdateDialog.qml
index a5f4ed97..c3710cf7 100644
--- a/components/UpdateDialog.qml
+++ b/components/UpdateDialog.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/components/effects/ColorTransition.qml b/components/effects/ColorTransition.qml
index b73af906..ebafeb33 100644
--- a/components/effects/ColorTransition.qml
+++ b/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.
//
diff --git a/components/effects/GradientBackground.qml b/components/effects/GradientBackground.qml
index bb106896..608ce815 100644
--- a/components/effects/GradientBackground.qml
+++ b/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.
//
diff --git a/components/effects/ImageMask.qml b/components/effects/ImageMask.qml
index ea6d84c4..0ed8eff2 100644
--- a/components/effects/ImageMask.qml
+++ b/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.
//
diff --git a/images/trezor5.png b/images/trezor5.png
new file mode 100644
index 00000000..32dc0dbe
Binary files /dev/null and b/images/trezor5.png differ
diff --git a/installers/windows/LICENSE b/installers/windows/LICENSE
index 90115524..31a6bdb0 100644
--- a/installers/windows/LICENSE
+++ b/installers/windows/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020, The Monero Project
+Copyright (c) 2014-2024, The Monero Project
All rights reserved.
diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss
index 897805d6..996d1f30 100644
--- a/installers/windows/Monero.iss
+++ b/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")
diff --git a/installers/windows/README.md b/installers/windows/README.md
index b771998a..dbf5431e 100644
--- a/installers/windows/README.md
+++ b/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 ##
diff --git a/installers/windows/ReadMe.htm b/installers/windows/ReadMe.htm
index 6a50797c..7477bd2c 100644
--- a/installers/windows/ReadMe.htm
+++ b/installers/windows/ReadMe.htm
@@ -6,7 +6,7 @@
Monero Fluorine Fermi GUI Wallet
- Copyright (c) 2014-2020, The Monero Project
+ Copyright (c) 2014-2024, The Monero Project
Preface
diff --git a/js/TxUtils.js b/js/TxUtils.js
index 14a7d519..7b028b3e 100644
--- a/js/TxUtils.js
+++ b/js/TxUtils.js
@@ -70,7 +70,7 @@ function checkSignature(signature) {
}
function isValidOpenAliasAddress(address) {
- var regex = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure
+ var regex = /^[A-Za-z0-9-@]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure, allow email-like address
if (!regex.test(address)) {
return false;
diff --git a/js/Wizard.js b/js/Wizard.js
index d47d1684..f1a56ff6 100644
--- a/js/Wizard.js
+++ b/js/Wizard.js
@@ -166,7 +166,7 @@ function getApproximateBlockchainHeight(_date, _nettype){
if(_nettype == "Testnet" || _nettype == "Stagenet"){
// testnet got some huge rollbacks, so the estimation is way off
- var approximateTestnetRolledBackBlocks = _nettype == "Testnet" ? 342100 : 30000;
+ var approximateTestnetRolledBackBlocks = _nettype == "Testnet" ? 342100 : _nettype == "Stagenet" ? 60000 : 30000;
if(approxBlockchainHeight > approximateTestnetRolledBackBlocks)
approxBlockchainHeight -= approximateTestnetRolledBackBlocks
}
diff --git a/main.qml b/main.qml
index 6b21c1f3..98fb43c0 100644
--- a/main.qml
+++ b/main.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/monero b/monero
index 2656cdf5..b089f9ee 160000
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit 2656cdf5056c07684741c4425a051760b97025b0
+Subproject commit b089f9ee69924882c5d14dd1a6991deb05d9d1cd
diff --git a/pages/Account.qml b/pages/Account.qml
index 70c10c88..9bf0fe9c 100644
--- a/pages/Account.qml
+++ b/pages/Account.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index f0fd0f87..396f6bed 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Advanced.qml b/pages/Advanced.qml
index d9c868ae..5cb0d3d8 100644
--- a/pages/Advanced.qml
+++ b/pages/Advanced.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, The Monero Project
+// Copyright (c) 2021-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/History.qml b/pages/History.qml
index 88a2b767..0b907ae0 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Keys.qml b/pages/Keys.qml
index 930277de..99618d90 100644
--- a/pages/Keys.qml
+++ b/pages/Keys.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Mining.qml b/pages/Mining.qml
index e0f220aa..6167b7b7 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Receive.qml b/pages/Receive.qml
index fe655419..9a36a279 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml
index a88bbe14..cfe1e253 100644
--- a/pages/SharedRingDB.qml
+++ b/pages/SharedRingDB.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, The Monero Project
+// Copyright (c) 2018-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Sign.qml b/pages/Sign.qml
index bc037ac2..7fcc1219 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 8f2ce16c..66e0b66b 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index 297716bc..e2808e2a 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/pages/merchant/MerchantTitlebar.qml b/pages/merchant/MerchantTitlebar.qml
index 5f9ebad6..485ff4f1 100644
--- a/pages/merchant/MerchantTitlebar.qml
+++ b/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.
//
diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml
index 09e88e82..f83fd6f6 100644
--- a/pages/settings/Settings.qml
+++ b/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.
//
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index 93f35b23..ad152d63 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/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.
//
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index 38ce823e..c2dfc7e6 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/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.
//
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
index d11201b0..ad75d6a5 100644
--- a/pages/settings/SettingsLog.qml
+++ b/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.
//
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index e0ae009a..28480419 100644
--- a/pages/settings/SettingsNode.qml
+++ b/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.
//
diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
index db1ac495..f43d64e2 100644
--- a/pages/settings/SettingsWallet.qml
+++ b/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.
//
diff --git a/qml.qrc b/qml.qrc
index 9b99f0a8..2159a918 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -284,6 +284,7 @@
images/ledgerNanoX.png
images/ledgerStax.png
images/trezor3.png
+ images/trezor5.png
images/trezorT.png
images/trezorT@2x.png
qtquickcontrols2.conf
diff --git a/src/NetworkType.h b/src/NetworkType.h
index 5af89074..7eda897d 100644
--- a/src/NetworkType.h
+++ b/src/NetworkType.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/QR-Code-scanner/Decoder.cpp b/src/QR-Code-scanner/Decoder.cpp
index 1bb99140..25ef0f04 100644
--- a/src/QR-Code-scanner/Decoder.cpp
+++ b/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.
//
diff --git a/src/QR-Code-scanner/Decoder.h b/src/QR-Code-scanner/Decoder.h
index 9efaca67..b182adae 100644
--- a/src/QR-Code-scanner/Decoder.h
+++ b/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.
//
diff --git a/src/QR-Code-scanner/QrCodeScanner.cpp b/src/QR-Code-scanner/QrCodeScanner.cpp
index 2e8bde9f..c965a547 100644
--- a/src/QR-Code-scanner/QrCodeScanner.cpp
+++ b/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.
//
diff --git a/src/QR-Code-scanner/QrCodeScanner.h b/src/QR-Code-scanner/QrCodeScanner.h
index 10cf7766..ac68ab67 100644
--- a/src/QR-Code-scanner/QrCodeScanner.h
+++ b/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.
//
diff --git a/src/QR-Code-scanner/QrScanThread.cpp b/src/QR-Code-scanner/QrScanThread.cpp
index 6421321e..fb251d51 100644
--- a/src/QR-Code-scanner/QrScanThread.cpp
+++ b/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.
//
diff --git a/src/QR-Code-scanner/QrScanThread.h b/src/QR-Code-scanner/QrScanThread.h
index 7dfffc55..d13f7618 100644
--- a/src/QR-Code-scanner/QrScanThread.h
+++ b/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.
//
diff --git a/src/TranslationManager.cpp b/src/TranslationManager.cpp
index 377ed158..a3f85bac 100644
--- a/src/TranslationManager.cpp
+++ b/src/TranslationManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/TranslationManager.h b/src/TranslationManager.h
index d1c155b5..fbe6635c 100644
--- a/src/TranslationManager.h
+++ b/src/TranslationManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 8dd31157..f1e4ddf9 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/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.
//
diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h
index 119e8582..5945c697 100644
--- a/src/daemon/DaemonManager.h
+++ b/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.
//
diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp
index 4460ef7d..af385c26 100644
--- a/src/libwalletqt/AddressBook.cpp
+++ b/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.
//
diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h
index a7551ac5..501f3d8e 100644
--- a/src/libwalletqt/AddressBook.h
+++ b/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.
//
diff --git a/src/libwalletqt/PassphraseHelper.cpp b/src/libwalletqt/PassphraseHelper.cpp
index 9e851f1b..86428757 100644
--- a/src/libwalletqt/PassphraseHelper.cpp
+++ b/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.
//
diff --git a/src/libwalletqt/PassphraseHelper.h b/src/libwalletqt/PassphraseHelper.h
index 03274992..898d6f5e 100644
--- a/src/libwalletqt/PassphraseHelper.h
+++ b/src/libwalletqt/PassphraseHelper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/PendingTransaction.cpp b/src/libwalletqt/PendingTransaction.cpp
index f1a543d5..72c934ff 100644
--- a/src/libwalletqt/PendingTransaction.cpp
+++ b/src/libwalletqt/PendingTransaction.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index 14786743..08b6a557 100644
--- a/src/libwalletqt/PendingTransaction.h
+++ b/src/libwalletqt/PendingTransaction.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/QRCodeImageProvider.cpp b/src/libwalletqt/QRCodeImageProvider.cpp
index cba43130..eb75dc36 100644
--- a/src/libwalletqt/QRCodeImageProvider.cpp
+++ b/src/libwalletqt/QRCodeImageProvider.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/QRCodeImageProvider.h b/src/libwalletqt/QRCodeImageProvider.h
index 8b9f0397..7e61782e 100644
--- a/src/libwalletqt/QRCodeImageProvider.h
+++ b/src/libwalletqt/QRCodeImageProvider.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/Subaddress.cpp b/src/libwalletqt/Subaddress.cpp
index 9584f1ec..0108215b 100644
--- a/src/libwalletqt/Subaddress.cpp
+++ b/src/libwalletqt/Subaddress.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/Subaddress.h b/src/libwalletqt/Subaddress.h
index 34d9152f..e1001c6b 100644
--- a/src/libwalletqt/Subaddress.h
+++ b/src/libwalletqt/Subaddress.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/SubaddressAccount.cpp b/src/libwalletqt/SubaddressAccount.cpp
index 178a9355..5f757a04 100644
--- a/src/libwalletqt/SubaddressAccount.cpp
+++ b/src/libwalletqt/SubaddressAccount.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/SubaddressAccount.h b/src/libwalletqt/SubaddressAccount.h
index 67aa4d3c..bcaabcea 100644
--- a/src/libwalletqt/SubaddressAccount.h
+++ b/src/libwalletqt/SubaddressAccount.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp
index 754fd55e..764a3178 100644
--- a/src/libwalletqt/TransactionHistory.cpp
+++ b/src/libwalletqt/TransactionHistory.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/TransactionHistory.h b/src/libwalletqt/TransactionHistory.h
index 519f454f..3f6a1eb2 100644
--- a/src/libwalletqt/TransactionHistory.h
+++ b/src/libwalletqt/TransactionHistory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/TransactionInfo.cpp b/src/libwalletqt/TransactionInfo.cpp
index 90025c38..3a14398c 100644
--- a/src/libwalletqt/TransactionInfo.cpp
+++ b/src/libwalletqt/TransactionInfo.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h
index 5501ae37..d6b5a2fd 100644
--- a/src/libwalletqt/TransactionInfo.h
+++ b/src/libwalletqt/TransactionInfo.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/Transfer.h b/src/libwalletqt/Transfer.h
index 703a969a..0cacacdb 100644
--- a/src/libwalletqt/Transfer.h
+++ b/src/libwalletqt/Transfer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/UnsignedTransaction.cpp b/src/libwalletqt/UnsignedTransaction.cpp
index 99b7740d..fcd42563 100644
--- a/src/libwalletqt/UnsignedTransaction.cpp
+++ b/src/libwalletqt/UnsignedTransaction.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/UnsignedTransaction.h b/src/libwalletqt/UnsignedTransaction.h
index f679f9a9..1ce7186b 100644
--- a/src/libwalletqt/UnsignedTransaction.h
+++ b/src/libwalletqt/UnsignedTransaction.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index df21bb9b..cec4ff63 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 11293b85..398d19c6 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/WalletListenerImpl.cpp b/src/libwalletqt/WalletListenerImpl.cpp
index efcfa112..d2ccc244 100644
--- a/src/libwalletqt/WalletListenerImpl.cpp
+++ b/src/libwalletqt/WalletListenerImpl.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/WalletListenerImpl.h b/src/libwalletqt/WalletListenerImpl.h
index 9a134547..46f38fdf 100644
--- a/src/libwalletqt/WalletListenerImpl.h
+++ b/src/libwalletqt/WalletListenerImpl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index 65d108e8..ae03357b 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 84835a9c..e98648c1 100644
--- a/src/libwalletqt/WalletManager.h
+++ b/src/libwalletqt/WalletManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/Logger.cpp b/src/main/Logger.cpp
index 62267eb6..8fa98979 100644
--- a/src/main/Logger.cpp
+++ b/src/main/Logger.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/Logger.h b/src/main/Logger.h
index 6d350ae8..a2f9e91c 100644
--- a/src/main/Logger.h
+++ b/src/main/Logger.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/MainApp.cpp b/src/main/MainApp.cpp
index b1c418ce..de378aa3 100644
--- a/src/main/MainApp.cpp
+++ b/src/main/MainApp.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/MainApp.h b/src/main/MainApp.h
index ec8b7045..2059fa97 100644
--- a/src/main/MainApp.h
+++ b/src/main/MainApp.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/clipboardAdapter.cpp b/src/main/clipboardAdapter.cpp
index b558936a..d3fb3598 100644
--- a/src/main/clipboardAdapter.cpp
+++ b/src/main/clipboardAdapter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/clipboardAdapter.h b/src/main/clipboardAdapter.h
index 0ce168cf..7e268451 100644
--- a/src/main/clipboardAdapter.h
+++ b/src/main/clipboardAdapter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/filter.cpp b/src/main/filter.cpp
index 2384c10c..1f8155a9 100644
--- a/src/main/filter.cpp
+++ b/src/main/filter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/filter.h b/src/main/filter.h
index 24b278ec..5c5bf57a 100644
--- a/src/main/filter.h
+++ b/src/main/filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 743cefff..97c56dd6 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/oscursor.cpp b/src/main/oscursor.cpp
index f5ee3c74..714b1a8f 100644
--- a/src/main/oscursor.cpp
+++ b/src/main/oscursor.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/oscursor.h b/src/main/oscursor.h
index cb84e6fb..09eb08a0 100644
--- a/src/main/oscursor.h
+++ b/src/main/oscursor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/main/oshelper.cpp b/src/main/oshelper.cpp
index 469f3842..f9e33d13 100644
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -70,9 +70,6 @@ namespace
QPixmap screenshot()
{
-#ifdef Q_OS_MAC
- return MacOSHelper::screenshot();
-#else
std::unordered_set hidden;
const QWindowList windows = QGuiApplication::allWindows();
for (QWindow *window : windows)
@@ -91,7 +88,6 @@ QPixmap screenshot()
});
return QGuiApplication::primaryScreen()->grabWindow(0);
-#endif
}
} // namespace
diff --git a/src/main/oshelper.h b/src/main/oshelper.h
index d789471d..4242cc05 100644
--- a/src/main/oshelper.h
+++ b/src/main/oshelper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp
index a155230a..8fdbf9b0 100644
--- a/src/model/AddressBookModel.cpp
+++ b/src/model/AddressBookModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/AddressBookModel.h b/src/model/AddressBookModel.h
index 5347700e..71cbf3cc 100644
--- a/src/model/AddressBookModel.h
+++ b/src/model/AddressBookModel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/SubaddressAccountModel.cpp b/src/model/SubaddressAccountModel.cpp
index e4bce411..f6d18bed 100644
--- a/src/model/SubaddressAccountModel.cpp
+++ b/src/model/SubaddressAccountModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/SubaddressAccountModel.h b/src/model/SubaddressAccountModel.h
index fee22bbf..1b9ff5cd 100644
--- a/src/model/SubaddressAccountModel.h
+++ b/src/model/SubaddressAccountModel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/SubaddressModel.cpp b/src/model/SubaddressModel.cpp
index 7d4c408c..56586b31 100644
--- a/src/model/SubaddressModel.cpp
+++ b/src/model/SubaddressModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/SubaddressModel.h b/src/model/SubaddressModel.h
index abb59734..70183adb 100644
--- a/src/model/SubaddressModel.h
+++ b/src/model/SubaddressModel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp
index d3090d8c..888b7320 100644
--- a/src/model/TransactionHistoryModel.cpp
+++ b/src/model/TransactionHistoryModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/TransactionHistoryModel.h b/src/model/TransactionHistoryModel.h
index 8b3bae86..ac6941e7 100644
--- a/src/model/TransactionHistoryModel.h
+++ b/src/model/TransactionHistoryModel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/TransactionHistorySortFilterModel.cpp b/src/model/TransactionHistorySortFilterModel.cpp
index fd8c095a..bc8d68dc 100644
--- a/src/model/TransactionHistorySortFilterModel.cpp
+++ b/src/model/TransactionHistorySortFilterModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/model/TransactionHistorySortFilterModel.h b/src/model/TransactionHistorySortFilterModel.h
index b804506c..66286c55 100644
--- a/src/model/TransactionHistorySortFilterModel.h
+++ b/src/model/TransactionHistorySortFilterModel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/hash.h b/src/openpgp/hash.h
index 4f69851b..54d78f58 100644
--- a/src/openpgp/hash.h
+++ b/src/openpgp/hash.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/mpi.h b/src/openpgp/mpi.h
index 800bcac5..a0dbf5c8 100644
--- a/src/openpgp/mpi.h
+++ b/src/openpgp/mpi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/openpgp.cpp b/src/openpgp/openpgp.cpp
index fa503015..2f115530 100644
--- a/src/openpgp/openpgp.cpp
+++ b/src/openpgp/openpgp.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/openpgp.h b/src/openpgp/openpgp.h
index 665760a2..069231a2 100644
--- a/src/openpgp/openpgp.h
+++ b/src/openpgp/openpgp.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/packet_stream.h b/src/openpgp/packet_stream.h
index 6a993e92..6a203ee0 100644
--- a/src/openpgp/packet_stream.h
+++ b/src/openpgp/packet_stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/s_expression.h b/src/openpgp/s_expression.h
index b46bf216..c15965b2 100644
--- a/src/openpgp/s_expression.h
+++ b/src/openpgp/s_expression.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/openpgp/serialization.h b/src/openpgp/serialization.h
index fb42c1b6..e7c3f9b3 100644
--- a/src/openpgp/serialization.h
+++ b/src/openpgp/serialization.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp
index 1df5381c..e687f637 100644
--- a/src/p2pool/P2PoolManager.cpp
+++ b/src/p2pool/P2PoolManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -53,21 +53,21 @@ void P2PoolManager::download() {
QString fileName;
QString validHash;
#ifdef Q_OS_WIN
- url = "https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-windows-x64.zip";
- fileName = m_p2poolPath + "/p2pool-v3.10-windows-x64.zip";
- validHash = "2b5a37576ac6e73a6f26a0112d9a51360babef765199fbe06a6bfc513ed45581";
+ url = "https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-windows-x64.zip";
+ fileName = m_p2poolPath + "/p2pool-v4.1-windows-x64.zip";
+ validHash = "a2a6327e2442282fe344d69a5e61ddb6bf66950bffd32c5a99b9cecc62d3a7d6";
#elif defined(Q_OS_LINUX)
- url = "https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-linux-x64.tar.gz";
- fileName = m_p2poolPath + "/p2pool-v3.10-linux-x64.tar.gz";
- validHash = "441969c999e860231b2e48651747866754bad17292331fb22c5340c8a250168a";
+ url = "https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-linux-x64.tar.gz";
+ fileName = m_p2poolPath + "/p2pool-v4.1-linux-x64.tar.gz";
+ validHash = "9d62adcb8426932ff51dae0eb02551b1b88996aa25804a470dc127bef30b4c07";
#elif defined(Q_OS_MACOS_AARCH64)
- url = "https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-macos-aarch64.tar.gz";
- fileName = m_p2poolPath + "/p2pool-v3.10-macos-aarch64.tar.gz";
- validHash = "f8ff6de7b2ac38f0d3ac23e30cc8827d5a1b83c4190f4e79e8db695acc742a68";
+ url = "https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-macos-aarch64.tar.gz";
+ fileName = m_p2poolPath + "/p2pool-v4.1-macos-aarch64.tar.gz";
+ validHash = "3cce06835e50395c986511019c7dabd93855de78c787d518f22e6c6572b44d2e";
#elif defined(Q_OS_MACOS)
- url = "https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-macos-x64.tar.gz";
- fileName = m_p2poolPath + "/p2pool-v3.10-macos-x64.tar.gz";
- validHash = "9b20656556fe4bfe3df1df9a6f2c7c8bc9aa0dd2c4ac66ebca2c8580581ff9f6";
+ url = "https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-macos-x64.tar.gz";
+ fileName = m_p2poolPath + "/p2pool-v4.1-macos-x64.tar.gz";
+ validHash = "e87dfda26388774688da8336a00df3f4befcb98c3ee4b26d496ff05179cce5e7";
#endif
QFile file(fileName);
epee::net_utils::http::http_simple_client http_client;
diff --git a/src/p2pool/P2PoolManager.h b/src/p2pool/P2PoolManager.h
index b813e042..b9eecf0e 100644
--- a/src/p2pool/P2PoolManager.h
+++ b/src/p2pool/P2PoolManager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2022, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/KeysFiles.cpp b/src/qt/KeysFiles.cpp
index 2f10bab9..e2f57d0f 100644
--- a/src/qt/KeysFiles.cpp
+++ b/src/qt/KeysFiles.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/KeysFiles.h b/src/qt/KeysFiles.h
index 610c3c3a..9b4016f1 100644
--- a/src/qt/KeysFiles.h
+++ b/src/qt/KeysFiles.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp
index b70aa994..c46e4cf5 100644
--- a/src/qt/MoneroSettings.cpp
+++ b/src/qt/MoneroSettings.cpp
@@ -4,7 +4,7 @@
** Contact: https://www.qt.io/licensing/
**
****************************************************************************/
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/MoneroSettings.h b/src/qt/MoneroSettings.h
index d5db0885..0ae99b9f 100644
--- a/src/qt/MoneroSettings.h
+++ b/src/qt/MoneroSettings.h
@@ -4,7 +4,7 @@
** Contact: https://www.qt.io/licensing/
**
****************************************************************************/
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/TailsOS.cpp b/src/qt/TailsOS.cpp
index a307d857..1ab15721 100644
--- a/src/qt/TailsOS.cpp
+++ b/src/qt/TailsOS.cpp
@@ -14,7 +14,7 @@ bool TailsOS::detect()
return false;
QByteArray data = fileOpen("/etc/os-release");
- QRegularExpression re("TAILS_PRODUCT_NAME=\"Tails\"");
+ QRegularExpression re("NAME=\"Tails\"");
QRegularExpressionMatch os_match = re.match(data);
bool matched = os_match.hasMatch();
diff --git a/src/qt/downloader.cpp b/src/qt/downloader.cpp
index 25790895..1001f324 100644
--- a/src/qt/downloader.cpp
+++ b/src/qt/downloader.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/downloader.h b/src/qt/downloader.h
index b60eeeae..2bd44547 100644
--- a/src/qt/downloader.h
+++ b/src/qt/downloader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/ipc.cpp b/src/qt/ipc.cpp
index dff7626d..82065729 100644
--- a/src/qt/ipc.cpp
+++ b/src/qt/ipc.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/ipc.h b/src/qt/ipc.h
index a113272d..b4b3581f 100644
--- a/src/qt/ipc.h
+++ b/src/qt/ipc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/macoshelper.h b/src/qt/macoshelper.h
index d3bd27b9..6bb7748d 100644
--- a/src/qt/macoshelper.h
+++ b/src/qt/macoshelper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -38,7 +38,6 @@ class MacOSHelper
public:
static bool isCapsLock();
static bool openFolderAndSelectItem(const QUrl &path);
- static QPixmap screenshot();
static QString bundlePath();
static void disableWindowTabbing();
};
diff --git a/src/qt/macoshelper.mm b/src/qt/macoshelper.mm
index 35e42a32..eb96ef84 100644
--- a/src/qt/macoshelper.mm
+++ b/src/qt/macoshelper.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -68,41 +68,6 @@ bool MacOSHelper::openFolderAndSelectItem(const QUrl &path)
return true;
}
-QPixmap MacOSHelper::screenshot()
-{
- std::unordered_set appWindowIds;
- for (NSWindow *window in [NSApp windows])
- {
- appWindowIds.insert((uintptr_t)[window windowNumber]);
- }
-
- CFArrayRef onScreenWindows = CGWindowListCreate(kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
- const auto onScreenWindowsClenaup = sg::make_scope_guard([&onScreenWindows]() {
- CFRelease(onScreenWindows);
- });
-
- CFMutableArrayRef foreignWindows = CFArrayCreateMutable(NULL, CFArrayGetCount(onScreenWindows), NULL);
- const auto foreignWindowsClenaup = sg::make_scope_guard([&foreignWindows]() {
- CFRelease(foreignWindows);
- });
-
- for (CFIndex index = 0, count = CFArrayGetCount(onScreenWindows); index < count; ++index)
- {
- const uintptr_t windowId = reinterpret_cast(CFArrayGetValueAtIndex(onScreenWindows, index));
- if (appWindowIds.find(windowId) == appWindowIds.end())
- {
- CFArrayAppendValue(foreignWindows, reinterpret_cast(windowId));
- }
- }
-
- CGImageRef image = CGWindowListCreateImageFromArray(CGRectInfinite, foreignWindows, kCGWindowListOptionAll);
- const auto imageClenaup = sg::make_scope_guard([&image]() {
- CFRelease(image);
- });
-
- return QtMac::fromCGImageRef(image);
-}
-
QString MacOSHelper::bundlePath()
{
NSBundle *main = [NSBundle mainBundle];
diff --git a/src/qt/network.cpp b/src/qt/network.cpp
index 93f18300..ba6c94d6 100644
--- a/src/qt/network.cpp
+++ b/src/qt/network.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/network.h b/src/qt/network.h
index f895ed3d..70f17193 100644
--- a/src/qt/network.h
+++ b/src/qt/network.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/updater.cpp b/src/qt/updater.cpp
index 356dbae1..abe217af 100644
--- a/src/qt/updater.cpp
+++ b/src/qt/updater.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/updater.h b/src/qt/updater.h
index e787e42d..3cbb618d 100644
--- a/src/qt/updater.h
+++ b/src/qt/updater.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The Monero Project
+// Copyright (c) 2020-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
index a746166b..a2f0962c 100644
--- a/src/qt/utils.cpp
+++ b/src/qt/utils.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -96,7 +96,7 @@ QString xdgMime(){
"X-GNOME-FullName=Monero-GUI\n"
"Comment=Monero GUI\n"
"Keywords=Monero;\n"
- "Exec=%1 %u\n"
+ "Exec=\"%1\" %u\n"
"Terminal=false\n"
"Type=Application\n"
"Icon=monero\n"
diff --git a/src/qt/utils.h b/src/qt/utils.h
index 31477190..ad3c9ce7 100644
--- a/src/qt/utils.h
+++ b/src/qt/utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/zxcvbn-c/zxcvbn.c b/src/zxcvbn-c/zxcvbn.c
index ef60849c..c4c268b9 100644
--- a/src/zxcvbn-c/zxcvbn.c
+++ b/src/zxcvbn-c/zxcvbn.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/src/zxcvbn-c/zxcvbn.h b/src/zxcvbn-c/zxcvbn.h
index c33929b2..f0fc3c0f 100644
--- a/src/zxcvbn-c/zxcvbn.h
+++ b/src/zxcvbn-c/zxcvbn.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml
index b0efd83d..3c1f3144 100644
--- a/wizard/WizardAskPassword.qml
+++ b/wizard/WizardAskPassword.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 0c5ba3eb..1bc5ca96 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 559437f7..2310ed12 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -58,6 +58,7 @@ Rectangle {
ListElement { column1: "Ledger Stax"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
ListElement { column1: "Trezor Safe 3"; column2: "Trezor";}
+ ListElement { column1: "Trezor Safe 5"; column2: "Trezor";}
}
ColumnLayout {
@@ -169,6 +170,8 @@ Rectangle {
return "qrc:///images/trezorT.png";
} else if (trezorType == "Trezor Safe 3") {
return "qrc:///images/trezor3.png";
+ } else if (trezorType == "Trezor Safe 5") {
+ return "qrc:///images/trezor5.png";
}
} else if (hardwareWalletType == "Ledger") {
if (ledgerType == "Ledger Nano S") {
diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml
index 6b76578d..cff802df 100644
--- a/wizard/WizardCreateWallet1.qml
+++ b/wizard/WizardCreateWallet1.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardCreateWallet2.qml b/wizard/WizardCreateWallet2.qml
index 04c2bf99..a772f7a9 100644
--- a/wizard/WizardCreateWallet2.qml
+++ b/wizard/WizardCreateWallet2.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardCreateWallet3.qml b/wizard/WizardCreateWallet3.qml
index 49b139c0..dfb51f16 100644
--- a/wizard/WizardCreateWallet3.qml
+++ b/wizard/WizardCreateWallet3.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml
index 9f949798..8919b53c 100644
--- a/wizard/WizardCreateWallet4.qml
+++ b/wizard/WizardCreateWallet4.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardCreateWallet5.qml b/wizard/WizardCreateWallet5.qml
index 5089dc70..e6cb9e93 100644
--- a/wizard/WizardCreateWallet5.qml
+++ b/wizard/WizardCreateWallet5.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
index 1693bf7b..bada5da3 100644
--- a/wizard/WizardDaemonSettings.qml
+++ b/wizard/WizardDaemonSettings.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml
index d9753ea8..3febfa49 100644
--- a/wizard/WizardHeader.qml
+++ b/wizard/WizardHeader.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index aec32166..9d65a7f0 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 3f7ce3b9..0c5b980e 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardMenuItem.qml b/wizard/WizardMenuItem.qml
index 54199c5e..5e9964b5 100644
--- a/wizard/WizardMenuItem.qml
+++ b/wizard/WizardMenuItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardModeBootstrap.qml b/wizard/WizardModeBootstrap.qml
index 5b583101..df4d8efb 100644
--- a/wizard/WizardModeBootstrap.qml
+++ b/wizard/WizardModeBootstrap.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardModeRemoteNodeWarning.qml b/wizard/WizardModeRemoteNodeWarning.qml
index be53b168..e7a94773 100644
--- a/wizard/WizardModeRemoteNodeWarning.qml
+++ b/wizard/WizardModeRemoteNodeWarning.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index eb6b36d4..050b440f 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
@@ -149,7 +149,7 @@ Rectangle {
imageIcon: "qrc:///images/local-node-full.png"
onMenuClicked: {
- appWindow.persistentSettings.pruneBlockchain = false; // can be toggled on next page
+ appWindow.persistentSettings.pruneBlockchain = true;
applyWalletMode(2, 'wizardHome');
}
}
diff --git a/wizard/WizardNav.qml b/wizard/WizardNav.qml
index 93be5d62..b5511b3e 100644
--- a/wizard/WizardNav.qml
+++ b/wizard/WizardNav.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml
index 7c96c8a5..991a72d0 100644
--- a/wizard/WizardOpenWallet1.qml
+++ b/wizard/WizardOpenWallet1.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml
index ad75f581..e4fde848 100644
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardRestoreWallet2.qml b/wizard/WizardRestoreWallet2.qml
index 0bb9a0e6..f66950d5 100644
--- a/wizard/WizardRestoreWallet2.qml
+++ b/wizard/WizardRestoreWallet2.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardRestoreWallet3.qml b/wizard/WizardRestoreWallet3.qml
index bf9019b7..fe433a4e 100644
--- a/wizard/WizardRestoreWallet3.qml
+++ b/wizard/WizardRestoreWallet3.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml
index 4d4c9fdb..9f87e77b 100644
--- a/wizard/WizardRestoreWallet4.qml
+++ b/wizard/WizardRestoreWallet4.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardSummary.qml b/wizard/WizardSummary.qml
index a9df4e59..85ee174a 100644
--- a/wizard/WizardSummary.qml
+++ b/wizard/WizardSummary.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardSummaryItem.qml b/wizard/WizardSummaryItem.qml
index de5f527c..d3284b0d 100644
--- a/wizard/WizardSummaryItem.qml
+++ b/wizard/WizardSummaryItem.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//
diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml
index 7eb92cec..882145ab 100644
--- a/wizard/WizardWalletInput.qml
+++ b/wizard/WizardWalletInput.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
//
// All rights reserved.
//