diff --git a/src/services/lnd/lnd.ts b/src/services/lnd/lnd.ts index f2fdcdd8..44129bae 100644 --- a/src/services/lnd/lnd.ts +++ b/src/services/lnd/lnd.ts @@ -298,7 +298,7 @@ export default class { return case Payment_PaymentStatus.SUCCEEDED: this.log("invoice payment succeded", Number(payment.valueSat)) - res({ feeSat: Number(payment.feeSat), valueSat: Number(payment.valueSat), paymentPreimage: payment.paymentPreimage }) + res({ feeSat: Math.ceil(Number(payment.feeMsat) / 1000), valueSat: Number(payment.valueSat), paymentPreimage: payment.paymentPreimage }) } }) }) diff --git a/src/services/main/watchdog.ts b/src/services/main/watchdog.ts index 8a64eec1..257e2614 100644 --- a/src/services/main/watchdog.ts +++ b/src/services/main/watchdog.ts @@ -74,10 +74,9 @@ export class Watchdog { this.log(Number(walletBalance.confirmedBalance), "sats in chain wallet") const channelsBalance = await this.lnd.GetChannelBalance() getLogger({ component: "debugLndBalancev3" })({ w: walletBalance, c: channelsBalance, u: usersTotal, f: this.accumulatedHtlcFees }) - - const localChannelsBalance = Number(channelsBalance.localBalance?.sat || 0) - const unsettledLocalBalance = Number(channelsBalance.unsettledLocalBalance?.sat || 0) - return Number(walletBalance.confirmedBalance) + localChannelsBalance + unsettledLocalBalance + const totalLightningBalanceMsats = (channelsBalance.localBalance?.msat || 0n) + (channelsBalance.unsettledLocalBalance?.msat || 0n) + const totalLightningBalance = Math.ceil(Number(totalLightningBalanceMsats) / 1000) + return Number(walletBalance.confirmedBalance) + totalLightningBalance } checkBalanceUpdate = (deltaLnd: number, deltaUsers: number) => {