From 48a0a6c7e3202bb64f16630fb3518a50a5b2138d Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 10 Aug 2022 15:09:34 +0200
Subject: [PATCH 1/2] Convert short_id to integer id with clightning backend
 before returning the graph

---
 backend/src/api/common.ts                                  | 4 ----
 backend/src/api/explorer/channels.api.ts                   | 2 +-
 backend/src/api/lightning/clightning/clightning-convert.ts | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index 410d34a01..c97d02ba2 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -202,10 +202,6 @@ export class Common {
 
   /** Decodes a channel id returned by lnd as uint64 to a short channel id */
   static channelIntegerIdToShortId(id: string): string {
-    if (config.LIGHTNING.BACKEND === 'cln') {
-      return id;
-    }
-
     const n = BigInt(id);
     return [
       n >> 40n, // nth block
diff --git a/backend/src/api/explorer/channels.api.ts b/backend/src/api/explorer/channels.api.ts
index 55043197d..072449d60 100644
--- a/backend/src/api/explorer/channels.api.ts
+++ b/backend/src/api/explorer/channels.api.ts
@@ -420,7 +420,7 @@ class ChannelsApi {
       const result = await DB.query<ResultSetHeader>(`
         UPDATE channels
         SET status = 0
-        WHERE short_id NOT IN (
+        WHERE id NOT IN (
           ${graphChannelsIds.map(id => `"${id}"`).join(',')}
         )
         AND status != 2
diff --git a/backend/src/api/lightning/clightning/clightning-convert.ts b/backend/src/api/lightning/clightning/clightning-convert.ts
index 5df51aadc..2bdde31d3 100644
--- a/backend/src/api/lightning/clightning/clightning-convert.ts
+++ b/backend/src/api/lightning/clightning/clightning-convert.ts
@@ -90,7 +90,7 @@ async function buildFullChannel(clChannelA: any, clChannelB: any): Promise<ILigh
   const outputIdx = parts[2];
 
   return {
-    channel_id: clChannelA.short_channel_id,
+    channel_id: convertChannelId(clChannelA.short_channel_id),
     capacity: clChannelA.satoshis,
     last_update: lastUpdate,
     node1_policy: convertPolicy(clChannelA),
@@ -111,7 +111,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
   const outputIdx = parts[2];
 
   return {
-    channel_id: clChannel.short_channel_id,
+    channel_id: convertChannelId(clChannel.short_channel_id),
     capacity: clChannel.satoshis,
     last_update: clChannel.last_update ?? 0,
     node1_policy: convertPolicy(clChannel),

From dc7231537f7c2342c818f80f867e5bc3d6bde03e Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 10 Aug 2022 16:58:29 +0200
Subject: [PATCH 2/2] Refactor channel id conversion utils

---
 backend/src/api/common.ts                       | 17 ++++++++++++-----
 .../lightning/clightning/clightning-convert.ts  | 13 +++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index c97d02ba2..8d9de53c9 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -1,6 +1,5 @@
 import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
-import { convertChannelId } from './lightning/clightning/clightning-convert';
 export class Common {
   static nativeAssetId = config.MEMPOOL.NETWORK === 'liquidtestnet' ?
     '144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'
@@ -193,15 +192,23 @@ export class Common {
     date.setUTCMilliseconds(0);
   }
 
-  static channelShortIdToIntegerId(id: string): string {
-    if (config.LIGHTNING.BACKEND === 'lnd') {
-      return id;
+  static channelShortIdToIntegerId(channelId: string): string {
+    if (channelId.indexOf('x') === -1) { // Already an integer id
+      return channelId;
     }
-    return convertChannelId(id);
+    if (channelId.indexOf('/') !== -1) { // Topology import
+      channelId = channelId.slice(0, -2);
+    }
+    const s = channelId.split('x').map(part => BigInt(part));
+    return ((s[0] << 40n) | (s[1] << 16n) | s[2]).toString();
   }
 
   /** Decodes a channel id returned by lnd as uint64 to a short channel id */
   static channelIntegerIdToShortId(id: string): string {
+    if (id.indexOf('x') !== -1) { // Already a short id
+      return id;
+    }
+
     const n = BigInt(id);
     return [
       n >> 40n, // nth block
diff --git a/backend/src/api/lightning/clightning/clightning-convert.ts b/backend/src/api/lightning/clightning/clightning-convert.ts
index 2bdde31d3..15d8d8766 100644
--- a/backend/src/api/lightning/clightning/clightning-convert.ts
+++ b/backend/src/api/lightning/clightning/clightning-convert.ts
@@ -1,6 +1,7 @@
 import { ILightningApi } from '../lightning-api.interface';
 import FundingTxFetcher from '../../../tasks/lightning/sync-tasks/funding-tx-fetcher';
 import logger from '../../../logger';
+import { Common } from '../../common';
 
 /**
  * Convert a clightning "listnode" entry to a lnd node entry
@@ -70,14 +71,6 @@ export async function convertAndmergeBidirectionalChannels(clChannels: any[]): P
   return consolidatedChannelList;
 }
 
-export function convertChannelId(channelId): string {
-  if (channelId.indexOf('/') !== -1) {
-    channelId = channelId.slice(0, -2);
-  }
-  const s = channelId.split('x').map(part => BigInt(part));
-  return ((s[0] << 40n) | (s[1] << 16n) | s[2]).toString();
-}
-
 /**
  * Convert two clightning "getchannels" entries into a full a lnd "describegraph.edges" format
  * In this case, clightning knows the channel policy for both nodes
@@ -90,7 +83,7 @@ async function buildFullChannel(clChannelA: any, clChannelB: any): Promise<ILigh
   const outputIdx = parts[2];
 
   return {
-    channel_id: convertChannelId(clChannelA.short_channel_id),
+    channel_id: Common.channelShortIdToIntegerId(clChannelA.short_channel_id),
     capacity: clChannelA.satoshis,
     last_update: lastUpdate,
     node1_policy: convertPolicy(clChannelA),
@@ -111,7 +104,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
   const outputIdx = parts[2];
 
   return {
-    channel_id: convertChannelId(clChannel.short_channel_id),
+    channel_id: Common.channelShortIdToIntegerId(clChannel.short_channel_id),
     capacity: clChannel.satoshis,
     last_update: clChannel.last_update ?? 0,
     node1_policy: convertPolicy(clChannel),