Changed build workflow to run in container

Added node.js setup to build workflow
Updated checkout workflow version
2026-04-01 23:27:25 -04:00 · 2024-07-25 22:20:02 -04:00 · 2024-07-25 22:10:47 -04:00 · 2024-07-25 22:07:23 -04:00 · 2024-07-25 21:58:22 -04:00 · 2024-07-25 21:52:38 -04:00
33 changed files with 171 additions and 715 deletions
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -0,0 +1,36 @@
+name: Build
+run-name: Build Docker Image
+on: [push, pull_request]
+
+jobs:
+
+  # Build image and push to container registry
+  docker-build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v4
+      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: prepare build environment
+      run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
+    - name: build
+      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3'
+    - name: sha256sum
+      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
+      with:
+        name: ${{ github.job }}
+        path: |
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod    
--- 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/verify_p2pool.py
+++ b/.github/verify_p2pool.py
@@ -1,107 +0,0 @@
-import requests
-import subprocess
-from urllib.request import urlretrieve
-import difflib
-
-sech_key = "https://p2pool.io/SChernykh.asc"
-sech_key_backup = "https://raw.githubusercontent.com/monero-project/gitian.sigs/master/gitian-pubkeys/SChernykh.asc"
-sech_key_fp = "1FCA AB4D 3DC3 310D 16CB  D508 C47F 82B5 4DA8 7ADF"
-
-p2pool_files = [{
-                    "os": "WIN",
-                    "filename": "windows-x64.zip",
-                },
-                {
-                    "os": "LINUX",
-                    "filename": "linux-x64.tar.gz"
-                },
-                {
-                    "os": "MACOS_AARCH64",
-                    "filename": "macos-aarch64.tar.gz",
-                },
-                {
-                    "os": "MACOS",
-                    "filename": "macos-x64.tar.gz",
-                }]
-
-def get_hash(fname):
-    fhash = subprocess.check_output(["sha256sum", fname]).decode("utf-8")
-    print(fhash.strip())
-    return fhash.split()[0]
-
-def main():
-    global p2pool_files, sech_key, sech_key_backup, sech_key_fp
-    p2pool_tag_api = "https://api.github.com/repos/SChernykh/p2pool/releases/latest"
-    data = requests.get(p2pool_tag_api).json()
-    tag = data["tag_name"]
-    head = f"p2pool-{tag}-"
-    url = f"https://github.com/SChernykh/p2pool/releases/download/{tag}/"
-
-    try:
-        urlretrieve(sech_key,"SChernykh.asc")
-    except:
-        urlretrieve(sech_key_backup,"SChernykh.asc")
-
-    urlretrieve(f"{url}sha256sums.txt.asc","sha256sums.txt.asc")
-
-    subprocess.check_call(["gpg", "--import", "SChernykh.asc"])
-    subprocess.check_call(["gpg", "--verify", "sha256sums.txt.asc"])    
-    fingerprint = subprocess.check_output(["gpg","--fingerprint", "SChernykh"]).decode("utf-8").splitlines()[1].strip()
-    
-    assert fingerprint == sech_key_fp
-    
-    with open("sha256sums.txt.asc","r") as f:
-        lines = f.readlines()
-
-    signed_hashes = {}
-    for line in lines:
-        if "Name:" in line:
-            signed_fname = line.split()[1]
-        if "SHA256:" in line:
-            signed_hashes[signed_fname] = line.split()[1].lower()
-
-    expected = ""
-    for i in range(len(p2pool_files)):
-        fname = p2pool_files[i]["filename"]
-        str_os =p2pool_files[i]["os"]
-        dl = f"{url}{head}{fname}"
-        urlretrieve(dl,f"{head}{fname}")
-        fhash = get_hash(f"{head}{fname}")
-        assert signed_hashes[f"{head}{fname}"] == fhash
-        if i == 0:
-            expected += f"        #ifdef Q_OS_{str_os}\n"
-        else:
-            expected += f"        #elif defined(Q_OS_{str_os})\n"
-        expected += f"            url = \"https://github.com/SChernykh/p2pool/releases/download/{tag}/{head}{fname}\";\n"
-        expected += f"            fileName = m_p2poolPath + \"/{head}{fname}\";\n"
-        expected += f"            validHash = \"{fhash}\";\n"
-    expected += "        #endif\n"
-
-    print(f"Expected:\n{expected}")
-
-    with open("src/p2pool/P2PoolManager.cpp","r") as f:
-        p2pool_lines = f.readlines()
-
-    unexpected = ""
-    ignore = 1
-    for line in p2pool_lines:
-        if ignore == 0:
-            unexpected += line
-        if "QString validHash;" in line:
-            ignore = 0
-        if "#endif" in line and ignore == 0:
-            break
-
-    d = difflib.Differ()
-    diff = d.compare(str(unexpected).splitlines(True),str(expected).splitlines(True))
-
-    print("Unexpected:")
-    for i in diff:
-        if i.startswith("?"):
-            continue
-        print(i.replace("\n",""))
-
-    assert unexpected == expected
-
-if __name__ == "__main__":
-    main()
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,203 +0,0 @@
-name: ci/gh-actions/gui
-
-on: [push, pull_request]
-
-env:
-  FREE_DISKSPACE: |
-    sudo rm -rf /usr/local/.ghcup /usr/share/dotnet /usr/share/swift /usr/share/miniconda
-
-jobs:
-  build-macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm libsodium miniupnpc expat libunwind-headers protobuf qt5 pkg-config
-    - name: build
-      run: DEV_MODE=ON make release -j3
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
-
-  build-ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: remove bundled boost
-      run: sudo rm -rf /usr/local/share/boost
-    - name: set apt conf
-      run: |
-        echo "Acquire::Retries \"3\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-        echo "Acquire::http::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-        echo "Acquire::ftp::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
-    - name: update apt
-      run: sudo apt update
-    - name: install monero dependencies
-      run: sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler
-    - name: install monero gui dependencies
-      run: sudo apt -y install qtbase5-dev qtdeclarative5-dev qml-module-qtqml-models2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-platform qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
-    - name: build
-      run: DEV_MODE=ON make release -j3
-    - name: test qml
-      run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
-
-  build-windows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - 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 mingw-w64-x86_64-angleproject
-    - name: build
-      run: DEV_MODE=ON make release-win64 -j2
-    - name: deploy
-      run: make deploy
-      working-directory: build/release
-    - name: test qml
-      run: build/release/bin/monero-wallet-gui --test-qml
-
-  macos-bundle:
-    runs-on: macos-13
-    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 pyenv p7zip aria2
-    - name: install dependencies
-      run: |
-        pyenv install 3.12.0
-        pip install defusedxml
-    - name: download qt
-      run: python monero-gui/.github/qt_helper.py mac_x64 desktop 5.15.2 clang_64 c384008156fe63cc183bade0316828c598ff3e5074397c0c9ccc588d6cdc5aca
-      working-directory: ../
-    - name: build
-      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
-    - name: deploy
-      run: make deploy
-      working-directory: build
-    - name: test qml
-      run: build/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
-    - name: create .tar
-      run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
-      working-directory: build/bin
-    - uses: actions/upload-artifact@v4
-      with:
-        name: ${{ github.job }}
-        path: build/bin/monero-wallet-gui.tar
-
-  docker-linux-static:
-    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
-      run: ${{env.FREE_DISKSPACE}}
-    - name: prepare build environment
-      run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
-    - name: build
-      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3'
-    - name: sha256sum
-      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@v4
-      with:
-        name: ${{ github.job }}
-        path: |
-          /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
-          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod
-
-  docker-windows-static:
-    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
-      run: docker build --tag monero:build-env-windows --build-arg THREADS=3 --file Dockerfile.windows .
-    - name: build
-      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@v4
-      with:
-        name: ${{ github.job }}
-        path: |
-          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
-          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
-
-  docker-android:
-    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@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-22.04
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: recursive
-    - name: archive
-      run: |
-        pip install git-archive-all
-        export VERSION="monero-gui-$(git describe)"
-        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@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
@@ -1,174 +0,0 @@
-name: Flatpak
-
-on:
-  release:
-    types: released
-
-jobs:
-  part1:
-    name: Part 1/3
-    if: github.repository == 'monero-project/monero-gui'
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-        stop-at-module: boost
-
-    - name: Tar flatpak-builder
-      run: tar -cvf flatpak-builder.tar .flatpak-builder
-
-    - name: Save flatpak-builder
-      uses: actions/upload-artifact@v3
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-        path: flatpak-builder.tar
-
-  part2:
-    name: Part 2/3
-    if: github.repository == 'monero-project/monero-gui'
-    needs: part1
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v4.1.7
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Untar flatpak-builder
-      run: tar -xvf flatpak-builder.tar
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-        stop-at-module: monero-gui
-
-    - name: Tar flatpak-builder
-      run: tar -cvf flatpak-builder.tar .flatpak-builder
-
-    - name: Save flatpak-builder
-      uses: actions/upload-artifact@v3
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-        path: flatpak-builder.tar
-
-  part3:
-    name: Part 3/3
-    if: github.repository == 'monero-project/monero-gui'
-    needs: [part1, part2]
-    runs-on: ubuntu-latest
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64, aarch64]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Add version and date
-      run: |
-        sed -i 's/<version>/${{ github.event.release.tag_name }}/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
-        sed -i 's/<date>/'"$(date '+%F')"'/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
-
-    - name: Install deps
-      run: dnf -y install docker
-
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
-
-    - name: Restore flatpak-builder
-      uses: actions/download-artifact@v4.1.7
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Untar flatpak-builder
-      run: tar -xvf flatpak-builder.tar
-
-    - name: Build flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-      env:
-        FLATPAK_BUILDER_N_JOBS: 3
-      with:
-        manifest-path: share/org.getmonero.Monero.yaml
-        arch: ${{ matrix.arch }}
-        cache: false
-
-    - name: Validate AppData
-      working-directory: flatpak_app/files/share/appdata
-      run: appstream-util validate org.getmonero.Monero.appdata.xml
-
-    - name: Delete flatpak-builder
-      uses: geekyeggo/delete-artifact@v2
-      with:
-        name: flatpak-builder-${{ matrix.arch }}
-
-    - name: Print hashes
-      working-directory: flatpak_app/files/bin
-      run: |
-        echo "Hashes of the ${{ matrix.arch }} binaries:" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        for bin in monero-blockchain-ancestry monero-blockchain-depth monero-blockchain-export monero-blockchain-import monero-blockchain-mark-spent-outputs monero-blockchain-prune monero-blockchain-prune-known-spent-data monero-blockchain-stats monero-blockchain-usage monerod monero-gen-ssl-cert monero-gen-trusted-multisig monero-wallet-cli monero-wallet-gui monero-wallet-rpc p2pool; do sha256sum $bin; done >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        echo "An example command to check hashes:" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-        echo "$ flatpak run --command=sha256sum org.getmonero.Monero /app/bin/monero-wallet-gui" >> $GITHUB_STEP_SUMMARY
-        echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-
-    - name: Publish to Flathub Beta
-      uses: flatpak/flatpak-github-actions/flat-manager@v6
-      with:
-        flat-manager-url: https://hub.flathub.org
-        repository: beta
-        token: ${{ secrets.FLATHUB_ }}
--- a/.github/workflows/verify_p2pool.yml
+++ b/.github/workflows/verify_p2pool.yml
@@ -1,16 +0,0 @@
-name: ci/gh-actions/verify
-on: 
-  push:
-    paths:
-      - 'src/p2pool/P2PoolManager.cpp'
-  pull_request:
-    paths:
-      - 'src/p2pool/P2PoolManager.cpp'
-jobs:
-  p2pool-hashes:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Verify Hashes
-      run: |
-        python3 .github/verify_p2pool.py
--- 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 "4")
-set(VERSION_REVISION "1")
+set(VERSION_MINOR "3")
+set(VERSION_REVISION "3")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

 option(STATIC "Link libraries statically, requires static Qt")
@@ -16,14 +16,6 @@ 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)
@@ -68,7 +60,6 @@ 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)
@@ -365,7 +356,7 @@ if(APPLE)
 endif()

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

 if(APPLE)
@@ -451,7 +442,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} ${CXX_SECURITY_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${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
@@ -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@21 libgcrypt hidapi libusb cmake pkg-config && brew link protobuf@21`
+1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`

 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=/path/to/Qt5.12.8/5.12.8/clang_64 ..
+cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 ..
 make
 make deploy
 ```
@@ -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 notarytool submit monero-gui-mac-x64-v0.X.Y.Z.dmg --apple-id email@address.org --team-id XXXXXXXXXX`
+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`

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

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

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

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

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

-ENV ANDROID_NATIVE_API_LEVEL=31
+ENV ANDROID_NATIVE_API_LEVEL=30
 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,7 +20,6 @@ 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 \
@@ -33,7 +32,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.zip \
+RUN PACKAGE_NAME=android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
    && echo "${ANDROID_NDK_HASH}  ${PACKAGE_NAME}" | sha1sum -c \
    && unzip -q ${PACKAGE_NAME} \
@@ -99,25 +98,27 @@ 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_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 \
+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 \
    && 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-arm threading=multi \
-    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} --user-config=user.jam architecture=arm address-model=64 \
+    --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++' \
    install -j${THREADS} \
    && rm -rf $(pwd)

-ARG OPENSSL_VERSION=1.1.1w
-ARG OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
+ARG OPENSSL_VERSION=1.1.1u
+ARG OPENSSL_HASH=e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6
 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 \
@@ -132,9 +133,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.6.4
-ARG EXPAT_HASH=8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada
-RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-${EXPAT_VERSION}.tar.bz2 && \
+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 && \
    echo "${EXPAT_HASH}  expat-${EXPAT_VERSION}.tar.bz2" | sha256sum -c && \
    tar -xf expat-${EXPAT_VERSION}.tar.bz2 && \
    rm expat-${EXPAT_VERSION}.tar.bz2 && \
@@ -144,8 +145,8 @@ RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-${
    make -j$THREADS install && \
    rm -rf $(pwd)

-ARG UNBOUND_VERSION=1.22.0
-ARG UNBOUND_HASH=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
+ARG UNBOUND_VERSION=1.16.2
+ARG UNBOUND_HASH=2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581
 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 && \
@@ -156,8 +157,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.5
-ARG ZMQ_HASH=622fc6dde99ee172ebaa9c8628d85a7a1995a21d
+ARG ZMQ_VERSION=v4.3.4
+ARG ZMQ_HASH=4097855ddaaa65ed7b5e8cb86d143842a594eebd
 RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
    && cd libzmq \
    && git checkout ${ZMQ_HASH} \
@@ -168,8 +169,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.20-RELEASE
-ARG SODIUM_HASH=9511c982fb1d046470a8b42aa36556cdb7da15de
+ARG SODIUM_VERSION=1.0.18
+ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
 RUN set -ex \
    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
    && cd libsodium \
@@ -197,20 +198,23 @@ 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.31.4 --depth 1 https://github.com/Kitware/CMake \
+RUN git clone -b v3.24.2 --depth 1 https://github.com/Kitware/CMake \
    && cd CMake \
-    && git reset --hard 569b821a138a4d3f7f4cc42c0cf5ae5e68d56f96 \
+    && git reset --hard 31f835410efeea50acd43512eb9e5646a26ea177 \
    && PATH=${HOST_PATH} ./bootstrap \
    && PATH=${HOST_PATH} make -j${THREADS} \
    && PATH=${HOST_PATH} make -j${THREADS} install \
    && rm -rf $(pwd)

-# 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}
+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

 CMD set -ex \
    && cd /monero-gui \
@@ -228,12 +232,10 @@ CMD set -ex \
    -DBoost_USE_STATIC_RUNTIME=ON \
    -DLRELEASE_PATH="${PREFIX}/bin" \
    -DQT_ANDROID_APPLICATION_BINARY="monero-wallet-gui" \
-    -DANDROID_SDK="${NEW_SDK_ROOT}" \
+    -DANDROID_SDK="${ANDROID_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:18.04
+FROM ubuntu:16.04

 ARG THREADS=1
-ARG QT_VERSION=v5.15.16-lts-lgpl
+ARG QT_VERSION=v5.15.13-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 \
-    libpng-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
+    libpng12-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://gitlab.freedesktop.org/freetype/freetype.git && \
-    cd freetype && \
+RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
+    cd freetype2 && \
    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://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/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.16-lts-lgpl
+ARG QT_VERSION=v5.15.13-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.4.1 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.2.0 --depth 1 https://github.com/monero-project/monero && \
    cd monero && \
-    git reset --hard ec870e50706a29768a65f597155ed5c7ad7e6326 && \
+    git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \
    cp -a contrib/depends / && \
    cd .. && \
    rm -rf monero
--- a/README.md
+++ b/README.md
@@ -60,7 +60,9 @@ 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/):

 [<img width="150" src="https://www.getmonero.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/globee.png"/>](https://globee.com/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://symas.com/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/macstadium.png"/>](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).
@@ -96,7 +98,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/release-v0.18/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/master/contrib/gitian/README.md).

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

@@ -105,7 +107,7 @@ Packaging for your favorite distribution would be a welcome contribution!
   ```
   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.3`) to build the release binaries.
 3. Prepare build environment
   ```
   cd monero-gui
@@ -128,7 +130,7 @@ Packaging for your favorite distribution would be a welcome contribution!
   ```
   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
   ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.1`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.3`) to build the release binaries.
 3. Prepare build environment
   ```
   cd monero-gui
@@ -142,9 +144,8 @@ 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 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
+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
   ```
   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'
   ```
@@ -309,7 +310,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 mingw-w64-x86_64-angleproject
+    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
    ```

    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
@@ -58,6 +58,7 @@ 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
@@ -96,18 +97,12 @@ if(APPLE OR (WIN32 AND NOT STATIC))
            libssl-3-x64.dll
            libcrypto-3-x64.dll
            #icu
-            libicudt77.dll
-            libicuin77.dll
-            libicuio77.dll
-            libicutu77.dll
-            libicuuc77.dll
+            libicudt74.dll
+            libicuin74.dll
+            libicuio74.dll
+            libicutu74.dll
+            libicuuc74.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
@@ -204,7 +204,7 @@ Item {
                font.family: MoneroComponents.Style.fontLight.name
                Layout.fillWidth: true
                wrapMode: Text.Wrap
-                text: qsTr("CAPS LOCK IS ON.") + translationManager.emptyString;
+                text: qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
            }

            MoneroComponents.LineEdit {
--- a/images/trezor5.png
+++ b/images/trezor5.png
--- a/js/TxUtils.js
+++ b/js/TxUtils.js
@@ -21,6 +21,7 @@ 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(' ');
 }

@@ -69,7 +70,7 @@ function checkSignature(signature) {
 }

 function isValidOpenAliasAddress(address) {
-    var regex = /^[A-Za-z0-9-@]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure, allow email-like address
+    var regex = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure

    if (!regex.test(address)) {
        return false;
--- 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 : _nettype == "Stagenet" ? 60000 : 30000;
+        var approximateTestnetRolledBackBlocks = _nettype == "Testnet" ? 342100 : 30000;
        if(approxBlockchainHeight > approximateTestnetRolledBackBlocks)
            approxBlockchainHeight -= approximateTestnetRolledBackBlocks
    }
--- 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_EO" wallet_language="Esperanto" flag="/lang/flags/eo.png" qs="none"/>
+        <language display_name="Esperanto" locale="eo" wallet_language="Esperanto" flag="/lang/flags/esperanto.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,7 +94,7 @@ ApplicationWindow {
    readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype)
    property string currentDaemonAddress;
    property int disconnectedEpoch: 0
-    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 100 : 225 // GB
+    property int estimatedBlockchainSize: persistentSettings.pruneBlockchain ? 55 : 150 // GB
    property alias viewState: rootItem.state
    property string prevSplashText;
    property bool splashDisplayedBeforeButtonRequest;
--- a/2
+++ b/2
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -1447,6 +1447,7 @@ 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){
--- 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/eo.png</file>
+        <file>lang/flags/esperanto.png</file>
        <file>lang/flags/fi.png</file>
        <file>lang/flags/fr.png</file>
        <file>lang/flags/de.png</file>
@@ -283,7 +283,6 @@
        <file>images/ledgerNanoX.png</file>
        <file>images/ledgerStax.png</file>
        <file>images/trezor3.png</file>
-        <file>images/trezor5.png</file>
        <file>images/trezorT.png</file>
        <file>images/trezorT@2x.png</file>
        <file>qtquickcontrols2.conf</file>
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -70,6 +70,9 @@ namespace

 QPixmap screenshot()
 {
+#ifdef Q_OS_MAC
+    return MacOSHelper::screenshot();
+#else
    std::unordered_set<QWindow *> hidden;
    const QWindowList windows = QGuiApplication::allWindows();
    for (QWindow *window : windows)
@@ -88,6 +91,7 @@ QPixmap screenshot()
    });

    return QGuiApplication::primaryScreen()->grabWindow(0);
+#endif
 }

 } // namespace
@@ -303,7 +307,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("A")){
+            } else if(address.startsWith("9") || address.startsWith("B")){
                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.8.1/p2pool-v4.8.1-windows-x64.zip";
-            fileName = m_p2poolPath + "/p2pool-v4.8.1-windows-x64.zip";
-            validHash = "a5378296a202625014623235ac347ddb5d9618b9ac8d1159a6cd9511966f86c0";
+            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";
        #elif defined(Q_OS_LINUX)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-linux-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.8.1-linux-x64.tar.gz";
-            validHash = "2c182de88aac7fbd5a3f9a8ac1840b5f9d6050a2d1829c7b177f7a6df8b32117";
+            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";
        #elif defined(Q_OS_MACOS_AARCH64)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-macos-aarch64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.8.1-macos-aarch64.tar.gz";
-            validHash = "38d63384cb183477593460a917183ddb8345f242231efe54020f8e93c399700a";
+            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";
        #elif defined(Q_OS_MACOS)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.8.1/p2pool-v4.8.1-macos-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.8.1-macos-x64.tar.gz";
-            validHash = "da7eea2a0b5ec0fc5f51deff63903d2cbe0ead9be04a18327a0fbb4004fba399";
+            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";
        #endif
        QFile file(fileName);
        epee::net_utils::http::http_simple_client http_client;
--- a/src/qt/macoshelper.h
+++ b/src/qt/macoshelper.h
@@ -38,6 +38,7 @@ class MacOSHelper
 public:
    static bool isCapsLock();
    static bool openFolderAndSelectItem(const QUrl &path);
+    static QPixmap screenshot();
    static QString bundlePath();
    static void disableWindowTabbing();
 };
--- a/src/qt/macoshelper.mm
+++ b/src/qt/macoshelper.mm
@@ -68,6 +68,41 @@ bool MacOSHelper::openFolderAndSelectItem(const QUrl &path)
    return true;
 }

+QPixmap MacOSHelper::screenshot()
+{
+    std::unordered_set<uintptr_t> 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<const uintptr_t>(CFArrayGetValueAtIndex(onScreenWindows, index));
+        if (appWindowIds.find(windowId) == appWindowIds.end())
+        {
+            CFArrayAppendValue(foreignWindows, reinterpret_cast<const void *>(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];
--- a/src/qt/utils.cpp
+++ b/src/qt/utils.cpp
@@ -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"
--- a/wizard/WizardAskPassword.qml
+++ b/wizard/WizardAskPassword.qml
@@ -47,7 +47,7 @@ ColumnLayout {
        return passwordInput.text === passwordInputConfirm.text;
    }

-    function calcPasswordStrength() {
+    function calcPasswordStrength(inp) {
        if(!progressLayout.visible) return;
        if(passwordInput.text.length <= 1){
            root.passwordFill = 0;
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -58,7 +58,6 @@ 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 {
@@ -170,8 +169,6 @@ 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") {
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -149,7 +149,7 @@ Rectangle {
                imageIcon: "qrc:///images/local-node-full.png"

                onMenuClicked: {
-                    appWindow.persistentSettings.pruneBlockchain = true;
+                    appWindow.persistentSettings.pruneBlockchain = false; // can be toggled on next page
                    applyWalletMode(2, 'wizardHome');
                }
            }
--- a/wizard/WizardRestoreWallet1.qml
+++ b/wizard/WizardRestoreWallet1.qml
@@ -46,6 +46,7 @@ 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,7 +72,6 @@ Rectangle {
                progress: appWindow.walletMode <= 1 ? 2 : 3

                onPrevClicked: {
-                    btnNext.enabled = true;
                    if (appWindow.walletMode <= 1){
                        wizardStateView.state = "wizardRestoreWallet1";
                    } else {
Author	SHA1	Message	Date
Bill	9ec4749244	Changed build workflow to run in container	2024-07-25 22:20:02 -04:00
Bill	7afe4a3136	Added node.js setup to build workflow	2024-07-25 22:10:47 -04:00
Bill	e3b20fa518	Updated checkout workflow version	2024-07-25 22:07:23 -04:00
Bill	96e8503960	Set github build file	2024-07-25 21:58:22 -04:00
Bill	c911d0166e	Revert to previous build workflow	2024-07-25 21:52:38 -04:00
Bill	4f5d81c88b	Updated build workflow	2024-07-25 21:43:39 -04:00
Bill	d2a96ccce9	Added environment setup to build workflow	2024-07-25 14:41:11 -04:00
Bill	426d9c32de	Test build and push workflow action	2024-07-25 14:36:17 -04:00
Bill	60ad417b9e	Added workflow troubleshooting	2024-07-25 14:25:15 -04:00
Bill	4ea34bb60d	Added github.workspace to build workflow command	2024-07-24 20:44:46 -04:00
Bill	92bdbe8192	Test alternative build method	2024-07-23 21:01:07 -04:00
Bill	93b9b26d1d	Added bind propogation	2024-07-22 14:42:27 -04:00
Bill	8b7ee2d8f0	Additional build workflow troubleshooting	2024-07-22 14:34:04 -04:00
Bill	099fc8e394	Additional build workflow troubleshooting	2024-07-22 14:32:17 -04:00
Bill	8c7c1dc9d7	Additional build workflow troubleshooting	2024-07-22 14:16:00 -04:00
Bill	6cfbb8559b	Added additional build workflow troubleshooting	2024-07-22 14:11:03 -04:00
Bill	8953c8c5f2	Removed interactive shell and added workflow troubleshooting	2024-07-22 14:03:49 -04:00
Bill	4df7f89c84	Added interactive session for debugging	2024-07-22 13:57:28 -04:00
Bill	e9c0de9e26	Changed build workflow mount point	2024-07-22 13:46:03 -04:00
Bill	0371a26a56	Added additional workflow troubleshooting code	2024-07-22 13:37:49 -04:00
Bill	bc6e61c66c	Added additional workflow troubleshooting	2024-07-22 13:19:27 -04:00
Bill	6c4c702722	Added troubleshooting code to build workflow	2024-07-22 07:38:08 -04:00
Bill	f77f96f5a9	Corrected working directory	2024-07-22 07:36:39 -04:00
Bill	53e4bde4c0	Adjusted troubleshooting workflow code	2024-07-22 07:23:15 -04:00
Bill	651a1a3169	Added troubleshooting code to build workflow	2024-07-22 07:07:39 -04:00
Bill	91abd03fd3	Added https to build workflow	2024-07-21 21:56:08 -04:00
Bill	ab46af6cf9	Removed build workflow dependency installation	2024-07-21 21:52:50 -04:00
Bill	d08422420b	Corrected setup-buildx-action version	2024-07-21 21:44:03 -04:00
Bill	0d801f5159	Updated action versions	2024-07-21 21:41:12 -04:00
Bill	f102dad609	Add comment	2024-07-21 21:33:47 -04:00
Bill	c6246962d8	Updated build workflow	2024-07-21 21:23:59 -04:00