diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 032fcfb00e..27fb33260f 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -1,11 +1,13 @@ name: Flatpak on: - push + 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 @@ -48,6 +50,7 @@ jobs: part2: name: Part 2/3 + if: github.repository == 'monero-project/monero-gui' needs: part1 runs-on: ubuntu-latest container: @@ -97,6 +100,7 @@ jobs: part3: name: Part 3/3 + if: github.repository == 'monero-project/monero-gui' needs: [part1, part2] runs-on: ubuntu-latest container: diff --git a/CMakeLists.txt b/CMakeLists.txt index f6e726c8fe..7e9a100d9e 100644 --- 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 "2") -set(VERSION_REVISION "2") +set(VERSION_MINOR "3") +set(VERSION_REVISION "1") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") diff --git a/Dockerfile.android b/Dockerfile.android index 4d7a47b279..88f38c5b3f 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -43,8 +43,8 @@ RUN echo y | ${ANDROID_SDK_ROOT}/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} " ENV HOST_PATH=${PATH} ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH} -ARG ZLIB_VERSION=1.2.13 -ARG ZLIB_HASH=b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 +ARG ZLIB_VERSION=1.3 +ARG ZLIB_HASH=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \ diff --git a/Dockerfile.linux b/Dockerfile.linux index 1ece569e20..99ac18b61d 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -113,9 +113,9 @@ RUN git clone -b xkbcommon-0.5.0 --depth 1 https://github.com/xkbcommon/libxkbco make -j$THREADS install && \ rm -rf $(pwd) -RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \ +RUN git clone -b v1.3 --depth 1 https://github.com/madler/zlib && \ cd zlib && \ - git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \ + git reset --hard 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 && \ ./configure --static && \ make -j$THREADS && \ make -j$THREADS install && \ diff --git a/README.md b/README.md index 84c4db0c3c..6a3047ff45 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.18.2.2`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui @@ -130,7 +130,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.18.2.2`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/main.qml b/main.qml index 608e6bd7f4..757c615db9 100644 --- a/main.qml +++ b/main.qml @@ -379,7 +379,7 @@ ApplicationWindow { } function isTrustedDaemon() { - return !persistentSettings.useRemoteNode || remoteNodesModel.currentRemoteNode().trusted; + return appWindow.walletMode >= 2 && (!persistentSettings.useRemoteNode || remoteNodesModel.currentRemoteNode().trusted); } function usefulName(path) { diff --git a/monero b/monero index e06129bb4d..2656cdf505 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit e06129bb4d1076f4f2cebabddcee09f1e9e30dcc +Subproject commit 2656cdf5056c07684741c4425a051760b97025b0 diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml index 0c1e80eaa2..db1ac49541 100644 --- a/pages/settings/SettingsWallet.qml +++ b/pages/settings/SettingsWallet.qml @@ -138,9 +138,19 @@ Rectangle { inputDialog.onAcceptedCallback = function() { var txid = inputDialog.inputText.trim(); if (currentWallet.scanTransactions([txid])) { + updateBalance(); appWindow.showStatusMessage(qsTr("Transaction successfully scanned"), 3); } else { - appWindow.showStatusMessage(qsTr("Failed to scan transaction") + ": " + currentWallet.errorString, 5); + console.error("Error: ", currentWallet.errorString); + if (currentWallet.errorString == "The wallet has already seen 1 or more recent transactions than the scanned tx") { + informationPopup.title = qsTr("Error") + translationManager.emptyString; + informationPopup.text = qsTr("The wallet has already seen 1 or more recent transactions than the scanned transaction.\n\nIn order to rescan the transaction, you can re-sync your wallet by resetting the wallet restore height in the Settings > Info page. Make sure to use a restore height from before your wallet's earliest transaction.") + translationManager.emptyString; + informationPopup.icon = StandardIcon.Critical + informationPopup.onCloseCallback = null + informationPopup.open(); + } else { + appWindow.showStatusMessage(qsTr("Failed to scan transaction") + ": " + currentWallet.errorString, 5); + } } } inputDialog.onRejectedCallback = null; diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp index 9b7c4999f0..4519566b30 100644 --- 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/v3.6.2/p2pool-v3.6.2-windows-x64.zip"; - fileName = m_p2poolPath + "/p2pool-v3.6.2-windows-x64.zip"; - validHash = "ec8247a2ea923f8a2a15545e2431df70c136d584b8d57affd0fd8b0ee20c3940"; + url = "https://github.com/SChernykh/p2pool/releases/download/v3.7/p2pool-v3.7-windows-x64.zip"; + fileName = m_p2poolPath + "/p2pool-v3.7-windows-x64.zip"; + validHash = "9888afb51a206f1d2c6efc414dd1f498f82de58c689fbb73aceecd88ecdf6c43"; #elif defined(Q_OS_LINUX) - url = "https://github.com/SChernykh/p2pool/releases/download/v3.6.2/p2pool-v3.6.2-linux-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v3.6.2-linux-x64.tar.gz"; - validHash = "2f8fd698321923a3ecc6a055d01fcdcbeae1262debe4e198a2715f8b55f45308"; + url = "https://github.com/SChernykh/p2pool/releases/download/v3.7/p2pool-v3.7-linux-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v3.7-linux-x64.tar.gz"; + validHash = "d5b932053f56f85b119450e64b1a7765c632f16c6226c8762b00e48f50e7e421"; #elif defined(Q_OS_MACOS_AARCH64) - url = "https://github.com/SChernykh/p2pool/releases/download/v3.6.2/p2pool-v3.6.2-macos-aarch64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v3.6.2-macos-aarch64.tar.gz"; - validHash = "0039b64c99300f07b65ce331ed5636bf52bf435cf73f6164b768dd9e07c0f5a5"; + url = "https://github.com/SChernykh/p2pool/releases/download/v3.7/p2pool-v3.7-macos-aarch64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v3.7-macos-aarch64.tar.gz"; + validHash = "d2b483a10c01f4a84faacbb8e2eedafef451ca4e6a4128e44800018556bb2c62"; #elif defined(Q_OS_MACOS) - url = "https://github.com/SChernykh/p2pool/releases/download/v3.6.2/p2pool-v3.6.2-macos-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v3.6.2-macos-x64.tar.gz"; - validHash = "0bc70646ec296dbb6f0fbb8ee16f961c432e378f12ba5ee38df40b563be4e2f7"; + url = "https://github.com/SChernykh/p2pool/releases/download/v3.7/p2pool-v3.7-macos-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v3.7-macos-x64.tar.gz"; + validHash = "444ded858b18a9ecba7d08a2d333188d1758a3da358817887d28d0827dc4287b"; #endif QFile file(fileName); epee::net_utils::http::http_simple_client http_client;