Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 12:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge main feather repo commits before release

Browse source
This commit is contained in:
twiddle 2024-09-15 22:57:26 -04:00
commit ac89dfcb22
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/depends/packages/openssl.mk
View file

@ -1,8 +1,8 @@
package=openssl package=openssl
$(package)_version=3.3.1 $(package)_version=3.3.2
$(package)_download_path=https://www.openssl.org/source $(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version)
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e $(package)_sha256_hash=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281
define $(package)_set_vars define $(package)_set_vars
$(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" $(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"

4
contrib/depends/packages/unbound.mk
View file

@ -1,8 +1,8 @@
package=unbound package=unbound
$(package)_version=1.20.0 $(package)_version=1.21.0
$(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/ $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf $(package)_sha256_hash=e7dca7d6b0f81bdfa6fa64ebf1053b5a999a5ae9278a87ef182425067ea14521
$(package)_dependencies=openssl expat $(package)_dependencies=openssl expat
define $(package)_set_vars define $(package)_set_vars

1
src/assets/nodes.json
View file

@ -35,7 +35,6 @@
"node.majesticbank.at:18089", "node.majesticbank.at:18089",
"xmr-node.cakewallet.com:18081", "xmr-node.cakewallet.com:18081",
"singapore.node.xmr.pm:18089", "singapore.node.xmr.pm:18089",
"nodes.hashvault.pro:18081",
"node.xmr.ru:18081", "node.xmr.ru:18081",
"node.monerodevs.org:18089", "node.monerodevs.org:18089",
"node2.monerodevs.org:18089", "node2.monerodevs.org:18089",

2
src/dialog/OutputSweepDialog.cpp
View file

@ -15,7 +15,7 @@ OutputSweepDialog::OutputSweepDialog(QWidget *parent, quint64 amount)
connect(ui->checkBox_churn, &QCheckBox::toggled, [&](bool toggled){ connect(ui->checkBox_churn, &QCheckBox::toggled, [&](bool toggled){
ui->lineEdit_address->setEnabled(!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, [&](){ connect(ui->buttonBox, &QDialogButtonBox::accepted, [&](){

2
src/libwalletqt/Wallet.cpp
View file

@ -901,7 +901,7 @@ void Wallet::createTransactionMultiDest(const QVector<QString> &addresses, const
void Wallet::sweepOutputs(const QVector<QString> &keyImages, QString address, bool churn, int outputs, int feeLevel) { void Wallet::sweepOutputs(const QVector<QString> &keyImages, QString address, bool churn, int outputs, int feeLevel) {
if (churn) { if (churn) {
address = this->address(0, 0); address = this->address(m_currentSubaddressAccount, 0);
} }
qInfo() << "Creating transaction"; qInfo() << "Creating transaction";