Skip to content

fix(qt): drop zero fraction from collateral amounts in masternode wizard #7640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thephez wants to merge 1 commit into
base: develop
Choose a base branch
from
+21 −12
Open

fix(qt): drop zero fraction from collateral amounts in masternode wizard #7640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/qt/masternodewizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,19 @@ QVBoxLayout* MakeBlock(QVBoxLayout* page_layout)
return block;
}

QString FormatAmount(const WalletModel* wallet_model, CAmount amount)
//! Formats collateral amounts, which are whole coins in every display unit, so
//! a zero fraction is dropped entirely ("1 000.00000000 DASH" -> "1 000 DASH").
QString FormatCollateralAmount(const WalletModel* wallet_model, CAmount amount)
{
const auto unit{wallet_model && wallet_model->getOptionsModel() ?
wallet_model->getOptionsModel()->getDisplayUnit() :
BitcoinUnits::Unit::DASH};
return BitcoinUnits::formatWithUnit(unit, amount, /*plussign=*/false, BitcoinUnits::SeparatorStyle::ALWAYS);
QString str{BitcoinUnits::format(unit, amount, /*plussign=*/false, BitcoinUnits::SeparatorStyle::ALWAYS)};
const int decimals{BitcoinUnits::decimals(unit)};
if (decimals > 0 && amount % BitcoinUnits::factor(unit) == 0) {
str.chop(decimals + 1);
}
Comment on lines +113 to +117

@thepastaclaw thepastaclaw Aug 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Suggestion: Add automated coverage for collateral formatting across display units

No automated test asserts the new trimming behavior. Extend the existing MasternodeWidgetTests coverage to construct the wizard with DASH, mDASH, uDASH, and duffs selected, then verify the regular and EvoNode collateral labels. This directly protects the unit-dependent decimals() and factor() logic, including the zero-decimal path, instead of relying solely on a visual check of the default testnet unit.

source: ['codex']

@thephez thephez Aug 26, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PastaPastaPasta do you want tests for this?

return str + QLatin1Char(' ') + BitcoinUnits::name(unit);
}
} // anonymous namespace

Expand Down Expand Up @@ -235,7 +242,8 @@ QWidget* RegisterMasternodeWizard::createTypePage()
layout->addWidget(MakeTitle(tr("Masternode type"), page));

m_type_regular = new QRadioButton(
tr("Masternode — %1 collateral").arg(FormatAmount(m_walletModel, GetMnType(MnType::Regular).collat_amount)),
tr("Masternode — %1 collateral")
.arg(FormatCollateralAmount(m_walletModel, GetMnType(MnType::Regular).collat_amount)),
page);
m_type_regular->setChecked(true);
auto regular_card{makeOptionCard(page, m_type_regular,
Expand All @@ -244,7 +252,8 @@ QWidget* RegisterMasternodeWizard::createTypePage()
layout->addWidget(regular_card.card);

m_type_evo = new QRadioButton(
tr("EvoNode — %1 collateral").arg(FormatAmount(m_walletModel, GetMnType(MnType::Evo).collat_amount)), page);
tr("EvoNode — %1 collateral").arg(FormatCollateralAmount(m_walletModel, GetMnType(MnType::Evo).collat_amount)),
page);
auto evo_card{makeOptionCard(page, m_type_evo,
tr("Additionally hosts Dash Platform, has four times the voting weight and earns a "
"larger share of rewards. Requires a Platform node ID and extra services."))};
Expand Down Expand Up @@ -952,7 +961,7 @@ void RegisterMasternodeWizard::enterPage(Page page)
m_fee_explain->setText(
tr("The selected address funds the %1 collateral plus the transaction fee. The exact fee is "
"calculated from your wallet settings when you register, and change returns to this address.")
.arg(FormatAmount(m_walletModel, collateralAmount())));
.arg(FormatCollateralAmount(m_walletModel, collateralAmount())));
} else {
m_fee_explain->setText(tr("The selected address pays the transaction fee."));
}
Expand Down Expand Up @@ -984,7 +993,7 @@ bool RegisterMasternodeWizard::validatePage(Page page, QString& err)
if (m_col_utxo_combo->currentIndex() < 0) {
err = tr("This wallet has no unspent output of exactly %1. Fund the collateral from the wallet "
"instead.")
.arg(FormatAmount(m_walletModel, collateralAmount()));
.arg(FormatCollateralAmount(m_walletModel, collateralAmount()));
}
} else {
const QString txid{m_col_txid->text().trimmed()};
Expand Down Expand Up @@ -1080,7 +1089,7 @@ bool RegisterMasternodeWizard::validatePage(Page page, QString& err)
err = isFundCollateral() ?
tr("No spendable wallet address holds the %1 collateral amount. The selected address must "
"also have enough for the fee calculated when you register.")
.arg(FormatAmount(m_walletModel, collateralAmount())) :
.arg(FormatCollateralAmount(m_walletModel, collateralAmount())) :
tr("No spendable wallet address has a positive balance available to pay the transaction "
"fee.");
}
Expand Down Expand Up @@ -1294,7 +1303,7 @@ void RegisterMasternodeWizard::refreshCollateralCandidates(const std::set<COutPo
m_col_utxo_none->setVisible(!have_candidates);
m_col_utxo_none->setText(tr("This wallet has no unspent output of exactly %1 with a confirmation. Send the "
"collateral from this wallet instead, or reference one held elsewhere.")
.arg(FormatAmount(m_walletModel, collateralAmount())));
.arg(FormatCollateralAmount(m_walletModel, collateralAmount())));
}

int RegisterMasternodeWizard::reviewLabelWidth(const QWidget* card) const
Expand Down Expand Up @@ -1387,7 +1396,7 @@ void RegisterMasternodeWizard::populateReview()
}

begin_section(tr("Collateral"));
row(tr("Amount"), FormatAmount(m_walletModel, collateralAmount()));
row(tr("Amount"), FormatCollateralAmount(m_walletModel, collateralAmount()));
if (isFundCollateral()) {
row(tr("Destination"), collateralAddress(), /*monospace=*/true);
row(tr("Source"), tr("This wallet sends it as part of the registration"));
Expand Down Expand Up @@ -1542,14 +1551,14 @@ bool RegisterMasternodeWizard::confirmBroadcast()
QString consequence;
if (isFundCollateral()) {
consequence = tr("This transaction creates %1 of collateral from this wallet and registers the %2.")
.arg(FormatAmount(m_walletModel, collateralAmount()), node_type);
.arg(FormatCollateralAmount(m_walletModel, collateralAmount()), node_type);
} else if (isExternalCollateral()) {
consequence = tr("This transaction registers the external %1 collateral and makes it the collateral for this "
"%2.")
.arg(FormatAmount(m_walletModel, collateralAmount()), node_type);
.arg(FormatCollateralAmount(m_walletModel, collateralAmount()), node_type);
} else {
consequence = tr("This transaction registers and locks the wallet's %1 collateral output for this %2.")
.arg(FormatAmount(m_walletModel, collateralAmount()), node_type);
.arg(FormatCollateralAmount(m_walletModel, collateralAmount()), node_type);
}
consequence += tr(
" The network fee is calculated from the selected fee source using the wallet's current fee settings.");
Expand Down
Loading