Skip to content

fix: add fee retry loop to redemption flow (Bug #9) #389

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

Closed
JohnnyLawDGB wants to merge 1 commit into from
Closed

fix: add fee retry loop to redemption flow (Bug #9) #389

Show file tree
Hide file tree
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
26 changes: 24 additions & 2 deletions src/rpc/digidollar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,10 +1397,32 @@ RPCHelpMan redeemdigidollar()
LogPrintf("DigiDollar: Selected %d sats in fees from %d UTXOs for redemption\n",
selectedFeeTotal, redeemParams.feeUtxos.size());

DigiDollar::TxBuilderResult redeemResult = redeemBuilder.BuildRedemptionTransaction(redeemParams);
DigiDollar::TxBuilderResult redeemResult;
for (int attempt = 0; attempt < 3; ++attempt) {
redeemResult = redeemBuilder.BuildRedemptionTransaction(redeemParams);
LogPrintf("DigiDollar: BuildRedemptionTransaction attempt %d returned success=%d, error='%s'\n",
attempt + 1, redeemResult.success, redeemResult.error.c_str());
if (redeemResult.success) break;

// Only retry on fee shortfall errors
if (redeemResult.error.find("Insufficient fee inputs") == std::string::npos) {
throw JSONRPCError(RPC_WALLET_ERROR, "Failed to build redemption transaction: " + redeemResult.error);
}

// Retry with actual fee + 20% margin
CAmount retryFee = redeemResult.totalFees + (redeemResult.totalFees * 20 / 100);
LogPrintf("DigiDollar: Fee shortfall on attempt %d, retrying with %lld sats (actual %lld + 20%%)\n",
attempt + 1, static_cast<long long>(retryFee), static_cast<long long>(redeemResult.totalFees));
redeemParams.feeUtxos.clear();
feeAmounts.clear();
selectedFeeTotal = 0;
if (!dd_wallet->SelectFeeCoins(retryFee, redeemParams.feeUtxos, selectedFeeTotal, &feeAmounts, &exclude_utxos)) {
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient DGB balance for retry fee");
}
redeemParams.feeAmounts = feeAmounts;
}
if (!redeemResult.success) {
throw JSONRPCError(RPC_WALLET_ERROR, "Failed to build redemption transaction: " + redeemResult.error);
throw JSONRPCError(RPC_WALLET_ERROR, "Failed to build redemption transaction after 3 attempts: " + redeemResult.error);
}

LogPrintf("DigiDollar: Redemption transaction built with %d inputs:\n", redeemResult.tx.vin.size());
Expand Down
35 changes: 30 additions & 5 deletions src/wallet/digidollarwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4482,17 +4482,42 @@ bool DigiDollarWallet::RedeemDigiDollar(const uint256& dd_timelock_id, const CAm
exclude_utxos.size(), params.ddUtxos.size());

CAmount selectedFeeTotal = 0;
if (!SelectFeeCoins(estimatedFee, params.feeUtxos, selectedFeeTotal, nullptr, &exclude_utxos)) {
std::vector<CAmount> fee_amounts;
if (!SelectFeeCoins(estimatedFee, params.feeUtxos, selectedFeeTotal, &fee_amounts, &exclude_utxos)) {
LogPrintf("DigiDollar: Insufficient DGB balance for fees\n");
return false;
}
params.feeAmounts = fee_amounts;

LogPrintf("DigiDollar: CALLING BuildRedemptionTransaction now...\n");
auto result = builder.BuildRedemptionTransaction(params);
LogPrintf("DigiDollar: BuildRedemptionTransaction returned success=%d, error='%s'\n",
result.success, result.error.c_str());
DigiDollar::TxBuilderResult result;
for (int attempt = 0; attempt < 3; ++attempt) {
result = builder.BuildRedemptionTransaction(params);
LogPrintf("DigiDollar: BuildRedemptionTransaction attempt %d returned success=%d, error='%s'\n",
attempt + 1, result.success, result.error.c_str());
if (result.success) break;

// Only retry on fee shortfall errors
if (result.error.find("Insufficient fee inputs") == std::string::npos) {
LogPrintf("DigiDollar: Redemption transaction build failed (non-fee error) - %s\n", result.error);
return false;
}

// Retry with actual fee + 20% margin
CAmount retryFee = result.totalFees + (result.totalFees * 20 / 100);
LogPrintf("DigiDollar: Fee shortfall on attempt %d, retrying with %lld sats (actual %lld + 20%%)\n",
attempt + 1, static_cast<long long>(retryFee), static_cast<long long>(result.totalFees));
params.feeUtxos.clear();
fee_amounts.clear();
selectedFeeTotal = 0;
if (!SelectFeeCoins(retryFee, params.feeUtxos, selectedFeeTotal, &fee_amounts, &exclude_utxos)) {
LogPrintf("DigiDollar: Insufficient DGB balance for retry fee of %lld sats\n", static_cast<long long>(retryFee));
return false;
}
params.feeAmounts = fee_amounts;
}
if (!result.success) {
LogPrintf("DigiDollar: Redemption transaction build failed - %s\n", result.error);
LogPrintf("DigiDollar: Redemption transaction build failed after 3 attempts - %s\n", result.error);
return false;
}
LogPrintf("DigiDollar: BuildRedemptionTransaction SUCCESS, transaction has %d inputs and %d outputs\n",
Expand Down
Loading