From d245c4d12546c22be06e1ff43accee2725400319 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 3 Sep 2024 19:58:30 +0200 Subject: [PATCH 1/4] coins: send to self should send to current account --- src/dialog/OutputSweepDialog.cpp | 2 +- src/libwalletqt/Wallet.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialog/OutputSweepDialog.cpp b/src/dialog/OutputSweepDialog.cpp index b9e4c00..a7a9caa 100644 --- a/src/dialog/OutputSweepDialog.cpp +++ b/src/dialog/OutputSweepDialog.cpp @@ -15,7 +15,7 @@ OutputSweepDialog::OutputSweepDialog(QWidget *parent, quint64 amount) connect(ui->checkBox_churn, &QCheckBox::toggled, [&](bool toggled){ ui->lineEdit_address->setEnabled(!toggled); - ui->lineEdit_address->setText(toggled ? "Primary address" : ""); + ui->lineEdit_address->setText(toggled ? "This account" : ""); }); connect(ui->buttonBox, &QDialogButtonBox::accepted, [&](){ diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 8a45764..61fb184 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -901,7 +901,7 @@ void Wallet::createTransactionMultiDest(const QVector &addresses, const void Wallet::sweepOutputs(const QVector &keyImages, QString address, bool churn, int outputs, int feeLevel) { if (churn) { - address = this->address(0, 0); + address = this->address(m_currentSubaddressAccount, 0); } qInfo() << "Creating transaction"; From 669bf0caa7c1a9fbde88939129c3dc7431992098 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 4 Sep 2024 16:14:11 +0200 Subject: [PATCH 2/4] depends: openssl: update to 3.3.2 --- contrib/depends/packages/openssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk index 5d5e3c3..8993b2f 100644 --- a/contrib/depends/packages/openssl.mk +++ b/contrib/depends/packages/openssl.mk @@ -1,8 +1,8 @@ package=openssl -$(package)_version=3.3.1 -$(package)_download_path=https://www.openssl.org/source +$(package)_version=3.3.2 +$(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version) $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +$(package)_sha256_hash=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" From c53f35fc8b94ae8c0e6c418e4818cd7ae74b16fd Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 4 Sep 2024 18:44:46 +0200 Subject: [PATCH 3/4] depends: unbound: update to 1.21.0 --- contrib/depends/packages/unbound.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/depends/packages/unbound.mk b/contrib/depends/packages/unbound.mk index 9517349..20bbef8 100644 --- a/contrib/depends/packages/unbound.mk +++ b/contrib/depends/packages/unbound.mk @@ -1,8 +1,8 @@ package=unbound -$(package)_version=1.20.0 +$(package)_version=1.21.0 $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf +$(package)_sha256_hash=e7dca7d6b0f81bdfa6fa64ebf1053b5a999a5ae9278a87ef182425067ea14521 $(package)_dependencies=openssl expat define $(package)_set_vars From 5453936abd2461bcf7d9a3acf74dfe031cd7b5e9 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 5 Sep 2024 13:25:45 +0200 Subject: [PATCH 4/4] nodes: remove hashvault --- src/assets/nodes.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/assets/nodes.json b/src/assets/nodes.json index 2fb0f24..a13e3ce 100644 --- a/src/assets/nodes.json +++ b/src/assets/nodes.json @@ -35,7 +35,6 @@ "node.majesticbank.at:18089", "xmr-node.cakewallet.com:18081", "singapore.node.xmr.pm:18089", - "nodes.hashvault.pro:18081", "node.xmr.ru:18081", "node.monerodevs.org:18089", "node2.monerodevs.org:18089",