diff --git a/controllers/localRemoteBal.js b/controllers/localRemoteBal.js index 92e89eb..dc8a7dc 100644 --- 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 index 9b41b48..600246f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "c-lightning-rest", - "version": "0.10.3", + "version": "0.10.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "c-lightning-rest", - "version": "0.10.2", + "version": "0.10.4", "license": "MIT", "dependencies": { "atob": "^2.1.2", diff --git a/package.json b/package.json index 5512364..83af002 100644 --- 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": {