Merge pull request #82 from L2-Technology/expose-balance

expose channel balance
L2-Technology · Jun 8, 2022 · e772430 · e772430
2 parents cd74d6f + 736a37d
commit e772430
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/senseicore/src/node.rs b/senseicore/src/node.rs
@@ -1440,21 +1440,25 @@ impl LightningNode {
 
                 let responses = self.open_channels(requests).await;
 
+                let peer_connection_infos = responses
+                    .iter()
+                    .map(|(request, _result)| &request.node_connection_string[..])
+                    .collect::<Vec<_>>();
+
+                let _ = self
+                    .persister
+                    .batch_persist_channel_peers(&peer_connection_infos);
+
                 Ok(NodeResponse::OpenChannels {
                     channels,
                     results: responses
                         .into_iter()
-                        .map(|(request, result)| match result {
-                            Ok(temp_channel_id) => {
-                                let _ = self
-                                    .persister
-                                    .persist_channel_peer(&request.node_connection_string);
-                                OpenChannelResult {
-                                    error: false,
-                                    error_message: None,
-                                    temp_channel_id: Some(hex_utils::hex_str(&temp_channel_id)),
-                                }
-                            }
+                        .map(|(_request, result)| match result {
+                            Ok(temp_channel_id) => OpenChannelResult {
+                                error: false,
+                                error_message: None,
+                                temp_channel_id: Some(hex_utils::hex_str(&temp_channel_id)),
+                            },
                             Err(e) => OpenChannelResult {
                                 error: true,
                                 error_message: Some(e.to_string()),

diff --git a/senseicore/src/persist.rs b/senseicore/src/persist.rs
@@ -222,6 +222,15 @@ impl SenseiPersister {
         String::new()
     }
 
+    pub fn batch_persist_channel_peers(&self, peer_infos: &[&str]) -> std::io::Result<()> {
+        let mut peer_data = self.get_raw_channel_peer_data();
+        for peer_info in peer_infos {
+            peer_data.push_str(peer_info);
+            peer_data.push('\n');
+        }
+        self.store.persist("channel_peer_data", &peer_data)
+    }
+
     pub fn persist_channel_peer(&self, peer_info: &str) -> std::io::Result<()> {
         let mut peer_data = self.get_raw_channel_peer_data();
         peer_data.push_str(peer_info);
@@ -239,7 +248,11 @@ impl SenseiPersister {
                 Ok((pubkey, socket_addr)) => {
                     peer_data.insert(pubkey, socket_addr);
                 }
-                Err(e) => return Err(e),
+                Err(_e) => {
+                    // ignore these errors for now
+                    // might need a way to lock reads while writing to this key
+                    // or use separate table for peers
+                }
             }
         }
         Ok(peer_data)

diff --git a/web-admin/src/channels/components/ChannelsList.tsx b/web-admin/src/channels/components/ChannelsList.tsx
@@ -129,6 +129,7 @@ const ChannelRow = ({ result, extraClass, attributes }) => {
   let columnKeyComponentMap = {
     inboundCapacityMsat: AmountColumn,
     outboundCapacityMsat: AmountColumn,
+    balanceMsat: AmountColumn,
     isPublic: VisibilityColumn,
     status: StatusColumn,
     alias: AliasColumn,
@@ -165,6 +166,10 @@ const ChannelsList = () => {
       key: "displayChannelId",
       label: "Channel Id",
     },
+    {
+      key: "balanceMsat",
+      label: "Balance (sats)",
+    },
     {
       key: "inboundCapacityMsat",
       label: "Receive Capacity (sats)",