diff --git a/src/services/lnd/index.ts b/src/services/lnd/index.ts index d4d5f7fe..2e114c5f 100644 --- a/src/services/lnd/index.ts +++ b/src/services/lnd/index.ts @@ -1,5 +1,5 @@ import * as Types from '../../../proto/autogenerated/ts/types.js' -import { GetInfoResponse, NewAddressResponse, AddInvoiceResponse, PayReq, Payment, SendCoinsResponse, EstimateFeeResponse, TransactionDetails, ClosedChannelsResponse, ListChannelsResponse, PendingChannelsResponse, ListInvoiceResponse, ListPaymentsResponse } from '../../../proto/lnd/lightning.js' +import { GetInfoResponse, NewAddressResponse, AddInvoiceResponse, PayReq, Payment, SendCoinsResponse, EstimateFeeResponse, TransactionDetails, ClosedChannelsResponse, ListChannelsResponse, PendingChannelsResponse, ListInvoiceResponse, ListPaymentsResponse, ChannelBalanceResponse } from '../../../proto/lnd/lightning.js' import { EnvMustBeNonEmptyString, EnvMustBeInteger, EnvCanBeBoolean } from '../helpers/envParser.js' import { AddressPaidCb, BalanceInfo, DecodedInvoice, HtlcCb, Invoice, InvoicePaidCb, LndSettings, NewBlockCb, NodeInfo, PaidInvoice } from './settings.js' import LND from './lnd.js' @@ -32,6 +32,7 @@ export interface LightningHandler { ChannelBalance(): Promise<{ local: number, remote: number }> GetTransactions(startHeight: number): Promise GetBalance(): Promise + GetChannelBalance(): Promise ListClosedChannels(): Promise ListChannels(): Promise ListPendingChannels(): Promise diff --git a/src/services/lnd/lnd.ts b/src/services/lnd/lnd.ts index b8b7a96c..919322e3 100644 --- a/src/services/lnd/lnd.ts +++ b/src/services/lnd/lnd.ts @@ -317,6 +317,11 @@ export default class { return res.response } + async GetChannelBalance() { + const res = await this.lightning.channelBalance({}, DeadLineMetadata()) + return res.response + } + async GetBalance(): Promise { const wRes = await this.lightning.walletBalance({}, DeadLineMetadata()) const { confirmedBalance, unconfirmedBalance, totalBalance } = wRes.response diff --git a/src/services/lnd/mock.ts b/src/services/lnd/mock.ts index 17fd70c1..83806857 100644 --- a/src/services/lnd/mock.ts +++ b/src/services/lnd/mock.ts @@ -7,7 +7,7 @@ import * as Types from '../../../proto/autogenerated/ts/types.js' import { LightningClient } from '../../../proto/lnd/lightning.client.js' import { InvoicesClient } from '../../../proto/lnd/invoices.client.js' import { RouterClient } from '../../../proto/lnd/router.client.js' -import { GetInfoResponse, AddressType, NewAddressResponse, AddInvoiceResponse, Invoice_InvoiceState, PayReq, Payment_PaymentStatus, Payment, PaymentFailureReason, SendCoinsResponse, EstimateFeeResponse, TransactionDetails, ClosedChannelsResponse, ListChannelsResponse, PendingChannelsResponse, ListInvoiceResponse, ListPaymentsResponse } from '../../../proto/lnd/lightning.js' +import { GetInfoResponse, AddressType, NewAddressResponse, AddInvoiceResponse, Invoice_InvoiceState, PayReq, Payment_PaymentStatus, Payment, PaymentFailureReason, SendCoinsResponse, EstimateFeeResponse, TransactionDetails, ClosedChannelsResponse, ListChannelsResponse, PendingChannelsResponse, ListInvoiceResponse, ListPaymentsResponse, ChannelBalanceResponse } from '../../../proto/lnd/lightning.js' import { OpenChannelReq } from './openChannelReq.js'; import { AddInvoiceReq } from './addInvoiceReq.js'; import { PayInvoiceReq } from './payInvoiceReq.js'; @@ -35,7 +35,9 @@ export default class { this.invoicePaidCb(invoice, decoded.numSatoshis || amount, false) delete this.invoicesAwaiting[invoice] } - + GetChannelBalance(): Promise { + throw new Error("Method not implemented."); + } Stop() { } async Warmup() { } diff --git a/src/services/main/watchdog.ts b/src/services/main/watchdog.ts index 3011c077..378cbf63 100644 --- a/src/services/main/watchdog.ts +++ b/src/services/main/watchdog.ts @@ -48,8 +48,11 @@ export class Watchdog { }, 1000 * 60) } + + getTotalLndBalance = async (usersTotal: number) => { const localLog = getLogger({ appName: "debugLndBalancev2" }) + getLogger({ appName: "debugChannelBalanceRpc" })(await this.lnd.GetChannelBalance()) const { confirmedBalance, channelsBalance } = await this.lnd.GetBalance() this.log(confirmedBalance, "sats in chain wallet") localLog({ c: channelsBalance, u: usersTotal })