GlcoinCore/balanceofsatoshis
1
0
Fork 0
mirror of https://github.com/alexbosworth/balanceofsatoshis.git synced 2026-08-13 12:33:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge changes

Browse source
This commit is contained in:
Alex Bosworth 2022-08-15 12:05:05 -07:00
parent a8fa4bce15
commit 018bb31db6
No known key found for this signature in database
GPG key ID: E80D2F3F311FD87E
6 changed files with 69 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
display/sums_for_segment.js
View file

@ -3,7 +3,7 @@ const moment = require('moment');
/** Sums for segment for a chart
{
[end_date]: <End Date YYYY-MM-DD String>
[end_date]: <End Date ISO 8601 String>
measure: <Measure Time Period String>
records: [{
date: <Created At ISO 8601 Date String>

2
routing/fees_for_segment.js
View file

@ -6,7 +6,7 @@ const defaultSegmentBy = 'created_at';
{
[by]: <Segment By Attribute String>
[end]: <End Date String>
[end]: <End ISO 8601 Date String>
forwards: [{
created_at: <Created At ISO 8601 Date String>
fee: <Fee Tokens Number>

10
routing/get_chain_fees_chart.js
View file

@ -83,7 +83,7 @@ module.exports = (args, cbk) => {
return cbk();
}
if (args.start_date >= args.end_date) {
if (args.start_date > args.end_date) {
return cbk([400, 'ExpectedStartDateBeforeEndDateForChainFeesChart']);
}
@ -108,7 +108,7 @@ module.exports = (args, cbk) => {
return cbk();
}
return cbk(null, moment(args.end_date));
return cbk(null, moment(args.end_date).endOf('day'));
}],
// Calculate the start date
@ -168,7 +168,7 @@ module.exports = (args, cbk) => {
}],
// Total number of segments
segments: ['days', 'measure', ({days, measure}, cbk) => {
segments: ['days', 'end', 'measure', ({days, end, measure}, cbk) => {
switch (measure) {
case 'hour':
// Exit early when using full days
@ -176,7 +176,7 @@ module.exports = (args, cbk) => {
return cbk(null, hoursPerDay * days);
}
return cbk(null, hoursCount(moment(args.end_date), args.start_date));
return cbk(null, hoursCount(end, args.start_date));
case 'week':
return cbk(null, floor(days / daysPerWeek));
@ -231,9 +231,9 @@ module.exports = (args, cbk) => {
({end, measure, segments, transactions}, cbk) =>
{
return cbk(null, feesForSegment({
end,
measure,
segments,
end: !!end ? end.toISOString() : undefined,
forwards: transactions,
}));
}],

13
routing/get_fees_chart.js
View file

@ -91,7 +91,7 @@ module.exports = (args, cbk) => {
return cbk();
}
if (args.start_date >= args.end_date) {
if (args.start_date > args.end_date) {
return cbk([400, 'ExpectedStartDateBeforeEndDateForFeesChart']);
}
@ -244,7 +244,7 @@ module.exports = (args, cbk) => {
}],
// Total number of segments
segments: ['days', 'measure', ({days, measure}, cbk) => {
segments: ['days', 'end', 'measure', ({days, end, measure}, cbk) => {
switch (measure) {
case 'hour':
// Exit early when using full days
@ -252,7 +252,7 @@ module.exports = (args, cbk) => {
return cbk(null, hoursPerDay * days);
}
return cbk(null, hoursCount(moment(args.end_date), args.start_date));
return cbk(null, hoursCount(end, args.start_date));
case 'week':
return cbk(null, floor(days / daysPerWeek));
@ -270,7 +270,12 @@ module.exports = (args, cbk) => {
'segments',
({end, forwards, measure, segments}, cbk) =>
{
return cbk(null, feesForSegment({end, forwards, measure, segments}));
return cbk(null, feesForSegment({
forwards,
measure,
segments,
end: !!end ? end.toISOString() : undefined,
}));
}],
// Summary description of the fees earned

77
routing/get_fees_paid.js
View file

@ -90,15 +90,15 @@ module.exports = (args, cbk) => {
}
if (!!args.end_date && !args.start_date) {
return cbk([400, 'ExpectedStartDateToRangeToEndDateForFeesChart']);
return cbk([400, 'ExpectedStartDateToRangeToEndDateForPaidChart']);
}
if (!isDate(args.start_date)) {
return cbk([400, 'ExpectedValidDateTypeForFeesChartStartDate']);
return cbk([400, 'ExpectedValidDateTypeForPaidChartStartDate']);
}
if (!moment(args.start_date).isValid()) {
return cbk([400, 'ExpectedValidStartDateForFeesChartEndDate']);
return cbk([400, 'ExpectedValidStartDateForPaidChartEndDate']);
}
if (parseDate(args.start_date) > now()) {
@ -110,16 +110,16 @@ module.exports = (args, cbk) => {
return cbk();
}
if (args.start_date >= args.end_date) {
return cbk([400, 'ExpectedStartDateBeforeEndDateForFeesChart']);
if (args.start_date > args.end_date) {
return cbk([400, 'ExpectedStartDateBeforeEndDateForPaidChart']);
}
if (!isDate(args.end_date)) {
return cbk([400, 'ExpectedValidDateFormatForFeesChartEndDate']);
return cbk([400, 'ExpectedValidDateFormatForPaidChartEndDate']);
}
if (!moment(args.end_date).isValid()) {
return cbk([400, 'ExpectedValidEndDateForFeesChartEndDate']);
return cbk([400, 'ExpectedValidEndDateForPaidChartEndDate']);
}
if (parseDate(args.end_date) > now()) {
@ -129,24 +129,6 @@ module.exports = (args, cbk) => {
return cbk();
},
// End date for getting fee earnings
end: ['validate', ({}, cbk) => {
if (!args.end_date) {
return cbk();
}
return cbk(null, moment(args.end_date).endOf('day'));
}],
// Calculate the start date
start: ['validate', ({}, cbk) => {
if (!!args.start_date) {
return cbk(null, moment(args.start_date));
}
return cbk(null, moment().subtract(args.days || defaultDays, 'days'));
}],
// Determine how many days to chart over
days: ['validate', ({}, cbk) => {
// Exit early when not using a date range
@ -157,6 +139,15 @@ module.exports = (args, cbk) => {
return cbk(null, daysBetween(args.end_date, args.start_date));
}],
// End date for getting fee earnings
end: ['validate', ({}, cbk) => {
if (!args.end_date) {
return cbk();
}
return cbk(null, moment(args.end_date).endOf('day'));
}],
// Get channels
getChannels: ['validate', ({}, cbk) => {
return asyncMap(args.lnds, (lnd, cbk) => {
@ -256,6 +247,15 @@ module.exports = (args, cbk) => {
});
}],
// Calculate the start date
start: ['validate', ({}, cbk) => {
if (!!args.start_date) {
return cbk(null, moment(args.start_date));
}
return cbk(null, moment().subtract(args.days || defaultDays, 'days'));
}],
// Segment measure
measure: ['days', ({days}, cbk) => {
if (days > maxChartDays) {
@ -313,7 +313,15 @@ module.exports = (args, cbk) => {
const payments = getPayments
.filter(payment => payment.is_confirmed !== false)
.filter(payment => payment.confirmed_at > start.toISOString())
.filter(payment => !!args.end_date ? (payment.confirmed_at <= end.toISOString()) : payment)
.filter(payment => {
// Exit early when there is no end date
if (!args.end_date) {
return true;
}
// The payment should have confirmed within the end range
return payment.confirmed_at <= end.toISOString();
})
.map(payment => {
const attempts = payment.attempts.filter(attempt => {
// Only consider attempts that confirmed
@ -494,7 +502,7 @@ module.exports = (args, cbk) => {
}],
// Total number of segments
segments: ['days', 'measure', ({days, measure}, cbk) => {
segments: ['days', 'end', 'measure', ({days, end, measure}, cbk) => {
switch (measure) {
case 'hour':
// Exit early when using full days
@ -502,7 +510,7 @@ module.exports = (args, cbk) => {
return cbk(null, hoursPerDay * days);
}
return cbk(null, hoursCount(moment(args.end_date), args.start_date));
return cbk(null, hoursCount(end, args.start_date));
case 'week':
return cbk(null, floor(days / daysPerWeek));
@ -524,12 +532,19 @@ module.exports = (args, cbk) => {
// Payments activity aggregated
sum: [
'end',
'forwards',
'measure',
'segments',
({forwards, measure, segments}, cbk) =>
({end, forwards, measure, segments}, cbk) =>
{
return cbk(null, feesForSegment({by, forwards, measure, segments, end: args.end_date}));
return cbk(null, feesForSegment({
by,
forwards,
measure,
segments,
end: !!end ? end.toISOString() : undefined,
}));
}],
// Summary description of the fees paid
@ -544,7 +559,7 @@ module.exports = (args, cbk) => {
{
const duration = `Fees paid in ${sum.fees.length} ${measure}s`;
const paid = tokensAsBigUnit(total);
const since = `since ${start.calendar().toLowerCase()}`;
const since = `from ${start.calendar().toLowerCase()}`;
const to = !!end ? ` to ${end.calendar().toLowerCase()}` : '';
return cbk(null, `${duration} ${since}${to}. Total: ${paid}`);

14
wallets/get_received_chart.js
View file

@ -81,7 +81,7 @@ module.exports = (args, cbk) => {
return cbk();
}
if (args.start_date >= args.end_date) {
if (args.start_date > args.end_date) {
return cbk([400, 'ExpectedStartDateBeforeEndDateToGetFeesChart']);
}
@ -106,21 +106,21 @@ module.exports = (args, cbk) => {
return cbk();
}
return cbk(null, moment(args.end_date));
return cbk(null, moment(args.end_date).endOf('day'));
}],
// Segment measure
segment: ['validate', ({}, cbk) => {
segment: ['end', ({end}, cbk) => {
// Exit early when not looking at a date range
if (!args.start_date && !args.end_date) {
return cbk(null, segmentMeasure({days: args.days || defaultDays}));
}
const days = daysBetween(args.end_date, args.start_date);
const days = daysBetween(end, args.start_date);
return cbk(null, segmentMeasure({
days,
end: args.end_date,
end: !!end ? end.toISOString() : undefined,
start: args.start_date,
}));
}],
@ -199,9 +199,9 @@ module.exports = (args, cbk) => {
}],
// Earnings aggregated
sum: ['getReceived', 'segment', ({getReceived, segment}, cbk) => {
sum: ['end', 'getReceived', 'segment', ({end, getReceived, segment}, cbk) => {
return cbk(null, sumsForSegment({
end: args.end_date,
end: !!end ? end.toISOString() : undefined,
measure: segment.measure,
records: getReceived.map(invoice => {
return {date: invoice.confirmed_at, tokens: invoice.received};