diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | src/p2pool/P2PoolManager.cpp | 24 | ||||
| -rw-r--r-- | wizard/WizardController.qml | 4 |
4 files changed, 16 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a79d8466..8b47bf71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(VERSION_MAJOR "18") set(VERSION_MINOR "4") -set(VERSION_REVISION "6") +set(VERSION_REVISION "7") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") @@ -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.4.6`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.7`) 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.4.6`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.7`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp index 5acd162f..4d59eb35 100644 --- a/src/p2pool/P2PoolManager.cpp +++ b/src/p2pool/P2PoolManager.cpp @@ -55,21 +55,21 @@ void P2PoolManager::download() { QString fileName; QString validHash; #ifdef Q_OS_WIN - url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-windows-x64.zip"; - fileName = m_p2poolPath + "/p2pool-v4.13-windows-x64.zip"; - validHash = "267006cd1259253052e64e9ac5ae27532cf238e71588444c14624b9432325e9f"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.14/p2pool-v4.14-windows-x64.zip"; + fileName = m_p2poolPath + "/p2pool-v4.14-windows-x64.zip"; + validHash = "9c7f0476c441fc0c021fae7d01264b4ec61dc3301ed73b65931555550becf396"; #elif defined(Q_OS_LINUX) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-linux-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.13-linux-x64.tar.gz"; - validHash = "d02361ee5f18e3e53af79436af6dc1772b71aa5ad8582ad88b0764ae2c9289c3"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.14/p2pool-v4.14-linux-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.14-linux-x64.tar.gz"; + validHash = "e64f6f774dc35352b8ae4397ccdb92ce0cc935cdfb100eac58d44e49f8796a01"; #elif defined(Q_OS_MACOS_AARCH64) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-macos-aarch64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.13-macos-aarch64.tar.gz"; - validHash = "fddd309566395a8297738f3fd5cd0fe9d792c3005bb664a1a61befa029e802ad"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.14/p2pool-v4.14-macos-aarch64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.14-macos-aarch64.tar.gz"; + validHash = "7cc780af6115ef8d9d6b7f3c1336f57dab25745b6208b6e97dca8729782e155b"; #elif defined(Q_OS_MACOS) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-macos-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.13-macos-x64.tar.gz"; - validHash = "374c42bbb409ed2ef3e5e0b4359441929cc574b2fa9bc8b3bdf7695471f8f94d"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.14/p2pool-v4.14-macos-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.14-macos-x64.tar.gz"; + validHash = "7df3be2ae15eda4260d2665e4a2c3c7dc2f1dba26a2a643e46a2b1283097a60a"; #endif QFile file(fileName); epee::net_utils::http::http_simple_client http_client; diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index eb727098..a7932fd7 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -378,9 +378,6 @@ Rectangle { console.log("Removing temporary wallet: " + wizardController.tmpWalletFilename) oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename) - // protecting wallet with password - wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); - // save to persistent settings persistentSettings.account_name = wizardController.walletOptionsName persistentSettings.wallet_path = wizardController.m_wallet.path; @@ -399,6 +396,7 @@ Rectangle { new_wallet_filename = appWindow.accountsDir + new_wallet_filename; } console.log("saving new wallet to", new_wallet_filename); + wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); wizardController.m_wallet.storeAsync(handler, new_wallet_filename); } |