VextaProject/ Vexta
Vexta Vexta-CPU-Miner Vexta-Android-Wallet
Watch
1
0
Fork
You've already forked Vexta
 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #3 from VextaProject/wallet-dandelion-fix

Browse source 
wallet: relay reaccepted transactions through Dandelion
This commit is contained in:
Capri 2026-08-11 00:40:33 +01:00 • committed by GitHub
commit 9770bcc2dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,7 +1,7 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_IS_RELEASE, true) define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2026) define(_COPYRIGHT_YEAR, 2026)

11
src/qt/sendcoinsdialog.cpp
View file

@ -845,13 +845,10 @@ void SendCoinsDialog::updateSmartFeeLabel()
ui->labelSmartFee->setText(DigiByteUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kvB"); ui->labelSmartFee->setText(DigiByteUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kvB");
if (reason == FeeReason::FALLBACK) { if (reason == FeeReason::FALLBACK) {
ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...) ui->labelSmartFee2->show();
ui->labelFeeEstimation->setText(""); ui->labelSmartFee2->setText(tr("(Using Vexta recommended fallback fee)"));
ui->fallbackFeeWarningLabel->setVisible(true); ui->labelFeeEstimation->setText(tr("Recommended fee is being used automatically."));
int lightness = ui->fallbackFeeWarningLabel->palette().color(QPalette::WindowText).lightness(); ui->fallbackFeeWarningLabel->setVisible(false);
QColor warning_colour(255 - (lightness / 5), 176 - (lightness / 3), 48 - (lightness / 14));
ui->fallbackFeeWarningLabel->setStyleSheet("QLabel { color: " + warning_colour.name() + "; }");
ui->fallbackFeeWarningLabel->setIndent(GUIUtil::TextWidth(QFontMetrics(ui->fallbackFeeWarningLabel->font()), "x"));
} }
else else
{ {

2
src/wallet/wallet.cpp
View file

@ -1712,7 +1712,7 @@ void CWallet::ReacceptWalletTransactions()
for (const std::pair<const int64_t, CWalletTx*>& item : mapSorted) { for (const std::pair<const int64_t, CWalletTx*>& item : mapSorted) {
CWalletTx& wtx = *(item.second); CWalletTx& wtx = *(item.second);
std::string unused_err_string; std::string unused_err_string;
wtx.SubmitMemoryPoolAndRelay(unused_err_string, false); wtx.SubmitMemoryPoolAndRelay(unused_err_string, true);
} }
} }

4
src/wallet/wallet.h
View file

@ -67,11 +67,11 @@ std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, cons
//! -paytxfee default //! -paytxfee default
constexpr CAmount DEFAULT_PAY_TX_FEE = 0; constexpr CAmount DEFAULT_PAY_TX_FEE = 0;
//! -fallbackfee default //! -fallbackfee default
static const CAmount DEFAULT_FALLBACK_FEE = 0; static const CAmount DEFAULT_FALLBACK_FEE = 100000;
//! -discardfee default //! -discardfee default
static const CAmount DEFAULT_DISCARD_FEE = 10000; static const CAmount DEFAULT_DISCARD_FEE = 10000;
//! -mintxfee default //! -mintxfee default
static const CAmount DEFAULT_TRANSACTION_MINFEE = 10000000; static const CAmount DEFAULT_TRANSACTION_MINFEE = 100000;
/** /**
* maximum fee increase allowed to do partial spend avoidance, even for nodes with this feature disabled by default * maximum fee increase allowed to do partial spend avoidance, even for nodes with this feature disabled by default
* *