Archives
/
RTL
mirror of https://github.com/Ride-The-Lightning/RTL
2
0
Fork 0
Code Issues Releases Wiki Activity

LND Bug fix for Routing Fee Calculation

Browse Source 
LND Bug fix for Routing Fee Calculation
pull/1012/head
Shahana Farooqui 2 years ago
parent fdc99fb8c4
commit d25e25b434
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
backend/controllers/lnd/fees.js
Unescape Escape View File

@ -20,7 +20,7 @@ export const getFees = (req, res, next) => {
const month_start_time = (Math.round(start_date.getTime() / 1000));
const week_start_time = current_time - 604800;
const day_start_time = current_time - 86400;
return getAllForwardingEvents(req, month_start_time, current_time, 0, (history) => {
return getAllForwardingEvents(req, month_start_time, current_time, 0, 'fees', (history) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Forwarding History Received', data: history });
const daily_sum = history.forwarding_events.reduce((acc, curr) => ((curr.timestamp >= day_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
const weekly_sum = history.forwarding_events.reduce((acc, curr) => ((curr.timestamp >= week_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);

21
backend/controllers/lnd/switch.js
Unescape Escape View File

@ -4,10 +4,10 @@ import { Common } from '../../utils/common.js';
let options = null;
const logger = Logger;
const common = Common;
let responseData = { forwarding_events: [], last_offset_index: 0 };
const responseData = { switch: { forwarding_events: [], last_offset_index: 0 }, fees: { forwarding_events: [], last_offset_index: 0 } };
const num_max_events = 100;
export const forwardingHistory = (req, res, next) => {
getAllForwardingEvents(req, req.body.start_time, req.body.end_time, 0, (eventsResponse) => {
getAllForwardingEvents(req, req.body.start_time, req.body.end_time, 0, 'switch', (eventsResponse) => {
if (eventsResponse.error) {
res.status(eventsResponse.error.statusCode).json(eventsResponse);
}
@ -16,10 +16,10 @@ export const forwardingHistory = (req, res, next) => {
}
});
};
export const getAllForwardingEvents = (req, start, end, offset, callback) => {
export const getAllForwardingEvents = (req, start, end, offset, caller, callback) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Switch', msg: 'Getting Forwarding Events..' });
if (offset === 0) {
responseData = { forwarding_events: [], last_offset_index: 0 };
responseData[caller] = { forwarding_events: [], last_offset_index: 0 };
}
if (!req.session.selectedNode) {
const err = common.handleError({ message: 'Session Expired after a day\'s inactivity.', statusCode: 401 }, 'Balance', 'Get Balance Error', req.session.selectedNode);
@ -41,17 +41,18 @@ export const getAllForwardingEvents = (req, start, end, offset, callback) => {
return request.post(options).then((body) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Switch', msg: 'Forwarding Events Received', data: body });
if (body.forwarding_events) {
responseData.forwarding_events.push(...body.forwarding_events);
responseData[caller].forwarding_events.push(...body.forwarding_events);
responseData[caller].last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
}
if (!body.last_offset_index || body.last_offset_index < offset + num_max_events) {
responseData.last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
if (responseData.forwarding_events) {
responseData.forwarding_events = common.sortDescByKey(responseData.forwarding_events, 'timestamp');
responseData[caller].last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
if (responseData[caller].forwarding_events) {
responseData[caller].forwarding_events = common.sortDescByKey(responseData[caller].forwarding_events, 'timestamp');
}
return callback(responseData);
return callback(responseData[caller]);
}
else {
return getAllForwardingEvents(req, start, end, offset + num_max_events, callback);
return getAllForwardingEvents(req, start, end, offset + num_max_events, caller, callback);
}
}).catch((errRes) => {
const err = common.handleError(errRes, 'Switch', 'Get All Forwarding Events Error', req.session.selectedNode);

2
server/controllers/lnd/fees.ts
Unescape Escape View File

@ -19,7 +19,7 @@ export const getFees = (req, res, next) => {
const month_start_time = (Math.round(start_date.getTime() / 1000));
const week_start_time = current_time - 604800;
const day_start_time = current_time - 86400;
return getAllForwardingEvents(req, month_start_time, current_time, 0, (history) => {
return getAllForwardingEvents(req, month_start_time, current_time, 0, 'fees', (history) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Forwarding History Received', data: history });
const daily_sum = history.forwarding_events.reduce((acc, curr) => ((curr.timestamp >= day_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
const weekly_sum = history.forwarding_events.reduce((acc, curr) => ((curr.timestamp >= week_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);

21
server/controllers/lnd/switch.ts
Unescape Escape View File

@ -4,11 +4,11 @@ import { Common, CommonService } from '../../utils/common.js';
let options = null;
const logger: LoggerService = Logger;
const common: CommonService = Common;
let responseData = { forwarding_events: [], last_offset_index: 0 };
const responseData = { switch: { forwarding_events: [], last_offset_index: 0 }, fees: { forwarding_events: [], last_offset_index: 0 } };
const num_max_events = 100;
export const forwardingHistory = (req, res, next) => {
getAllForwardingEvents(req, req.body.start_time, req.body.end_time, 0, (eventsResponse) => {
getAllForwardingEvents(req, req.body.start_time, req.body.end_time, 0, 'switch', (eventsResponse) => {
if (eventsResponse.error) {
res.status(eventsResponse.error.statusCode).json(eventsResponse);
} else {
@ -17,9 +17,9 @@ export const forwardingHistory = (req, res, next) => {
});
};
export const getAllForwardingEvents = (req, start, end, offset, callback) => {
export const getAllForwardingEvents = (req, start, end, offset, caller, callback) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Switch', msg: 'Getting Forwarding Events..' });
if (offset === 0) { responseData = { forwarding_events: [], last_offset_index: 0 }; }
if (offset === 0) { responseData[caller] = { forwarding_events: [], last_offset_index: 0 }; }
if (!req.session.selectedNode) {
const err = common.handleError({ message: 'Session Expired after a day\'s inactivity.', statusCode: 401 }, 'Balance', 'Get Balance Error', req.session.selectedNode);
return callback({ message: err.message, error: err.error, statusCode: err.statusCode });
@ -35,16 +35,17 @@ export const getAllForwardingEvents = (req, start, end, offset, callback) => {
return request.post(options).then((body) => {
logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Switch', msg: 'Forwarding Events Received', data: body });
if (body.forwarding_events) {
responseData.forwarding_events.push(...body.forwarding_events);
responseData[caller].forwarding_events.push(...body.forwarding_events);
responseData[caller].last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
}
if (!body.last_offset_index || body.last_offset_index < offset + num_max_events) {
responseData.last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
if (responseData.forwarding_events) {
responseData.forwarding_events = common.sortDescByKey(responseData.forwarding_events, 'timestamp');
responseData[caller].last_offset_index = body.last_offset_index ? body.last_offset_index : 0;
if (responseData[caller].forwarding_events) {
responseData[caller].forwarding_events = common.sortDescByKey(responseData[caller].forwarding_events, 'timestamp');
}
return callback(responseData);
return callback(responseData[caller]);
} else {
return getAllForwardingEvents(req, start, end, offset + num_max_events, callback);
return getAllForwardingEvents(req, start, end, offset + num_max_events, caller, callback);
}
}).catch((errRes) => {
const err = common.handleError(errRes, 'Switch', 'Get All Forwarding Events Error', req.session.selectedNode);

Write Preview
Loading…
Cancel
Save