mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 22:25:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Disable lightning payments histogram (#6518)

Browse source
This commit is contained in:
Nicolas Dorier 2024-12-23 18:04:07 +09:00 • committed by GitHub
parent 08835895e9
commit 76a880a30e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
BTCPayServer.Tests/GreenfieldAPITests.cs
View file

@ -3029,17 +3029,18 @@ namespace BTCPayServer.Tests
var info = await client.GetLightningNodeInfo(user.StoreId, "BTC");
Assert.Single(info.NodeURIs);
Assert.NotEqual(0, info.BlockHeight);
// balance
await TestUtils.EventuallyAsync(async () =>
{
var balance = await client.GetLightningNodeBalance(user.StoreId, "BTC");
var histogram = await client.GetLightningNodeHistogram(user.StoreId, "BTC");
var localBalance = balance.OffchainBalance.Local.ToDecimal(LightMoneyUnit.BTC);
Assert.Equal(histogram.Balance, histogram.Series.Last());
Assert.Equal(localBalance, histogram.Balance);
Assert.Equal(localBalance, histogram.Series.Last());
});
// Disable for now see #6518
//// balance
//await TestUtils.EventuallyAsync(async () =>
//{
// var balance = await client.GetLightningNodeBalance(user.StoreId, "BTC");
// var localBalance = balance.OffchainBalance.Local.ToDecimal(LightMoneyUnit.BTC);
// var histogram = await client.GetLightningNodeHistogram(user.StoreId, "BTC");
// Assert.Equal(histogram.Balance, histogram.Series.Last());
// Assert.Equal(localBalance, histogram.Balance);
// Assert.Equal(localBalance, histogram.Series.Last());
//});
// As admin, can use the internal node through our store.
await user.MakeAdmin(true);

49
BTCPayServer/Services/LightningHistogramService.cs
View file

@ -27,52 +27,9 @@ public class LightningHistogramService
var ticks = (to - from).Ticks;
var interval = TimeSpan.FromTicks(ticks / pointCount);
try
{
// general balance
var lnBalance = await lightningClient.GetBalance(cancellationToken);
var total = lnBalance.OffchainBalance.Local;
var totalBtc = total.ToDecimal(LightMoneyUnit.BTC);
// prepare transaction data
var lnInvoices = await lightningClient.ListInvoices(cancellationToken);
var lnPayments = await lightningClient.ListPayments(cancellationToken);
var lnTransactions = lnInvoices
.Where(inv => inv.Status == LightningInvoiceStatus.Paid && inv.PaidAt >= from)
.Select(inv => new LnTx { Amount = inv.Amount.ToDecimal(LightMoneyUnit.BTC), Settled = inv.PaidAt.GetValueOrDefault() })
.Concat(lnPayments
.Where(pay => pay.Status == LightningPaymentStatus.Complete && pay.CreatedAt >= from)
.Select(pay => new LnTx { Amount = pay.Amount.ToDecimal(LightMoneyUnit.BTC) * -1, Settled = pay.CreatedAt.GetValueOrDefault() }))
.OrderByDescending(tx => tx.Settled)
.ToList();
// assemble graph data going backwards
var series = new List<decimal>(pointCount);
var labels = new List<DateTimeOffset>(pointCount);
var balance = totalBtc;
for (var i = pointCount; i > 0; i--)
{
var txs = lnTransactions.Where(t =>
t.Settled.Ticks >= from.Ticks + interval.Ticks * i &&
t.Settled.Ticks < from.Ticks + interval.Ticks * (i + 1));
var sum = txs.Sum(tx => tx.Amount);
balance -= sum;
series.Add(balance);
labels.Add(from + interval * (i - 1));
}
// reverse the lists
series.Reverse();
labels.Reverse();
return new HistogramData
{
Type = type,
Balance = totalBtc,
Series = series,
Labels = labels
};
}
catch (Exception)
{
return null;
}
// TODO: We can't just list all invoices and payments, we need to filter them by date
// but the client doesn't support that yet so let's just disable this for now. See #6518
return null;
}
private class LnTx