Skip to content

Release: develop -> main #3331

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

Merged
TaprootFreak merged 2 commits into from
Mar 3, 2026
Merged

Release: develop -> main #3331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d59eb4
Fix negative plus balance from unfiltered Scrypt pending amounts (#3330)
TaprootFreak Mar 3, 2026
2bc3dcc
Improve fix: Clamp totalPlusPending instead of individual components …
TaprootFreak Mar 3, 2026
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
15 changes: 14 additions & 1 deletion src/subdomains/supporting/log/log-job.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ export class LogJobService {
}

// total pending balance
const totalPlusPending =
let totalPlusPending =
cryptoInput +
exchangeOrder +
bridgeOrder +
Expand All @@ -803,6 +803,19 @@ export class LogJobService {
(useUnfilteredTx ? fromScryptUnfiltered : fromScrypt) +
(useUnfilteredTx ? toScryptUnfiltered : toScrypt);

// Clamp totalPlusPending to prevent negative plus balances
// This catches any negative values from unfiltered Kraken/Scrypt or other components
if (totalPlusPending < 0) {
errors.push(`totalPlusPending < 0`);
this.logger.verbose(
`Error in financial log, totalPlusPending < 0 for asset: ${curr.id}, totalPlusPending: ${totalPlusPending}. ` +
`Components: cryptoInput=${cryptoInput}, exchangeOrder=${exchangeOrder}, bridgeOrder=${bridgeOrder}, ` +
`olky=${pendingOlkyYapealAmount}, kraken=${useUnfilteredTx ? fromKrakenUnfiltered : fromKraken}+${useUnfilteredTx ? toKrakenUnfiltered : toKraken}, ` +
`scrypt=${useUnfilteredTx ? fromScryptUnfiltered : fromScrypt}+${useUnfilteredTx ? toScryptUnfiltered : toScrypt}`,
);
totalPlusPending = 0;
}

const totalPlus = liquidity + totalPlusPending + (totalCustomBalance ?? 0);

// minus
Expand Down
Loading