fix: 🐛 forward report channels

server/helpers/getNodeFromChannel.ts

@@ -5,6 +5,7 @@ import {
   LndObject,
   GetChannelType,
   GetNodeType,
+  ChannelType,
 } from 'server/types/ln-service.types';
 
 const errorNode = {
@@ -15,24 +16,31 @@ const errorNode = {
 export const getNodeFromChannel = async (
   id: string,
   publicKey: string,
-  lnd: LndObject | null
+  lnd: LndObject | null,
+  closedChannel?: ChannelType
 ) => {
-  const [channelInfo, channelError] = await toWithError(
-    getChannel({
-      lnd,
-      id,
-    })
-  );
+  let partnerPublicKey: string;
 
-  if (channelError || !channelInfo) {
-    logger.verbose(`Error getting channel with id ${id}: %o`, channelError);
-    return errorNode;
-  }
+  if (closedChannel?.partner_public_key) {
+    partnerPublicKey = closedChannel.partner_public_key;
+  } else {
+    const [channelInfo, channelError] = await toWithError(
+      getChannel({
+        lnd,
+        id,
+      })
+    );
 
-  const partnerPublicKey =
-    (channelInfo as GetChannelType).policies[0].public_key !== publicKey
-      ? (channelInfo as GetChannelType).policies[0].public_key
-      : (channelInfo as GetChannelType).policies[1].public_key;
+    if (channelError || !channelInfo) {
+      logger.verbose(`Error getting channel with id ${id}: %o`, channelError);
+      return errorNode;
+    }
+
+    partnerPublicKey =
+      (channelInfo as GetChannelType).policies[0].public_key !== publicKey
+        ? (channelInfo as GetChannelType).policies[0].public_key
+        : (channelInfo as GetChannelType).policies[1].public_key;
+  }
 
   const [nodeInfo, nodeError] = await toWithError(
     getNode({

server/schema/widgets/resolvers/getForwardChannelsReport.ts

@@ -1,14 +1,14 @@
-import { getForwards, getWalletInfo } from 'ln-service';
+import { getForwards, getWalletInfo, getClosedChannels } from 'ln-service';
 import { subHours, subDays } from 'date-fns';
 import { sortBy } from 'underscore';
 import { ContextType } from 'server/types/apiTypes';
 import { getNodeFromChannel } from 'server/helpers/getNodeFromChannel';
 import { requestLimiter } from 'server/helpers/rateLimiter';
-
 import { to } from 'server/helpers/async';
 import {
   GetForwardsType,
   GetWalletInfoType,
+  GetClosedChannelsType,
 } from 'server/types/ln-service.types';
 import { countArray, countRoutes } from './helpers';
 
@@ -38,18 +38,26 @@ export const getForwardChannelsReport = async (
     startDate = subHours(endDate, 24);
   }
 
+  const closedChannels = await to<GetClosedChannelsType>(
+    getClosedChannels({
+      lnd,
+    })
+  );
+
   const getRouteAlias = (array: any[], publicKey: string) =>
     Promise.all(
       array.map(async channel => {
         const nodeAliasIn = await getNodeFromChannel(
           channel.in,
           publicKey,
-          lnd
+          lnd,
+          closedChannels?.channels.find(c => c.id === channel.in)
         );
         const nodeAliasOut = await getNodeFromChannel(
           channel.out,
           publicKey,
-          lnd
+          lnd,
+          closedChannels?.channels.find(c => c.id === channel.out)
         );
 
         return {
@@ -68,7 +76,8 @@ export const getForwardChannelsReport = async (
         const nodeAlias = await getNodeFromChannel(
           channel.name,
           publicKey,
-          lnd
+          lnd,
+          closedChannels?.channels.find(c => c.id === channel.name)
         );
         return {
           alias: nodeAlias.alias,

server/types/ln-service.types.ts

@@ -79,6 +79,8 @@ export type GetChannelType = {
   }[];
 };
 
+export type GetClosedChannelsType = { channels: ChannelType[] };
+
 export type GetChannelsType = { channels: ChannelType[] };
 
 export type GetForwardsType = { forwards: ForwardType[]; next?: string };