Merge pull request #4507

c285879 build: prepare v0.18.4.3 (selsta)
build: prepare v0.18.4.3
2026-04-01 23:37:25 -04:00 · 2025-10-07 19:19:50 -04:00 · 2025-10-07 23:36:02 +02:00 · 2025-09-28 18:40:11 +00:00 · 2025-09-27 13:06:57 +02:00 · 2025-09-24 20:55:23 +00:00
31 changed files with 424 additions and 285 deletions
--- a/.github/qt_helper.py
+++ b/.github/qt_helper.py
@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-import defusedxml.ElementTree
-import hashlib
-import mmap
-import pathlib
-import subprocess
-import sys
-import urllib.parse
-import urllib.request
-import xml.etree.ElementTree as ET
-
-MAX_TRIES = 32
-
-def fetch_links_to_archives(os, target, major, minor, patch, toolchain):
-  MAX_XML_SIZE = 1024 * 1024 * 1024
-  MIRROR = 'download.qt.io'
-  base_url = f'https://{MIRROR}/online/qtsdkrepository/{os}/{target}/qt{major}_{major}{minor}{patch}'
-  url = f'{base_url}/Updates.xml'
-  for _ in range(MAX_TRIES):
-    try:
-      resp = urllib.request.urlopen(url).read(MAX_XML_SIZE)
-      update_xml = defusedxml.ElementTree.fromstring(resp)
-      break
-    except KeyboardInterrupt:
-      raise
-    except BaseException as e:
-      print('error', e, flush=True)
-  else:
-    return
-  for pkg in update_xml.findall('./PackageUpdate'):
-    name = pkg.find('.//Name')
-    if name == None:
-      continue
-    if name.text != f'qt.qt{major}.{major}{minor}{patch}.{toolchain}':
-      continue
-    version = pkg.find('.//Version')
-    if version == None:
-      continue
-    archives = pkg.find('.//DownloadableArchives')
-    if archives == None or archives.text == None:
-      continue
-    for archive in archives.text.split(', '):
-      url = f'{base_url}/{name.text}/{version.text}{archive}'
-      file_name = pathlib.Path(urllib.parse.urlparse(url).path).name
-      yield {'name': file_name, 'url': url}
-
-def download(links):
-  metalink = ET.Element('metalink', xmlns = "urn:ietf:params:xml:ns:metalink")
-  for link in links:
-    file = ET.SubElement(metalink, 'file', name = link['name'])
-    ET.SubElement(file, 'url').text = link['url']
-  data = ET.tostring(metalink, encoding='UTF-8', xml_declaration=True)
-  for _ in range(MAX_TRIES):
-    with subprocess.Popen([
-      'aria2c',
-      '--connect-timeout=8',
-      '--console-log-level=warn',
-      '--continue',
-      '--follow-metalink=mem',
-      '--max-concurrent-downloads=100',
-      '--max-connection-per-server=16',
-      '--max-file-not-found=100',
-      '--max-tries=100',
-      '--min-split-size=1MB',
-      '--retry-wait=1',
-      '--split=100',
-      '--summary-interval=0',
-      '--timeout=8',
-      '--user-agent=',
-      '--metalink-file=-',
-    ], stdin=subprocess.PIPE) as aria:
-      aria.communicate(data)
-      if aria.wait() == 0:
-        return True
-  return False
-
-def calc_hash_sum(files):
-  obj = hashlib.new('sha256')
-  for path in files:
-    with open(path, 'rb') as f:
-      with mmap.mmap(f.fileno(), 0, mmap.MAP_SHARED, mmap.PROT_READ) as m:
-        file_hash = hashlib.new('sha256', m).digest()
-        obj.update(file_hash)
-  return obj.digest().hex()
-
-def extract_archives(files, out='.', targets=[]):
-  for path in files:
-    if subprocess.Popen(['7z', 'x', '-bd', '-y', '-aoa', f'-o{out}', path] + targets,
-      stdout=subprocess.DEVNULL,
-    ).wait() != 0:
-      return False
-  return True
-
-def main():
-  os, target, version, toolchain, expect = sys.argv[1:]
-  major, minor, patch = version.split('.')
-  links = [*fetch_links_to_archives(os, target, major, minor, patch, toolchain)]
-  print(*[l['url'].encode() for l in links], sep='\n', flush=True)
-  assert download(links)
-  result = calc_hash_sum([l['name'] for l in links])
-  print('result', result, 'expect', expect, flush=True)
-  assert result == expect
-  assert extract_archives([l['name'] for l in links], '.', ['{}.{}.{}'.format(major, minor, patch)])
-  [pathlib.Path(l['name']).unlink() for l in links]
-
-if __name__ == '__main__':
-  main()
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,10 +5,12 @@ on: [push, pull_request]
 env:
  FREE_DISKSPACE: |
    sudo rm -rf /usr/local/.ghcup /usr/share/dotnet /usr/share/swift /usr/share/miniconda
+  QT_TAG: v5.15.17-lts-lgpl
+  QT_PREFIX: ${{ github.workspace }}/qt-install

 jobs:
  build-macos:
-    runs-on: macOS-latest
+    runs-on: macos-latest
    steps:
    - uses: actions/checkout@v1
      with:
@@ -56,7 +58,7 @@ jobs:
    - uses: eine/setup-msys2@v2
      with:
        update: true
-        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-pcre mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
+        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-pcre mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-angleproject
    - name: build
      run: DEV_MODE=ON make release-win64 -j2
    - name: deploy
@@ -66,23 +68,35 @@ jobs:
      run: build/release/bin/monero-wallet-gui --test-qml

  macos-bundle:
-    runs-on: macOS-latest
+    runs-on: macos-15
    steps:
    - uses: actions/checkout@v1
      with:
        submodules: recursive
    - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf pkg-config python3 p7zip aria2
-    - name: install dependencies
-      run: pip3 install defusedxml
-    - name: download qt
-      run: python3 monero-gui/.github/qt_helper.py mac_x64 desktop 5.15.2 clang_64 c384008156fe63cc183bade0316828c598ff3e5074397c0c9ccc588d6cdc5aca
-      working-directory: ../
-    - name: build
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf pkg-config
+    - name: clone qt repo
+      run: git clone -b "${QT_TAG}" --recursive --depth 1 --shallow-submodules https://github.com/qt/qt5
+    - name: build qt from source
+      run: |
+        cd qt5
+        mkdir build && cd build
+        ../configure -prefix "${QT_PREFIX}" -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 -j"$(sysctl -n hw.ncpu)"
+        make install
+        cd ../qttools/src/linguist/lrelease
+        ../../../../build/qtbase/bin/qmake
+        make -j"$(sysctl -n hw.ncpu)"
+        make install
+        cd ../../../../qttools/src/macdeployqt/macdeployqt/
+        ../../../../build/qtbase/bin/qmake
+        make -j"$(sysctl -n hw.ncpu)"
+        make install
+    - name: build monero-gui
      run: |
        mkdir build && cd build
-        cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=/Users/runner/work/monero-gui/5.15.2/clang_64 ..
-        make
+        cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH="${QT_PREFIX}" ..
+        make -j"$(sysctl -n hw.ncpu)"
    - name: deploy
      run: make deploy
      working-directory: build
@@ -91,24 +105,17 @@ 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

  docker-linux-static:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v1
      with:
        submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.11
-      if: "!startsWith(github.ref, 'refs/tags/v')"
-      continue-on-error: true
-      with:
-        key: docker-linux-static-{hash}
-        restore-keys: |
-          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
@@ -121,7 +128,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: |
@@ -129,18 +136,11 @@ jobs:
          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod

  docker-windows-static:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v1
      with:
        submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.11
-      if: "!startsWith(github.ref, 'refs/tags/v')"
-      continue-on-error: true
-      with:
-        key: docker-windows-static-{hash}
-        restore-keys: |
-          docker-windows-static-
    - name: free up diskspace
      run: ${{env.FREE_DISKSPACE}}
    - name: prepare build environment
@@ -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: |
@@ -157,33 +157,24 @@ jobs:
          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe

  docker-android:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v1
      with:
        submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.11
-      if: "!startsWith(github.ref, 'refs/tags/v')"
-      continue-on-error: true
-      with:
-        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
      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

  source-archive:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v1
      with:
@@ -195,7 +186,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 }}
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -72,7 +72,7 @@ jobs:
        platforms: arm64

    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4.1.7
      with:
        name: flatpak-builder-${{ matrix.arch }}

@@ -129,7 +129,7 @@ jobs:
        platforms: arm64

    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4.1.7
      with:
        name: flatpak-builder-${{ matrix.arch }}

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(monero-gui)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")

 set(VERSION_MAJOR "18")
-set(VERSION_MINOR "3")
-set(VERSION_REVISION "4")
+set(VERSION_MINOR "4")
+set(VERSION_REVISION "3")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

 option(STATIC "Link libraries statically, requires static Qt")
@@ -16,6 +16,14 @@ option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON)
 option(WITH_UPDATER "Regularly check for new updates" ON)
 option(DEV_MODE "Checkout latest monero master on build" OFF)

+if(DEV_MODE)
+  # DEV_MODE checks out the monero submodule to master, which requires C++17.
+  set(CMAKE_CXX_STANDARD 17)
+else()
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@@ -60,6 +68,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

 get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
+get_directory_property(Boost_VERSION_STRING DIRECTORY "monero" DEFINITION Boost_VERSION_STRING)

 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
  add_definitions(-DQT_NO_DEBUG)
@@ -356,7 +365,7 @@ if(APPLE)
 endif()

 if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
 endif()

 if(APPLE)
@@ -442,7 +451,7 @@ message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
 message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")

 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_SECURITY_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")

 add_subdirectory(translations)
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -40,9 +40,9 @@ You can check if this step worked by using `codesign -dvvv monero-wallet-gui.app

 3. `hdiutil create -fs HFS+ -srcfolder monero-gui-v0.X.Y.Z -volname monero-wallet-gui monero-gui-mac-x64-v0.X.Y.Z.dmg`

-4. `xcrun altool -t osx --file monero-gui-mac-x64-v0.X.Y.Z.dmg --primary-bundle-id org.monero-project.monero-wallet-gui.dmg --notarize-app --username email@address.org`
+4. `xcrun notarytool submit monero-gui-mac-x64-v0.X.Y.Z.dmg --apple-id email@address.org --team-id XXXXXXXXXX`

-5. `xcrun altool --notarization-info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee -u email@address.org`
+5. `xcrun notarytool info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee --apple-id email@address.org --team-id XXXXXXXXXX`

 6. `xcrun stapler staple -v monero-gui-mac-x64-v0.X.Y.Z.dmg`

--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -1,16 +1,16 @@
-FROM debian:buster
+FROM ubuntu:20.04

 ARG THREADS=1
-ARG ANDROID_NDK_REVISION=21e
-ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9
+ARG ANDROID_NDK_REVISION=23c
+ARG ANDROID_NDK_HASH=e5053c126a47e84726d9f7173a04686a71f9a67a
 ARG ANDROID_SDK_REVISION=7302050_latest
 ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
-ARG QT_VERSION=v5.15.7-lts-lgpl
+ARG QT_VERSION=v5.15.17-lts-lgpl

 WORKDIR /opt/android
 ENV WORKDIR=/opt/android

-ENV ANDROID_NATIVE_API_LEVEL=30
+ENV ANDROID_NATIVE_API_LEVEL=31
 ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
 ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
 ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
@@ -20,6 +20,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
 ENV PATH=${JAVA_HOME}/bin:${PATH}
 ENV PREFIX=${WORKDIR}/prefix
 ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update \
    && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
@@ -32,7 +33,7 @@ RUN PACKAGE_NAME=commandlinetools-linux-${ANDROID_SDK_REVISION}.zip \
    && unzip -q ${PACKAGE_NAME} \
    && rm -f ${PACKAGE_NAME}

-RUN PACKAGE_NAME=android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+RUN PACKAGE_NAME=android-ndk-r${ANDROID_NDK_REVISION}-linux.zip \
    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
    && echo "${ANDROID_NDK_HASH}  ${PACKAGE_NAME}" | sha1sum -c \
    && unzip -q ${PACKAGE_NAME} \
@@ -98,27 +99,25 @@ RUN wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz
    && make -j${THREADS} \
    && make -j${THREADS} install

-ARG BOOST_VERSION=1_74_0
-ARG BOOST_VERSION_DOT=1.74.0
-ARG BOOST_HASH=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
-RUN wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+ARG BOOST_VERSION=1_85_0
+ARG BOOST_VERSION_DOT=1.85.0
+ARG BOOST_HASH=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
+RUN wget -q https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
    && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
    && rm -f boost_${BOOST_VERSION}.tar.bz2 \
    && cd boost_${BOOST_VERSION} \
    && PATH=${HOST_PATH} ./bootstrap.sh --prefix=${PREFIX} \
+    && printf "using clang : arm : ${ANDROID_CLANGPP} :\n<cxxflags>\"-fPIC\"\n<cflags>\"-fPIC\" ;" > user.jam \
    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} ./b2 --build-type=minimal link=static runtime-link=static \
    --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization \
-    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi \
-    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} \
-    cflags='--target=aarch64-linux-android' \
-    cxxflags='--target=aarch64-linux-android' \
-    linkflags='--target=aarch64-linux-android --sysroot=${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm64 ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so -nostdlib++' \
+    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang-arm threading=multi \
+    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} --user-config=user.jam architecture=arm address-model=64 \
    install -j${THREADS} \
    && rm -rf $(pwd)

-ARG OPENSSL_VERSION=1.1.1u
-ARG OPENSSL_HASH=e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6
+ARG OPENSSL_VERSION=1.1.1w
+ARG OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
 RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
    && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
    && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
@@ -133,9 +132,9 @@ RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
    && make -j${THREADS} install \
    && rm -rf $(pwd)

-ARG EXPAT_VERSION=2.4.1
-ARG EXPAT_HASH=2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
-RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-${EXPAT_VERSION}.tar.bz2 && \
+ARG EXPAT_VERSION=2.6.4
+ARG EXPAT_HASH=8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada
+RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-${EXPAT_VERSION}.tar.bz2 && \
    echo "${EXPAT_HASH}  expat-${EXPAT_VERSION}.tar.bz2" | sha256sum -c && \
    tar -xf expat-${EXPAT_VERSION}.tar.bz2 && \
    rm expat-${EXPAT_VERSION}.tar.bz2 && \
@@ -145,8 +144,8 @@ RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-${
    make -j$THREADS install && \
    rm -rf $(pwd)

-ARG UNBOUND_VERSION=1.16.2
-ARG UNBOUND_HASH=2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581
+ARG UNBOUND_VERSION=1.22.0
+ARG UNBOUND_HASH=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
 RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz && \
    echo "${UNBOUND_HASH}  unbound-${UNBOUND_VERSION}.tar.gz" | sha256sum -c && \
    tar -xzf unbound-${UNBOUND_VERSION}.tar.gz && \
@@ -157,8 +156,8 @@ RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.t
    make -j$THREADS install && \
    rm -rf $(pwd)

-ARG ZMQ_VERSION=v4.3.4
-ARG ZMQ_HASH=4097855ddaaa65ed7b5e8cb86d143842a594eebd
+ARG ZMQ_VERSION=v4.3.5
+ARG ZMQ_HASH=622fc6dde99ee172ebaa9c8628d85a7a1995a21d
 RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
    && cd libzmq \
    && git checkout ${ZMQ_HASH} \
@@ -169,8 +168,8 @@ RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
    && make -j${THREADS} install \
    && rm -rf $(pwd)

-ARG SODIUM_VERSION=1.0.18
-ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
+ARG SODIUM_VERSION=1.0.20-RELEASE
+ARG SODIUM_HASH=9511c982fb1d046470a8b42aa36556cdb7da15de
 RUN set -ex \
    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
    && cd libsodium \
@@ -198,23 +197,20 @@ RUN git clone -b libgcrypt-1.10.1 --depth 1 git://git.gnupg.org/libgcrypt.git \
    && make -j${THREADS} install \
    && rm -rf $(pwd)

-RUN git clone -b v3.24.2 --depth 1 https://github.com/Kitware/CMake \
+RUN git clone -b v3.31.4 --depth 1 https://github.com/Kitware/CMake \
    && cd CMake \
-    && git reset --hard 31f835410efeea50acd43512eb9e5646a26ea177 \
+    && git reset --hard 569b821a138a4d3f7f4cc42c0cf5ae5e68d56f96 \
    && PATH=${HOST_PATH} ./bootstrap \
    && PATH=${HOST_PATH} make -j${THREADS} \
    && PATH=${HOST_PATH} make -j${THREADS} install \
    && rm -rf $(pwd)

-RUN GRADLE_VERSION=5.6.4 \
-    && GRADLE_HASH=1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d \
-    && wget -q https\://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip \
-    && echo "${GRADLE_HASH}  gradle-${GRADLE_VERSION}-bin.zip" | sha256sum -c \
-    && GRADLE_LOCAL_PATH=gradle/wrapper/dists/gradle-${GRADLE_VERSION}-bin/bxirm19lnfz6nurbatndyydux \
-    && mkdir -p ${GRADLE_LOCAL_PATH} \
-    && mv gradle-${GRADLE_VERSION}-bin.zip ${GRADLE_LOCAL_PATH}
-
-ENV GRADLE_USER_HOME=${WORKDIR}/gradle
+# Workaround
+ENV NEW_SDK_ROOT=${WORKDIR}/sdk
+RUN mkdir ${NEW_SDK_ROOT} \
+    && cp -r ${ANDROID_SDK_ROOT}/licenses ${NEW_SDK_ROOT} \
+    && cp -r ${ANDROID_SDK_ROOT}/platforms ${NEW_SDK_ROOT} \
+    && cp -r ${ANDROID_SDK_ROOT}/build-tools ${NEW_SDK_ROOT}

 CMD set -ex \
    && cd /monero-gui \
@@ -232,10 +228,12 @@ CMD set -ex \
    -DBoost_USE_STATIC_RUNTIME=ON \
    -DLRELEASE_PATH="${PREFIX}/bin" \
    -DQT_ANDROID_APPLICATION_BINARY="monero-wallet-gui" \
-    -DANDROID_SDK="${ANDROID_SDK_ROOT}" \
+    -DANDROID_SDK="${NEW_SDK_ROOT}" \
    -DWITH_SCANNER=ON \
    -DWITH_DESKTOP_ENTRY=OFF \
    ../../.. \
    && PATH=${HOST_PATH} make generate_translations_header \
+    && sed -i -e "s#../monero/external/randomx/librandomx.a##" src/CMakeFiles/monero-wallet-gui.dir/link.txt \
+    && sed -i -e "s#-lm#-lm ../monero/external/randomx/librandomx.a#" src/CMakeFiles/monero-wallet-gui.dir/link.txt \
    && make -j${THREADS} -C src \
    && make -j${THREADS} apk
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -1,7 +1,7 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04

 ARG THREADS=1
-ARG QT_VERSION=v5.15.14-lts-lgpl
+ARG QT_VERSION=v5.15.17-lts-lgpl

 ENV CFLAGS="-fPIC"
 ENV CPPFLAGS="-fPIC"
@@ -10,7 +10,7 @@ ENV SOURCE_DATE_EPOCH=1397818193

 RUN apt update && \
    apt install -y automake autopoint bison gettext git gperf libgl1-mesa-dev libglib2.0-dev \
-    libpng12-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
+    libpng-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
    pkg-config python wget xutils-dev

 RUN git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
@@ -121,8 +121,8 @@ RUN git clone -b v1.3 --depth 1 https://github.com/madler/zlib && \
    make -j$THREADS install && \
    rm -rf $(pwd)

-RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
-    cd freetype2 && \
+RUN git clone -b VER-2-10-2 --depth 1 https://gitlab.freedesktop.org/freetype/freetype.git && \
+    cd freetype && \
    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
    ./autogen.sh && \
    ./configure --disable-shared --enable-static --with-zlib=no && \
@@ -156,7 +156,7 @@ RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
    make -j$THREADS install && \
    rm -rf $(pwd)

-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz && \
+RUN wget https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && \
    echo "4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847 boost_1_80_0.tar.gz" | sha256sum -c && \
    tar -xzf boost_1_80_0.tar.gz && \
    rm boost_1_80_0.tar.gz && \
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04

 ARG THREADS=1
-ARG QT_VERSION=v5.15.14-lts-lgpl
+ARG QT_VERSION=v5.15.17-lts-lgpl
 ENV SOURCE_DATE_EPOCH=1397818193

 RUN apt update && \
@@ -12,9 +12,9 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
    update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)

-RUN git clone -b v0.18.2.0 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.4.3 --depth 1 https://github.com/monero-project/monero && \
    cd monero && \
-    git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \
+    git reset --hard 7c6e84466a90f6701ebe09ff8f61ea8af3883181 && \
    cp -a contrib/depends / && \
    cd .. && \
    rm -rf monero
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Packaging for your favorite distribution would be a welcome contribution!

 *Note*: Qt 5.9.7 is the minimum version required to build the GUI.

-*Note*: Official GUI releases use monero-wallet-gui from this process alongside the supporting binaries (monerod, etc) from the [CLI deterministic builds](https://github.com/monero-project/monero/blob/master/contrib/gitian/README.md).
+*Note*: Official GUI releases use monero-wallet-gui from this process alongside the supporting binaries (monerod, etc) from the [CLI deterministic builds](https://github.com/monero-project/monero/blob/release-v0.18/contrib/gitian/README.md).

 ### Building Reproducible Windows static binaries with Docker (any OS)

@@ -105,7 +105,7 @@ Packaging for your favorite distribution would be a welcome contribution!
   ```
   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.3`) to build the release binaries.
 3. Prepare build environment
   ```
   cd monero-gui
@@ -128,7 +128,7 @@ Packaging for your favorite distribution would be a welcome contribution!
   ```
   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.3`) to build the release binaries.
 3. Prepare build environment
   ```
   cd monero-gui
@@ -142,8 +142,9 @@ Packaging for your favorite distribution would be a welcome contribution!
   ```
   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
   \* `4` - number of CPU threads to use
-5. Monero GUI Linux static binaries will be placed in  `monero-gui/build/release/bin` directory
-6. (*Optional*) Compare `monero-wallet-gui` SHA-256 hash to the one obtained from a trusted source
+5. Monero GUI Linux static binary will be placed in  `monero-gui/build/release/bin` directory
+6. (*Note*) This process is only for building `monero-wallet-gui`, `monerod` has to be built separately according to the instructions in the `monero` repository.
+7. (*Optional*) Compare `monero-wallet-gui` SHA-256 hash to the one obtained from a trusted source
   ```
   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'shasum -a 256 /monero-gui/build/release/bin/monero-wallet-gui'
   ```
@@ -308,7 +309,7 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 3. Install MSYS2 packages for Monero dependencies; the needed 64-bit packages have `x86_64` in their names

    ```
-    pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-unbound mingw-w64-x86_64-pcre
+    pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-unbound mingw-w64-x86_64-pcre mingw-w64-x86_64-angleproject
    ```

    You find more details about those dependencies in the [Monero documentation](https://github.com/monero-project/monero). Note that that there is no more need to compile Boost from source; like everything else, you can install it now with a MSYS2 package.
--- a/cmake/Deploy.cmake
+++ b/cmake/Deploy.cmake
@@ -26,16 +26,19 @@ if(APPLE OR (WIN32 AND NOT STATIC))
            )
        endif()

-        # libbost_filesyste-mt.dylib has a dependency on libboost_atomic-mt.dylib, maydeployqt does not copy it by itself
-        find_package(Boost COMPONENTS atomic)
-        get_target_property(BOOST_ATOMIC_LIB_PATH Boost::atomic LOCATION)
-        if(EXISTS ${BOOST_ATOMIC_LIB_PATH})
-            add_custom_command(TARGET deploy
-                               POST_BUILD
-                               COMMAND ${CMAKE_COMMAND} -E copy "${BOOST_ATOMIC_LIB_PATH}" "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/"
-                               COMMENT "Copying libboost_atomic-mt.dylib"
-            )
-        endif()
+        # Copy Boost dylibs that macdeployqt doesn't pick up
+        find_package(Boost QUIET COMPONENTS atomic container date_time)
+        set(_boost_extras Boost::atomic Boost::container Boost::date_time)
+        foreach(_tgt IN LISTS _boost_extras)
+            if(TARGET ${_tgt})
+                add_custom_command(TARGET deploy POST_BUILD
+                                   COMMAND ${CMAKE_COMMAND} -E copy
+                                   "$<TARGET_FILE:${_tgt}>"
+                                   "$<TARGET_FILE_DIR:monero-wallet-gui>/../Frameworks/"
+                                   COMMENT "Copying $<TARGET_FILE_NAME:${_tgt}>"
+                )
+            endif()
+        endforeach()

        # Apple Silicon requires all binaries to be codesigned
        find_program(CODESIGN_EXECUTABLE NAMES codesign)
@@ -58,7 +61,6 @@ if(APPLE OR (WIN32 AND NOT STATIC))
            libboost_filesystem-mt.dll
            libboost_locale-mt.dll
            libboost_program_options-mt.dll
-            libboost_regex-mt.dll
            libboost_serialization-mt.dll
            libboost_thread-mt.dll
            libprotobuf.dll
@@ -97,12 +99,18 @@ if(APPLE OR (WIN32 AND NOT STATIC))
            libssl-3-x64.dll
            libcrypto-3-x64.dll
            #icu
-            libicudt74.dll
-            libicuin74.dll
-            libicuio74.dll
-            libicutu74.dll
-            libicuuc74.dll
+            libicudt77.dll
+            libicuin77.dll
+            libicuio77.dll
+            libicutu77.dll
+            libicuuc77.dll
        )
+
+        # Boost Regex is header-only since 1.77
+        if (Boost_VERSION_STRING VERSION_LESS 1.77.0)
+            list(APPEND WIN_DEPLOY_DLLS libboost_regex-mt.dll)
+        endif()
+
        list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")
        add_custom_command(TARGET deploy
                           POST_BUILD
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -50,6 +50,7 @@ Item {
    property bool passwordDialogMode
    property bool passphraseDialogMode
    property bool newPasswordDialogMode
+    property bool backgroundSyncing

    // same signals as Dialog has
    signal accepted()
@@ -77,10 +78,11 @@ Item {
        appWindow.updateBalance();
    }

-    function open(walletName, errorText, okButtonText, okButtonIcon) {
+    function open(walletName, errorText, okButtonText, okButtonIcon, backgroundSyncOn) {
        passwordDialogMode = true;
        passphraseDialogMode = false;
        newPasswordDialogMode = false;
+        backgroundSyncing = backgroundSyncOn || false;
        root.okButtonText = okButtonText;
        root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
        _openInit(walletName, errorText);
@@ -90,6 +92,7 @@ Item {
        passwordDialogMode = false;
        passphraseDialogMode = true;
        newPasswordDialogMode = false;
+        backgroundSyncing = false;
        _openInit("", "");
    }

@@ -97,6 +100,7 @@ Item {
        passwordDialogMode = false;
        passphraseDialogMode = false;
        newPasswordDialogMode = true;
+        backgroundSyncing = false;
        _openInit("", "");
    }

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

            MoneroComponents.LineEdit {
@@ -300,6 +304,18 @@ Item {
                    onClicked: onOk()
                }
            }
+
+            Label {
+                visible: backgroundSyncing
+                text: qsTr("Syncing in the background...") + translationManager.emptyString;
+                Layout.fillWidth: true
+
+                font.pixelSize: 14
+                font.family: MoneroComponents.Style.fontLight.name
+                font.italic: true
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
        }
    }
 }
--- a/images/ledgerFlex.png
+++ b/images/ledgerFlex.png
--- a/installers/windows/Deterministic.md
+++ b/installers/windows/Deterministic.md
@@ -23,7 +23,7 @@ You would think timestamp preservation is no problem when unpacking the zip arch

 In any case, after unpacking, check the file dates in the `bin` directory where the installer script looks for them with the dates of the files in the zip file: They must be identical.

-Note that the the following line in `Monero.iss` is also important regarding file timestamps:
+Note that the following line in `Monero.iss` is also important regarding file timestamps:

    TimeStampsInUTC=yes

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

--- a/lang/flags/esperanto.png
+++ b/lang/flags/esperanto.png
--- a/lang/languages.xml
+++ b/lang/languages.xml
@@ -22,7 +22,7 @@ Lojban
        <!-- <language display_name="English (ZA)" locale="en_SA" wallet_language="English" flag="/lang/flags/za.png" qs="none"/> -->
        <!-- <language display_name="العربية (PS)" locale="ar_PS" wallet_language="English" flag="/lang/flags/ps.png" qs="none"/> -->
        <language display_name="Deutsch" locale="de_DE" wallet_language="Deutsch" flag="/lang/flags/de.png" qs="none"/>
-        <language display_name="Esperanto" locale="eo" wallet_language="Esperanto" flag="/lang/flags/esperanto.png" qs="none"/>
+        <language display_name="Esperanto" locale="eo_EO" wallet_language="Esperanto" flag="/lang/flags/eo.png" qs="none"/>
        <language display_name="Español" locale="es_ES" wallet_language="Español" flag="/lang/flags/es.png" qs="none"/>
        <language display_name="Français" locale="fr_FR" wallet_language="Français" flag="/lang/flags/fr.png" qs="none"/>
        <language display_name="Svenska" locale="sv_SE" wallet_language="English" flag="/lang/flags/se.png" qs="none"/>
--- a/main.qml
+++ b/main.qml
@@ -94,11 +94,12 @@ ApplicationWindow {
    readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype)
    property string currentDaemonAddress;
    property int disconnectedEpoch: 0
-    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 55 : 150 // GB
+    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 100 : 225 // GB
    property alias viewState: rootItem.state
    property string prevSplashText;
    property bool splashDisplayedBeforeButtonRequest;
    property bool themeTransition: false
+    property int backgroundSyncType: Wallet.BackgroundSync_Off;

    // fiat price conversion
    property real fiatPrice: 0
@@ -133,6 +134,12 @@ ApplicationWindow {
    }

    function lock() {
+        if (currentWallet && currentWallet.getBackgroundSyncType() != Wallet.BackgroundSync_Off) {
+            appWindow.showProcessingSplash(qsTr("Locking..."));
+            currentWallet.startBackgroundSync()
+            return;
+        }
+
        passwordDialog.onRejectedCallback = function() { appWindow.showWizard(); }
        passwordDialog.onAcceptedCallback = function() {
            if(walletPassword === passwordDialog.password)
@@ -288,6 +295,9 @@ ApplicationWindow {
        currentWallet.heightRefreshed.disconnect(onHeightRefreshed);
        currentWallet.refreshed.disconnect(onWalletRefresh)
        currentWallet.updated.disconnect(onWalletUpdate)
+        currentWallet.backgroundSyncSetup.disconnect(onBackgroundSyncSetup)
+        currentWallet.backgroundSyncStarted.disconnect(onBackgroundSyncStarted)
+        currentWallet.backgroundSyncStopped.disconnect(onBackgroundSyncStopped)
        currentWallet.newBlock.disconnect(onWalletNewBlock)
        currentWallet.moneySpent.disconnect(onWalletMoneySent)
        currentWallet.moneyReceived.disconnect(onWalletMoneyReceived)
@@ -324,6 +334,7 @@ ApplicationWindow {
        walletName = usefulName(wallet.path)

        viewOnly = currentWallet.viewOnly;
+        backgroundSyncType = currentWallet.getBackgroundSyncType();

        // New wallets saves the testnet flag in keys file.
        if(persistentSettings.nettype != currentWallet.nettype) {
@@ -335,6 +346,9 @@ ApplicationWindow {
        currentWallet.heightRefreshed.connect(onHeightRefreshed);
        currentWallet.refreshed.connect(onWalletRefresh)
        currentWallet.updated.connect(onWalletUpdate)
+        currentWallet.backgroundSyncSetup.connect(onBackgroundSyncSetup)
+        currentWallet.backgroundSyncStarted.connect(onBackgroundSyncStarted)
+        currentWallet.backgroundSyncStopped.connect(onBackgroundSyncStopped)
        currentWallet.newBlock.connect(onWalletNewBlock)
        currentWallet.moneySpent.connect(onWalletMoneySent)
        currentWallet.moneyReceived.connect(onWalletMoneyReceived)
@@ -544,6 +558,15 @@ ApplicationWindow {
            }
        }

+        // Don't allow opening background wallets in the GUI
+        if (wallet.isBackgroundWallet()) {
+            passwordDialog.onCancel();
+            appWindow.showStatusMessage(qsTr("Can't open background wallets in the GUI"),6);
+            console.log("closing background wallet");
+            closeWallet();
+            return;
+        }
+
        // wallet opened successfully, subscribing for wallet updates
        connectWallet(wallet)

@@ -585,16 +608,17 @@ ApplicationWindow {
        devicePassphraseDialog.open(on_device)
    }

-    function onWalletUpdate() {
+    function onWalletUpdate(stoppedBackgroundSync) {
        if (!currentWallet)
            return;

        console.log(">>> wallet updated")
        updateBalance();
-        // Update history if new block found since last update
-        if(foundNewBlock) {
+        // Update history if new block found since last update or background sync was just stopped
+        if(foundNewBlock || stoppedBackgroundSync) {
+            if (foundNewBlock)
+                console.log("New block found - updating history")
            foundNewBlock = false;
-            console.log("New block found - updating history")
            currentWallet.history.refresh(currentWallet.currentSubaddressAccount)

            if(middlePanel.state == "History")
@@ -602,6 +626,61 @@ ApplicationWindow {
        }
    }

+    function onBackgroundSyncSetup() {
+        console.log(">>> background sync setup");
+        hideProcessingSplash();
+        if (currentWallet.status !== Wallet.Status_Ok) {
+            console.error("Error setting up background sync: ", currentWallet.errorString);
+            appWindow.showStatusMessage(currentWallet.errorString, 5);
+            return;
+        }
+        appWindow.backgroundSyncType = currentWallet.getBackgroundSyncType();
+    }
+
+    function onBackgroundSyncStarted() {
+        console.log(">>> background sync started");
+        hideProcessingSplash();
+        var started = currentWallet.status === Wallet.Status_Ok;
+        if (!started) {
+            console.error("Error starting background sync: ", currentWallet.errorString);
+            appWindow.showStatusMessage(currentWallet.errorString, 5);
+        }
+
+        passwordDialog.onRejectedCallback = function() { appWindow.showWizard(); }
+        passwordDialog.onAcceptedCallback = function() {
+            if(walletPassword === passwordDialog.password) {
+                if (currentWallet && started) {
+                    appWindow.showProcessingSplash(qsTr("Unlocking..."));
+                    currentWallet.stopBackgroundSync(walletPassword);
+                } else {
+                    passwordDialog.close();
+                }
+            } else {
+                passwordDialog.showError(qsTr("Wrong password") + translationManager.emptyString);
+            }
+        }
+        passwordDialog.open(usefulName(persistentSettings.wallet_path), "", "", "", started);
+    }
+
+    function onBackgroundSyncStopped() {
+        console.log(">>> background sync stopped");
+        var stopped = currentWallet.status === Wallet.Status_Ok;
+        if (!stopped) {
+            hideProcessingSplash();
+            console.error("Error stopping background sync: ", currentWallet.errorString);
+
+            // If there is an error stopping background sync, the spend key
+            // won't be loaded and the wallet will be in a broken state. Don't
+            // let the user continue normal wallet operations in this state.
+            passwordDialog.showError(qsTr("Error stopping background sync: ") + currentWallet.errorString);
+            return;
+        }
+
+        onWalletUpdate(stopped);
+        hideProcessingSplash();
+        passwordDialog.close();
+    }
+
    function connectRemoteNode() {
        console.log("connecting remote node");

@@ -2258,6 +2337,20 @@ ApplicationWindow {
        var inactivity = Utils.epoch() - appWindow.userLastActive;
        if(inactivity < (persistentSettings.lockOnUserInActivityInterval * 60)) return;

+        if (inputDialogVisible) inputDialog.close()
+        remoteNodeDialog.close();
+        informationPopup.close()
+        txConfirmationPopup.close()
+        txConfirmationPopup.clearFields()
+        txConfirmationPopup.rejected()
+        successfulTxPopup.close();
+
+        if (currentWallet && currentWallet.getBackgroundSyncType() != Wallet.BackgroundSync_Off) {
+            appWindow.showProcessingSplash(qsTr("Locking..."));
+            currentWallet.startBackgroundSync()
+            return;
+        }
+
        passwordDialog.onAcceptedCallback = function() {
            if(walletPassword === passwordDialog.password){
                passwordDialog.close();
@@ -2270,13 +2363,6 @@ ApplicationWindow {
        }

        passwordDialog.onRejectedCallback = function() { appWindow.showWizard(); }
-        if (inputDialogVisible) inputDialog.close()
-        remoteNodeDialog.close();
-        informationPopup.close()
-        txConfirmationPopup.close()
-        txConfirmationPopup.clearFields()
-        txConfirmationPopup.rejected()
-        successfulTxPopup.close();
        passwordDialog.open();
    }

--- a/2
+++ b/2
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -1447,7 +1447,6 @@ Rectangle {
        var txs = [];
        for (var i = 0; i < root.txData.length; i++){
            var item = root.txData[i];
-            var matched = "";

            // daterange filtering
            if(item.timestamp < fromDate || item.timestamp > toDate){
@@ -1543,6 +1542,7 @@ Rectangle {
    function updateTransactionsFromModel() {
        // This function copies the items of `appWindow.currentWallet.historyModel` to `root.txModelData`, as a list of javascript objects
        if(currentWallet == null || typeof currentWallet.history === "undefined" ) return;
+        if(currentWallet.isBackgroundSyncing()) return;

        var _model = root.model;
        var total = 0
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -384,6 +384,7 @@ Rectangle {

                ListElement { column1: qsTr("Mini") ; column2: ""; priority: 0}
                ListElement { column1: qsTr("Main") ; column2: ""; priority: 1}
+                ListElement { column1: qsTr("Nano") ; column2: ""; priority: 2}
            }

            ColumnLayout {
@@ -400,7 +401,7 @@ Rectangle {

                MoneroComponents.Tooltip {
                    id: chainsHelpTooltip
-                    text: qsTr("Use the mini chain if you have a low hashrate.") + translationManager.emptyString
+                    text: qsTr("Use the mini or nano chains if you have a low hashrate.") + translationManager.emptyString
                }

                MouseArea {
@@ -448,26 +449,43 @@ Rectangle {
                    id: flagsHelpTooltip
                    text: "
                    Usage:<br>
-                        --wallet             Wallet address to mine to. Subaddresses and integrated addresses are not supported!<br>
-                        --host               IP address of your Monero node, default is 127.0.0.1<br>
-                        --rpc-port           monerod RPC API port number, default is 18081<br>
-                        --zmq-port           monerod ZMQ pub port number, default is 18083 (same port as in monerod\'s \"--zmq-pub\" command line parameter)<br>
-                        --stratum            Comma-separated list of IP:port for stratum server to listen on<br>
-                        --p2p                Comma-separated list of IP:port for p2p server to listen on<br>
-                        --addpeers           Comma-separated list of IP:port of other p2pool nodes to connect to<br>
-                        --light-mode         Don't allocate RandomX dataset, saves 2GB of RAM<br>
-                        --loglevel           Verbosity of the log, integer number between 0 and 6<br>
-                        --config             Name of the p2pool config file<br>
-                        --data-api           Path to the p2pool JSON data (use it in tandem with an external web-server)<br>
-                        --local-api          Enable /local/ path in api path for Stratum Server and built-in miner statistics<br>
-                        --stratum-api        An alias for --local-api<br>
-                        --no-cache           Disable p2pool.cache<br>
-                        --no-color           Disable colors in console output<br>
-                        --no-randomx         Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes<br>
-                        --out-peers N        Maximum number of outgoing connections for p2p server (any value between 10 and 1000)<br>
-                        --in-peers N         Maximum number of incoming connections for p2p server (any value between 10 and 1000)<br>
-                        --start-mining N     Start built-in miner using N threads (any value between 1 and 64)<br>
-                        --help               Show this help message
+                        --wallet              Wallet address to mine to. Subaddresses and integrated addresses are not supported!<br>
+                        --host                IP address of your Monero node, default is 127.0.0.1<br>
+                        --rpc-port            monerod RPC API port number, default is 18081<br>
+                        --zmq-port            monerod ZMQ pub port number, default is 18083 (same port as in monerod\'s \"--zmq-pub\" command line parameter)<br>
+                        --stratum             Comma-separated list of IP:port for stratum server to listen on<br>
+                        --p2p                 Comma-separated list of IP:port for p2p server to listen on<br>
+                        --addpeers            Comma-separated list of IP:port of other p2pool nodes to connect to<br>
+                        --stratum-ban-time N  Number of seconds to ban misbehaving stratum client, default is 600<br>
+                        --light-mode          Don't allocate RandomX dataset, saves 2GB of RAM<br>
+                        --loglevel            Verbosity of the log, integer number between 0 and 6<br>
+                        --data-dir            Path to store general p2pool files (log, cache, peer data, etc.), default is current directory<br>
+                        --sidechain-config    Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)<br>
+                        --data-api            Path to the p2pool JSON data (use it in tandem with an external web-server)<br>
+                        --local-api           Enable /local/ path in api path for Stratum Server and built-in miner statistics<br>
+                        --stratum-api         An alias for --local-api<br>
+                        --no-cache            Disable p2pool.cache<br>
+                        --no-color            Disable colors in console output<br>
+                        --no-randomx          Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes<br>
+                        --out-peers N         Maximum number of outgoing connections for p2p server (any value between 10 and 1000)<br>
+                        --in-peers N          Maximum number of incoming connections for p2p server (any value between 10 and 1000)<br>
+                        --start-mining N      Start built-in miner using N threads (any value between 1 and 64)<br>
+                        --no-autodiff         Disable automatic difficulty adjustment for miners connected to stratum (WARNING: incompatible with Nicehash and MRR)<br>
+                        --rpc-login           Specify username[:password] required for Monero RPC server<br>
+                        --socks5              Specify IP:port of a SOCKS5 proxy to use for outgoing connections<br>
+                        --no-dns              Disable DNS queries, use only IP addresses to connect to peers (seed node DNS will be unavailable too)<br>
+                        --p2p-external-port   Port number that your router uses for mapping to your local p2p port. Use it if you are behind a NAT and still want to accept incoming connections<br>
+                        --no-upnp             Disable UPnP port forwarding<br>
+                        --no-igd              An alias for --no-upnp<br>
+                        --upnp-stratum        Port forward Stratum port (it's not forwarded by default)<br>
+                        --merge-mine          IP:port and wallet address for another blockchain to merge mine with<br>
+                        --version             Print p2pool's version and build details<br>
+                        --tls-cert file       Load TLS certificate chain from \"file\" in the PEM format<br>
+                        --tls-cert-key file   Load TLS certificate private key from \"file\" in the PEM format<br>
+                        --rpc-ssl             Enable SSL on RPC connections to the Monero node<br>
+                        --rpc-ssl-fingerprint base64-encoded fingerprint of the Monero node's certificate (optional, use it for certificate pinning)<br>
+                        --no-stratum-http     Disable HTTP on Stratum ports<br>
+                        --help                Show this help message
                    "
                }

@@ -630,6 +648,9 @@ allArgs = allArgs.filter( ( el ) => !defaultArgs.includes( el.split(" ")[0] ) )
        if (chainDropdown.currentIndex === 1) {
            chain = "main"
        }
+        if (chainDropdown.currentIndex === 2) {
+            chain = "nano"
+        }
        var p2poolArgs = persistentSettings.p2poolFlags;
        var success = p2poolManager.start(p2poolArgs, address, chain, threads);
        if (success) 
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -31,6 +31,8 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2

+import moneroComponents.Wallet 1.0
+
 import "../../js/Utils.js" as Utils
 import "../../js/Windows.js" as Windows
 import "../../components" as MoneroComponents
@@ -155,6 +157,28 @@ Rectangle {
            onMoved: persistentSettings.lockOnUserInActivityInterval = value
        }

+        MoneroComponents.CheckBox {
+            id: backgroundSyncCheckbox
+            visible: !!currentWallet && !currentWallet.isHwBacked() && !appWindow.viewOnly
+            checked: appWindow.backgroundSyncType != Wallet.BackgroundSync_Off
+            text: qsTr("Sync in the background when locked") + translationManager.emptyString
+            toggleOnClick: false
+            onClicked: {
+                if (currentWallet && appWindow) {
+                    appWindow.showProcessingSplash(qsTr("Updating settings..."))
+
+                    // TODO: add support for custom background password option
+                    var newBackgroundSyncType = Wallet.BackgroundSync_Off
+                    if (currentWallet.getBackgroundSyncType() === Wallet.BackgroundSync_Off)
+                        newBackgroundSyncType = Wallet.BackgroundSync_ReusePassword
+
+                    // TODO: don't keep the wallet password in memory on the appWindow
+                    // https://github.com/monero-project/monero-gui/issues/1537#issuecomment-410055329
+                    currentWallet.setupBackgroundSync(newBackgroundSyncType, appWindow.walletPassword)
+                }
+            }
+        }
+
        MoneroComponents.CheckBox {
            checked: persistentSettings.askStopLocalNode
            onClicked: persistentSettings.askStopLocalNode = !persistentSettings.askStopLocalNode
--- a/qml.qrc
+++ b/qml.qrc
@@ -64,7 +64,7 @@
        <file>lang/flags/cz.png</file>
        <file>lang/flags/dk.png</file>
        <file>lang/flags/eg.png</file>
-        <file>lang/flags/esperanto.png</file>
+        <file>lang/flags/eo.png</file>
        <file>lang/flags/fi.png</file>
        <file>lang/flags/fr.png</file>
        <file>lang/flags/de.png</file>
@@ -282,6 +282,7 @@
        <file>images/ledgerNanoSPlus.png</file>
        <file>images/ledgerNanoX.png</file>
        <file>images/ledgerStax.png</file>
+        <file>images/ledgerFlex.png</file>
        <file>images/trezor3.png</file>
        <file>images/trezor5.png</file>
        <file>images/trezorT.png</file>
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -529,6 +529,69 @@ bool Wallet::scanTransactions(const QVector<QString> &txids)
    return m_walletImpl->scanTransactions(c);
 }

+void Wallet::setupBackgroundSync(const Wallet::BackgroundSyncType background_sync_type, const QString &wallet_password)
+{
+    qDebug() << "Setting up background sync";
+    bool refreshEnabled = m_refreshEnabled;
+    pauseRefresh();
+
+    // run inside scheduler because of lag when stopping/starting refresh
+    m_scheduler.run([this, refreshEnabled, background_sync_type, &wallet_password] {
+        m_walletImpl->setupBackgroundSync(
+            static_cast<Monero::Wallet::BackgroundSyncType>(background_sync_type),
+            wallet_password.toStdString(),
+            Monero::optional<std::string>());
+        if (refreshEnabled)
+            startRefresh();
+        emit backgroundSyncSetup();
+    });
+}
+
+Wallet::BackgroundSyncType Wallet::getBackgroundSyncType() const
+{
+    return static_cast<BackgroundSyncType>(m_walletImpl->getBackgroundSyncType());
+}
+
+bool Wallet::isBackgroundWallet() const
+{
+    return m_walletImpl->isBackgroundWallet();
+}
+
+bool Wallet::isBackgroundSyncing() const
+{
+    return m_walletImpl->isBackgroundSyncing();
+}
+
+void Wallet::startBackgroundSync()
+{
+    qDebug() << "Starting background sync";
+    bool refreshEnabled = m_refreshEnabled;
+    pauseRefresh();
+
+    // run inside scheduler because of lag when stopping/starting refresh
+    m_scheduler.run([this, refreshEnabled] {
+        m_walletImpl->startBackgroundSync();
+        if (refreshEnabled)
+            startRefresh();
+        emit backgroundSyncStarted();
+    });
+}
+
+void Wallet::stopBackgroundSync(const QString &password)
+{
+    qDebug() << "Stopping background sync";
+    bool refreshEnabled = m_refreshEnabled;
+    pauseRefresh();
+
+    // run inside scheduler because of lag when stopping/starting refresh
+    m_scheduler.run([this, password, refreshEnabled] {
+        m_walletImpl->stopBackgroundSync(password.toStdString());
+        if (refreshEnabled)
+            startRefresh();
+        emit backgroundSyncStopped();
+    });
+}
+
 bool Wallet::refresh(bool historyAndSubaddresses /* = true */)
 {
    refreshingSet(true);
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -112,6 +112,14 @@ public:

    Q_ENUM(ConnectionStatus)

+    enum BackgroundSyncType {
+        BackgroundSync_Off            = Monero::Wallet::BackgroundSync_Off,
+        BackgroundSync_ReusePassword  = Monero::Wallet::BackgroundSync_ReusePassword,
+        BackgroundSync_CustomPassword = Monero::Wallet::BackgroundSync_CustomPassword
+    };
+
+    Q_ENUM(BackgroundSyncType)
+
    //! returns mnemonic seed
    QString getSeed() const;

@@ -215,6 +223,17 @@ public:
    //! scan transactions
    Q_INVOKABLE bool scanTransactions(const QVector<QString> &txids);

+    Q_INVOKABLE void setupBackgroundSync(const BackgroundSyncType background_sync_type, const QString &wallet_password);
+    Q_INVOKABLE BackgroundSyncType getBackgroundSyncType() const;
+    Q_INVOKABLE bool isBackgroundWallet() const;
+    Q_INVOKABLE bool isBackgroundSyncing() const;
+
+    //! scan in the background with just the view key (wipe the spend key)
+    Q_INVOKABLE void startBackgroundSync();
+
+    //! bring the spend key back and process background synced txs
+    Q_INVOKABLE void stopBackgroundSync(const QString &password);
+
    //! refreshes the wallet
    Q_INVOKABLE bool refresh(bool historyAndSubaddresses = true);

@@ -369,6 +388,9 @@ signals:
    void moneyReceived(const QString &txId, quint64 amount);
    void unconfirmedMoneyReceived(const QString &txId, quint64 amount);
    void newBlock(quint64 height, quint64 targetHeight);
+    void backgroundSyncSetup() const;
+    void backgroundSyncStarted() const;
+    void backgroundSyncStopped() const;
    void addressBookChanged() const;
    void historyModelChanged() const;
    void walletCreationHeightChanged();
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -303,7 +303,7 @@ std::pair<quint8, QString> OSHelper::getNetworkTypeAndAddressFromFile(const QStr
            address = _address;
            if(address.startsWith("5") || address.startsWith("7")){
                networkType = NetworkType::STAGENET;
-            } else if(address.startsWith("9") || address.startsWith("B")){
+            } else if(address.startsWith("9") || address.startsWith("A")){
                networkType = NetworkType::TESTNET;
            }
        }
--- a/src/p2pool/P2PoolManager.cpp
+++ b/src/p2pool/P2PoolManager.cpp
@@ -53,21 +53,21 @@ void P2PoolManager::download() {
        QString fileName;
        QString validHash;
        #ifdef Q_OS_WIN
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-windows-x64.zip";
-            fileName = m_p2poolPath + "/p2pool-v4.1-windows-x64.zip";
-            validHash = "a2a6327e2442282fe344d69a5e61ddb6bf66950bffd32c5a99b9cecc62d3a7d6";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-windows-x64.zip";
+            fileName = m_p2poolPath + "/p2pool-v4.11-windows-x64.zip";
+            validHash = "7b3851f4a74e3729e17a0601c9bde77bcf849e8a6528ad5829417d034989cf75";
        #elif defined(Q_OS_LINUX)
-            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";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-linux-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.11-linux-x64.tar.gz";
+            validHash = "57754a4d3ed964314b2ec5c98a64d6ca76ba0062239115859949d0f67d91edb0";
        #elif defined(Q_OS_MACOS_AARCH64)
-            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";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-macos-aarch64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.11-macos-aarch64.tar.gz";
+            validHash = "51fe9680fb2a80e8fc29a4401655f40b508f38e8aff1ae94a4399c5a036ab370";
        #elif defined(Q_OS_MACOS)
-            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";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-macos-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.11-macos-x64.tar.gz";
+            validHash = "53470b203209837336e60933bda9e2ba4ae179aef4ec773abb76d6f9b64023f5";
        #endif
        QFile file(fileName);
        epee::net_utils::http::http_simple_client http_client;
@@ -182,6 +182,10 @@ bool P2PoolManager::start(const QString &flags, const QString &address, const QS
        arguments << "--start-mining" << threads;
    }

+    if (chain == "nano") {
+        arguments << "--nano";
+    }
+
    if (chain == "mini") {
        arguments << "--mini";
    }
--- a/wizard/WizardAskPassword.qml
+++ b/wizard/WizardAskPassword.qml
@@ -47,7 +47,7 @@ ColumnLayout {
        return passwordInput.text === passwordInputConfirm.text;
    }

-    function calcPasswordStrength(inp) {
+    function calcPasswordStrength() {
        if(!progressLayout.visible) return;
        if(passwordInput.text.length <= 1){
            root.passwordFill = 0;
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -56,6 +56,7 @@ Rectangle {
        ListElement { column1: "Ledger Nano S Plus"; column2: "Ledger";}
        ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
        ListElement { column1: "Ledger Stax"; column2: "Ledger";}
+        ListElement { column1: "Ledger Flex"; column2: "Ledger";}
        ListElement { column1: "Trezor Model T"; column2: "Trezor";}
        ListElement { column1: "Trezor Safe 3"; column2: "Trezor";}
        ListElement { column1: "Trezor Safe 5"; column2: "Trezor";}
@@ -182,6 +183,8 @@ Rectangle {
                                        return "qrc:///images/ledgerNanoX.png";
                                    } else if (ledgerType == "Ledger Stax") {
                                        return "qrc:///images/ledgerStax.png";
+                                    } else if (ledgerType == "Ledger Flex") {
+                                        return "qrc:///images/ledgerFlex.png";
                                    }
                                }
                                return "";
--- a/wizard/WizardCreateWallet2.qml
+++ b/wizard/WizardCreateWallet2.qml
@@ -86,7 +86,7 @@ Rectangle {
        visible: false
        text: qsTr("Print this paper, fill it out, and keep it in a safe location. Never share your recovery phrase with anybody, especially with strangers offering technical support.") +
              qsTr("Recovery phrase (mnemonic seed)") +
-              qsTr("These words are are a backup of your wallet. They are the only thing needed to access your funds and restore your Monero wallet, so keep this paper in a safe place and do not disclose it to anybody! It is strongly not recommended to store your recovery phrase digitally (in an email, online service, screenshot, photo, or any other type of computer file).") +
+              qsTr("These words are a backup of your wallet. They are the only thing needed to access your funds and restore your Monero wallet, so keep this paper in a safe place and do not disclose it to anybody! It is strongly not recommended to store your recovery phrase digitally (in an email, online service, screenshot, photo, or any other type of computer file).") +
              qsTr("Wallet creation date") +
              qsTr("Wallet restore height") +
              qsTr("For instructions on how to restore this wallet, visit www.getmonero.org and go to Resources > User Guides > \"How to restore a wallet from mnemonic seed\". Use only Monero wallets that are trusted and recommended by the Monero community (see a list of them in www.getmonero.org/downloads).") + translationManager.emptyString
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -46,7 +46,6 @@ Rectangle {
            return false;
        }

-        var valid = false;
        if(wizardController.walletRestoreMode === "keys") {
            return wizardWalletInput.verify() && wizardRestoreWallet1.verifyFromKeys();
        } else if(wizardController.walletRestoreMode === "seed") {
--- a/wizard/WizardRestoreWallet4.qml
+++ b/wizard/WizardRestoreWallet4.qml
@@ -72,6 +72,7 @@ Rectangle {
                progress: appWindow.walletMode <= 1 ? 2 : 3

                onPrevClicked: {
+                    btnNext.enabled = true;
                    if (appWindow.walletMode <= 1){
                        wizardStateView.state = "wizardRestoreWallet1";
                    } else {
Author	SHA1	Message	Date
luigi1111	e34c83d7aa	Merge pull request #4507 `c285879` build: prepare v0.18.4.3 (selsta)	2025-10-07 19:19:50 -04:00
selsta	c28587931f	build: prepare v0.18.4.3	2025-10-07 23:36:02 +02:00
tobtoht	1de4a65f90	Merge pull request #4505 `c31cdaa` p2pool v4.11 (SChernykh)	2025-09-28 18:40:11 +00:00
SChernykh	c31cdaad9e	p2pool v4.11	2025-09-27 13:06:57 +02:00
tobtoht	440012b454	Merge pull request #4503 `4bd21db` p2pool v4.10.1 (sech1)	2025-09-24 20:55:23 +00:00
sech1	4bd21db202	p2pool v4.10.1	2025-09-10 09:59:56 +02:00
tobtoht	25807060a7	Merge pull request #4502 `ff9558d` p2pool v4.10 (sech1)	2025-09-09 18:06:27 +00:00
sech1	ff9558db09	p2pool v4.10	2025-09-09 10:35:51 +02:00
tobtoht	f3f1dfc020	Merge pull request #4498 `0764fba` docker: update Qt to 5.15.17 (selsta)	2025-09-08 18:18:06 +00:00
selsta	0764fbad33	docker: update Qt to 5.15.17	2025-09-03 20:31:33 +02:00
tobtoht	792130a7e6	Merge pull request #4496 `5ee0484` workflows: fix macOS bundle (selsta)	2025-09-02 20:02:20 +00:00
tobtoht	3f0edae3a7	Merge pull request #4497 `76416d9` workflows: remove unmaintained docker caching action (selsta)	2025-09-02 19:59:51 +00:00
selsta	76416d9133	workflows: remove unmaintained docker caching action Does not work anymore. Action hasn't been updated since 2020. There's a fork but it also appears unmaintained.	2025-09-02 00:14:10 +02:00
selsta	5ee04841f0	workflows: fix macOS bundle	2025-09-02 00:01:53 +02:00
tobtoht	1d09876323	Merge pull request #4494 `dce481a` wizard: add new Ledger Flex (selsta)	2025-08-31 12:32:37 +00:00
selsta	dce481a3d9	wizard: add new Ledger Flex	2025-08-31 00:11:23 +02:00
tobtoht	28c698375c	Merge pull request #4492 `cabbbaf` cmake: update macOS deploy for newer boost (selsta)	2025-08-29 18:26:32 +00:00
selsta	cabbbaf172	cmake: update macOS deploy for newer boost	2025-08-25 19:29:36 +02:00
luigi1111	c89f8eca91	Merge pull request #4491 `16da754` build: prepare v0.18.4.2 (selsta)	2025-08-24 22:34:18 -04:00
selsta	16da754c79	build: prepare v0.18.4.2	2025-08-24 19:31:12 +02:00
tobtoht	346d962837	Merge pull request #4476 `9e37b21` chore: remove redundant words in comment (xihuwenhua)	2025-08-22 07:48:08 +00:00
xihuwenhua	9e37b219b9	chore: remove redundant words in comment Signed-off-by: xihuwenhua <xihuwenhua@outlook.com>	2025-08-22 15:14:32 +08:00
tobtoht	b8b556f289	Merge pull request #4490 `881206d` p2pool: update to v4.9.1 (sech1)	2025-08-21 16:34:00 +00:00
sech1	881206db99	p2pool: update to v4.9.1	2025-08-21 12:03:32 +02:00
tobtoht	f8ad672c44	Merge pull request #4482 `614b81f` p2pool: add nano sidechain (nahuhh)	2025-08-04 11:54:17 +00:00
tobtoht	8a85221f95	Merge pull request #4050 `5332495` Implement background sync when locked (j-berman)	2025-08-04 11:51:24 +00:00
j-berman	5332495c24	Implement background sync when locked	2025-08-03 10:26:11 -07:00
nahuhh	614b81fd23	p2pool: add nano sidechain	2025-07-24 20:17:37 +00:00
tobtoht	10a184db8b	Merge pull request #4477 `7c4ddf7` p2pool: update to v4.9 (SChernykh)	2025-07-22 14:15:44 +00:00
SChernykh	7c4ddf7bc4	p2pool: update to v4.9	2025-07-20 22:27:30 +02:00
tobtoht	0149f946b9	Merge pull request #4471 `1afc8e6` build: prepare v0.18.4.1 (selsta)	2025-07-17 14:42:45 +00:00
tobtoht	e3620f39dc	Merge pull request #4472 `fdfb963` docker: fix android build (tobtoht)	2025-07-17 13:48:20 +00:00
tobtoht	5592ff5f28	Merge pull request #4473 `fcec418` cmake: bump CXX standard to 14 (tobtoht)	2025-07-17 13:47:58 +00:00
tobtoht	fcec4187b6	cmake: bump CXX standard to 14	2025-07-17 13:01:24 +02:00
tobtoht	fdfb9634d3	docker: fix android build	2025-07-17 12:59:13 +02:00
selsta	1afc8e69c6	build: prepare v0.18.4.1	2025-07-17 01:25:59 +02:00
tobtoht	fb3b4e44da	Merge pull request #4462 `5a61c7c` p2pool: update to v4.8.1 (SChernykh)	2025-06-26 09:23:35 +00:00
SChernykh	5a61c7c941	p2pool: update to v4.8.1	2025-06-25 12:01:46 +02:00
tobtoht	4e9b0ae000	Merge pull request #4446 `a56d4d0f` main: Update blockchain size (Collin Bartlam)	2025-05-09 19:35:30 +00:00
Collin Bartlam	a56d4d0f4b	main: Update blockchain size	2025-05-09 01:20:47 -04:00
tobtoht	2b0e7d0dee	Merge pull request #4441 `0fd48a1e` cmake: fix deploy icu version (selsta)	2025-05-04 14:18:32 +00:00
tobtoht	e17e238ee9	Merge pull request #4440 `d4eafa1d` p2pool: update to v4.5 (SChernykh)	2025-05-04 03:02:45 +00:00
selsta	0fd48a1e56	cmake: fix deploy icu version	2025-05-03 18:56:01 +02:00
SChernykh	d4eafa1d95	p2pool: update to v4.5	2025-05-03 17:13:28 +02:00
tobtoht	675f68ca17	Merge pull request #4434 `30ee14fc` PasswordDialog: fix spelling in warning message (spetterman66)	2025-04-24 18:04:08 +00:00
spetterman66	30ee14fca1	PasswordDialog: fix spelling in warning message	2025-04-23 23:12:58 +02:00
tobtoht	c4ae40223c	Merge pull request #4384 `0e9069af` lang: rename esperanto.png to eo.png using ISO 639-1 code (Baksi)	2025-04-18 16:38:49 +00:00
Baksi	0e9069af80	lang: rename esperanto.png to eo.png using ISO 639-1 code	2025-04-17 19:02:34 +00:00
tobtoht	1db66c9698	Merge pull request #4433 `b409e9fc` workflows: update Ubuntu version (selsta)	2025-04-16 01:07:52 +00:00
selsta	b409e9fc7d	workflows: update Ubuntu version	2025-04-15 21:09:26 +02:00
tobtoht	ecb76b8414	Merge pull request #4418 `da71a00b` Remove unused JS variables (b4n6-b4n6)	2025-04-06 09:39:39 +00:00
tobtoht	24b4e0209f	Merge pull request #4427 `4195735c` workflows: fix CI bundle build and name spelling (selsta)	2025-03-30 15:39:49 +00:00
tobtoht	35bc27a3a8	Merge pull request #4426 `3ae32613` build: prepare v0.18.4.0 (selsta)	2025-03-30 15:39:14 +00:00
tobtoht	f903e0e447	Merge pull request #4428 `b4b2ed39` Dockerfile: update Linux base image to 18.04 (selsta)	2025-03-30 15:37:58 +00:00
selsta	b4b2ed3976	Dockerfile: update Linux base image to 18.04	2025-03-29 18:14:45 +01:00
selsta	4195735cd3	workflows: fix CI bundle build and name spelling	2025-03-29 15:31:48 +01:00
selsta	3ae3261315	build: prepare v0.18.4.0	2025-03-29 15:07:23 +01:00
tobtoht	47f0047c9f	Merge pull request #4421 `33f08aee` README: fix dead link (selsta)	2025-03-14 22:38:32 +00:00
selsta	33f08aee3e	README: fix dead link	2025-03-14 21:27:58 +01:00
b4n6-b4n6	da71a00be2	Remove unused JS variables	2025-03-03 09:45:44 +07:00
tobtoht	a064b42917	Merge pull request #4417 `62496a2c` p2pool: update to v4.4 (SChernykh)	2025-02-27 04:15:49 +00:00
SChernykh	62496a2c99	p2pool: update to v4.4	2025-03-01 20:02:35 +01:00
tobtoht	1669a64025	Merge pull request #4416 `413c0db7` ci: fix MSYS2 build (tobtoht)	2025-02-25 15:32:49 +00:00
tobtoht	413c0db7c0	ci: fix MSYS2 build	2025-02-25 13:35:05 +01:00
tobtoht	521fee91cd	Merge pull request #4349 `7c41202b` build(deps): bump actions/download-artifact in /.github/workflows (dependabot[bot])	2025-02-24 18:20:46 +00:00
tobtoht	3021970193	Merge pull request #4381 `82714e6d` build: set cxx standard to 17 in dev mode (tobtoht)	2025-02-24 18:18:53 +00:00
tobtoht	82714e6d26	build: set cxx standard to 17 in dev mode	2025-02-24 19:11:36 +01:00
tobtoht	351f4aba1c	Merge pull request #4415 `8cabe04d` README: clarify docker build process (selsta)	2025-02-24 18:08:44 +00:00
tobtoht	daf3a1c5b8	Merge pull request #4412 `0aaa963b` Win deploy: Boost Regex is header-only since 1.77 (malinero)	2025-02-24 18:08:07 +00:00
tobtoht	2d2c7476db	Merge pull request #4411 `7e7215c7` fix testnet address check (preland)	2025-02-24 18:07:14 +00:00
tobtoht	aec2f94d4b	Merge pull request #4402 `04637127` Docker android: upgrade dependencies (malinero)	2025-02-24 18:06:05 +00:00
tobtoht	45fe6e6991	Merge pull request #4401 `8512de2b` Dockerfile linux: fix boost download url (malinero)	2025-02-24 18:04:36 +00:00
tobtoht	e496b03c63	Merge pull request #4390 `b0ecc8cf` p2pool: update to v4.3 (SChernykh)	2025-02-24 18:03:39 +00:00
tobtoht	39606d2eb1	Merge pull request #4377 `ea39b20d` docker: update Qt to 5.15.16 (selsta)	2025-02-24 18:03:00 +00:00
tobtoht	970c33332b	Merge pull request #4366 `cdf8a1a8` build.yml: pyenv vcs for python (plowsof)	2025-02-24 18:02:24 +00:00
tobtoht	fa02fa8ac5	Merge pull request #4362 `8af3cd09` Dockerfile.linux: freetype.git mirror (plowsof)	2025-02-24 18:00:55 +00:00
tobtoht	9015dd5367	Merge pull request #4351 `8f17b899` wizardRestore: blindly (re)enable create wallet button (plowsof)	2025-02-24 18:00:03 +00:00
tobtoht	e1a3dbd738	Merge pull request #4339 `e18c2cfd` DEPLOY: altool is deprecated, replace with notarytool (selsta)	2025-02-24 17:58:51 +00:00
selsta	8cabe04d0f	README: clarify docker build process	2025-02-24 16:11:04 +01:00
malinero	0aaa963b5a	Win deploy: Boost Regex is header-only since 1.77	2025-02-20 00:06:05 +01:00
preland	7e7215c71e	fix testnet address check	2025-02-14 17:53:04 -07:00
malinero	04637127ee	Docker android: upgrade dependencies	2025-01-23 22:32:24 +01:00
malinero	8512de2bdd	Dockerfile linux: fix boost download url	2025-01-20 18:18:39 +01:00
SChernykh	b0ecc8cf33	p2pool: update to v4.3	2024-12-30 17:21:08 +01:00
selsta	ea39b20d64	docker: update Qt to 5.15.16	2024-11-20 20:39:37 +01:00
plowsof	cdf8a1a854	build.yml: pyenv vcs for python	2024-10-05 09:03:14 +01:00
luigi1111	0a9d61986c	Merge pull request #4355 `b521e83` workflows/build: upload-artifact@v4 (plowsof)	2024-10-01 15:31:17 -04:00
plowsof	8af3cd09ca	Dockerfile.linux: freetype.git mirror https://savannah.gnu.org/ apears to be temp offline	2024-10-01 11:45:45 +01:00
plowsof	b521e83829	workflows/build: upload-artifact@v4	2024-09-17 23:10:08 +01:00
plowsof	8f17b89979	wizardRestore: blindly (re)enable create wallet button	2024-09-10 15:47:15 +01:00
dependabot[bot]	7c41202b98	build(deps): bump actions/download-artifact in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-03 22:28:16 +00:00
selsta	e18c2cfdfc	DEPLOY: altool is deprecated, replace with notarytool	2024-08-20 21:02:19 +02:00