Skip to content

fix: mint UTXO auto-consolidation fails when margin exceeds balance #393

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
JohnnyLawDGB wants to merge 1 commit into
base: feature/digidollar-v1
Choose a base branch
from
+14 −13
Open

fix: mint UTXO auto-consolidation fails when margin exceeds balance #393

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
27 changes: 14 additions & 13 deletions src/rpc/digidollar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,24 +983,24 @@ RPCHelpMan mintdigidollar()
LogPrintf("DigiDollar RPC Mint: UTXO fragmentation detected (%zu UTXOs). Auto-consolidating...\n",
availableUtxos.size());

// Calculate consolidation target: collateral + fees + 10% margin
CAmount consolidationTarget = result.collateralRequired +
(result.collateralRequired / 10) + 10000000; // +10% + 0.1 DGB fee buffer

// Cap at available balance
// Check if total balance covers collateral (ignore margin — the
// consolidation itself reduces input count, not total value)
CAmount totalAvailable = 0;
for (const auto& [outpoint, value] : utxoValues) {
totalAvailable += value;
}
if (consolidationTarget > totalAvailable) {
// Need collateral + estimated fees (~0.2 DGB buffer)
CAmount minRequired = result.collateralRequired + 20000000;
if (totalAvailable < minRequired) {
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS,
strprintf("Insufficient funds for collateral. Need %.2f DGB, have %.2f DGB across %zu small UTXOs.",
strprintf("Insufficient funds for collateral. Need %.2f DGB, have %.2f DGB.",
result.collateralRequired / 100000000.0,
totalAvailable / 100000000.0,
availableUtxos.size()));
totalAvailable / 100000000.0));
}

// Create consolidation transaction using wallet's standard coin selection
// Consolidate: send-to-self sweeping as many UTXOs as possible
// into one large output. Use subtractfeefromamount so the
// consolidation always succeeds regardless of margin.
CTxDestination consolidationDest;
{
LOCK(pwallet->cs_wallet);
Expand All @@ -1011,8 +1011,9 @@ RPCHelpMan mintdigidollar()
consolidationDest = *op_dest;
}

// Send entire balance to self, fee subtracted from amount
wallet::CCoinControl coin_control;
wallet::CRecipient recipient{consolidationDest, consolidationTarget, false};
wallet::CRecipient recipient{consolidationDest, totalAvailable, /*subtract_fee=*/true};
std::vector<wallet::CRecipient> recipients = {recipient};

auto consolidation_result = wallet::CreateTransaction(*pwallet, recipients, /*change_pos=*/-1, coin_control, /*sign=*/true);
Expand All @@ -1030,8 +1031,8 @@ RPCHelpMan mintdigidollar()
pwallet->CommitTransaction(consolidation_tx, {}, {});
}

LogPrintf("DigiDollar RPC Mint: Consolidation tx broadcast: %s (%.2f DGB)\n",
consolidation_txid, consolidationTarget / 100000000.0);
LogPrintf("DigiDollar RPC Mint: Consolidation tx broadcast: %s (swept %.2f DGB)\n",
consolidation_txid, totalAvailable / 100000000.0);

// Re-gather UTXOs (now includes unconfirmed consolidation output)
availableUtxos.clear();
Expand Down
Loading