Merge pull request #183 from Ride-The-Lightning/Release-v0.10.4

Release v0.10.4
Ride-The-Lightning · Jun 20, 2023 · 43f7a10 · 43f7a10
2 parents 2bf3fa0 + 4276539
commit 43f7a10
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/controllers/localRemoteBal.js b/controllers/localRemoteBal.js
@@ -51,16 +51,22 @@ exports.localRemoteBal = (req,res) => {
         for (var i = 0; i < chanArray.length; i++ )
         {
             if((chanArray[i].state === 'CHANNELD_NORMAL') && chanArray[i].connected === true) {
-                localBalance = localBalance + (versionCompatible ? (chanArray[i].our_amount_msat/1000) : chanArray[i].channel_sat);
-                remoteBalance = remoteBalance + (versionCompatible ? (chanArray[i].amount_msat/1000) : (chanArray[i].channel_total_sat - chanArray[i].channel_sat));
+                localBalance = localBalance + (versionCompatible ? (chanArray[i].our_amount_msat) : chanArray[i].channel_sat);
+                remoteBalance = remoteBalance + (versionCompatible ? (chanArray[i].amount_msat - chanArray[i].our_amount_msat) : (chanArray[i].channel_total_sat - chanArray[i].channel_sat));
             }
             else if((chanArray[i].state === 'CHANNELD_NORMAL') && chanArray[i].connected === false) {
-                inactiveBalance = inactiveBalance + (versionCompatible ? (chanArray[i].our_amount_msat/1000) : chanArray[i].channel_sat);
+                inactiveBalance = inactiveBalance + (versionCompatible ? (chanArray[i].our_amount_msat) : chanArray[i].channel_sat);
             }
-            else if(chanArray[i].state === 'CHANNELD_AWAITING_LOCKIN') {
-                pendingBalance = pendingBalance + (versionCompatible ? (chanArray[i].our_amount_msat/1000) : chanArray[i].channel_sat);
+            else if(chanArray[i].state === 'CHANNELD_AWAITING_LOCKIN' || chanArray[i].state === 'DUALOPEND_AWAITING_LOCKIN') {
+                pendingBalance = pendingBalance + (versionCompatible ? (chanArray[i].our_amount_msat) : chanArray[i].channel_sat);
             }
         }
+        if (versionCompatible) {
+            localBalance = localBalance / 1000;
+            remoteBalance = remoteBalance / 1000;
+            inactiveBalance = inactiveBalance / 1000;
+            pendingBalance = pendingBalance / 1000;
+        }
         global.logger.log('localbalance -> ' + localBalance);
         global.logger.log('remotebalance -> ' + remoteBalance);
         global.logger.log('pendingBalance -> ' + pendingBalance);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "c-lightning-rest",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "c-lightning REST API suite",
   "main": "cl-rest.js",
   "scripts": {