Merge pull request #419 from stakwork/feat/add-lightning-peer

Feat/add lightning peer
stakwork · Nov 28, 2024 · 83cf9e9 · 83cf9e9
2 parents 594eb21 + a0d5dd2
commit 83cf9e9
Show file tree

Hide file tree

Showing 19 changed files with 429 additions and 31 deletions.
diff --git a/app/src/api/cln.ts b/app/src/api/cln.ts
@@ -86,6 +86,11 @@ export async function create_channel(
   return await clnCmd("AddChannel", tag, { pubkey, amount, satsperbyte });
 }
 
-export async function add_peer(tag: string, pubkey: string, host: string) {
-  return await clnCmd("AddPeer", tag, { pubkey, host });
+export async function add_peer(
+  tag: string,
+  pubkey: string,
+  host: string,
+  alias?: string
+) {
+  return await clnCmd("AddPeer", tag, { pubkey, host, alias });
 }
diff --git a/app/src/api/cmd.ts b/app/src/api/cmd.ts
@@ -98,7 +98,10 @@ export type Cmd =
   | "ChangeChildSwarmPassword"
   | "GetLightningBotsDetails"
   | "ChangeLightningBotLabel"
-  | "CreateInvoiceForLightningBot";
+  | "CreateInvoiceForLightningBot"
+  | "GetLightningPeers"
+  | "AddLightningPeer"
+  | "UpdateLightningPeer";
 
 interface CmdData {
   cmd: Cmd;

diff --git a/app/src/api/lnd.ts b/app/src/api/lnd.ts
@@ -59,8 +59,13 @@ export async function list_channels(tag: string) {
   return await lndCmd("ListChannels", tag);
 }
 
-export async function add_peer(tag: string, pubkey: string, host: string) {
-  return await lndCmd("AddPeer", tag, { pubkey, host });
+export async function add_peer(
+  tag: string,
+  pubkey: string,
+  host: string,
+  alias?: string
+) {
+  return await lndCmd("AddPeer", tag, { pubkey, host, alias });
 }
 
 export async function list_peers(tag: string) {

diff --git a/app/src/api/swarm.ts b/app/src/api/swarm.ts
@@ -393,6 +393,36 @@ export async function change_lightning_bot_label({
   return await swarmCmd("ChangeLightningBotLabel", { id, new_label });
 }
 
-export async function create_invoice_for_lightning_bot({id, amt_msat}: {id: string, amt_msat: number}) {
-  return await swarmCmd("CreateInvoiceForLightningBot", {id, amt_msat})
+export async function create_invoice_for_lightning_bot({
+  id,
+  amt_msat,
+}: {
+  id: string;
+  amt_msat: number;
+}) {
+  return await swarmCmd("CreateInvoiceForLightningBot", { id, amt_msat });
+}
+
+export async function get_lightning_peers() {
+  return await swarmCmd("GetLightningPeers");
+}
+
+export async function add_lightning_peer({
+  pubkey,
+  alias,
+}: {
+  pubkey: string;
+  alias: string;
+}) {
+  return await swarmCmd("AddLightningPeer", { pubkey, alias });
+}
+
+export async function update_lightning_peer({
+  pubkey,
+  alias,
+}: {
+  pubkey: string;
+  alias: string;
+}) {
+  return await swarmCmd("UpdateLightningPeer", { pubkey, alias });
 }
diff --git a/app/src/helpers/cln.ts b/app/src/helpers/cln.ts
@@ -6,6 +6,7 @@ import {
 } from "./";
 import long from "long";
 import type { LndChannel, LndPeer } from "../api/lnd";
+import type { LightningPeer } from "../nodes";
 
 enum ClnChannelState {
   CHANNELD_AWAITING_LOCKIN = "CHANNELD_AWAITING_LOCKIN",
@@ -238,3 +239,11 @@ export function parseClnInvoices(transactions) {
     return [];
   }
 }
+
+export function convertLightningPeersToObject(lightningPeers: LightningPeer[]) {
+  const peersObj = {};
+  for (let i = 0; i < lightningPeers.length; i++) {
+    peersObj[lightningPeers[i].pubkey] = lightningPeers[i].alias;
+  }
+  return peersObj;
+}
diff --git a/app/src/helpers/swarm.ts b/app/src/helpers/swarm.ts
@@ -1,7 +1,11 @@
 import type { Writable } from "svelte/store";
-import { get_all_image_actual_version, get_image_tags } from "../api/swarm";
+import {
+  get_all_image_actual_version,
+  get_image_tags,
+  get_lightning_peers,
+} from "../api/swarm";
 import type { Stack, Node } from "../nodes";
-import { swarmVersion } from "../store";
+import { lightningPeers, swarmVersion } from "../store";
 
 export async function getImageVersion(
   stack: Writable<Stack>,
@@ -87,3 +91,18 @@ export function splitPubkey(pubkey: string) {
   }
   return pubkey;
 }
+
+export async function handleGetLightningPeers() {
+  const res = await get_lightning_peers();
+  if (Array.isArray(res)) {
+    lightningPeers.set(res);
+  }
+}
+
+export function formatPubkey(pk: string) {
+  return `${pk.substring(0, 6)}...${pk.substring(pk.length - 6)}`;
+}
+
+export function formatPubkeyAliasDisplay(pubkey: string, alias: string) {
+  return `${alias} (${formatPubkey(pubkey)})`;
+}
diff --git a/app/src/lnd/AddChannel.svelte b/app/src/lnd/AddChannel.svelte
@@ -15,20 +15,24 @@
     peers as peersStore,
     channels,
     channelCreatedForOnboarding,
+    lightningPeers,
   } from "../store";
   import { formatSatsNumbers, convertSatsToMilliSats } from "../helpers";
   import {
+    convertLightningPeersToObject,
     parseClnListFunds,
     parseClnListPeerChannelsRes,
     parseClnListPeerRes,
   } from "../helpers/cln";
   import { getLndPendingAndActiveChannels } from "../helpers/lnd";
+  import { formatPubkeyAliasDisplay } from "../helpers/swarm";
 
   export let activeKey: string = null;
 
   $: pubkey = activeKey ? activeKey : "";
   $: amount = 0;
   $: sats = 0;
+  $: peersObj = convertLightningPeersToObject($lightningPeers);
 
   export let tag = "";
   export let type = "";
@@ -47,7 +51,9 @@
   $: peerData = peers?.length
     ? peers.map((p) => ({
         id: p.pub_key,
-        text: p.pub_key,
+        text: peersObj[p.pub_key]
+          ? formatPubkeyAliasDisplay(p.pub_key, peersObj[p.pub_key])
+          : p.pub_key,
       }))
     : [];
 

diff --git a/app/src/lnd/ChannelRows.svelte b/app/src/lnd/ChannelRows.svelte
@@ -4,17 +4,20 @@
   import ReceiveLine from "../components/ReceiveLine.svelte";
   import DotWrap from "../components/DotWrap.svelte";
   import Dot from "../components/Dot.svelte";
-  import { channels } from "../store";
+  import { channels, lightningPeers } from "../store";
   import { formatSatsNumbers } from "../helpers";
   import { getTransactionStatus, getBlockTip } from "../helpers/bitcoin";
   import Exit from "carbon-icons-svelte/lib/Exit.svelte";
   import { onDestroy, onMount } from "svelte";
+  import { convertLightningPeersToObject } from "../helpers/cln";
 
   export let tag = "";
   export let onclose = (id: string, dest: string) => {};
 
   let channel_arr = $channels[tag];
 
+  $: peersObj = convertLightningPeersToObject($lightningPeers);
+
   function copyText(txt: string) {
     navigator.clipboard.writeText(txt);
   }
@@ -157,7 +160,9 @@
             </div>
           {/if}
           <div class="td">
-            <span class="pubkey">{chan.remote_pubkey}</span>
+            <span class="pubkey"
+              >{peersObj[chan.remote_pubkey] || chan.remote_pubkey}</span
+            >
           </div>
         </div>
         {#if selectedChannelParter === chan.remote_pubkey}

diff --git a/app/src/lnd/Lnd.svelte b/app/src/lnd/Lnd.svelte
@@ -10,9 +10,11 @@
     selectedNode,
     hsmd,
     hsmdClients,
+    lightningPeers,
   } from "../store";
   import { onMount } from "svelte";
   import { get_clients } from "../api/hsmd";
+  import { handleGetLightningPeers } from "../helpers/swarm";
 
   export let tag = "";
   export let type = "";
@@ -43,9 +45,16 @@
   }
 
   onMount(async () => {
-    if (type === "Cln") {
-      const clients = await get_clients(tag);
-      if (clients) hsmdClients.set(clients);
+    try {
+      if (type === "Cln") {
+        const clients = await get_clients(tag);
+        if (clients) hsmdClients.set(clients);
+      }
+
+      //get all lightning peers
+      await handleGetLightningPeers();
+    } catch (error) {
+      console.log(error);
     }
   });
 </script>