balanceofsatoshis 16.0.0 → 16.0.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 16.0.0
+## 16.0.2
+
+- `trade-secret`: Fix advertising when node is behind TorV3
+
+## 16.0.1
 
 - `chain-deposit`: Change default address type to `p2tr`
 

package/package.json

@@ -31,17 +31,17 @@
     "csv-parse": "5.5.0",
     "ecpair": "2.1.0",
     "goldengate": "13.0.2",
-    "grammy": "1.18.3",
+    "grammy": "1.19.0",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "4.1.1",
     "inquirer": "9.2.11",
     "ln-accounting": "7.0.2",
-    "ln-service": "56.13.0",
+    "ln-service": "56.14.0",
     "ln-sync": "5.2.3",
     "ln-telegram": "5.0.0",
     "moment": "2.29.4",
-    "paid-services": "5.0.4",
+    "paid-services": "5.0.5",
     "probing": "4.0.0",
     "psbt": "3.0.0",
     "qrcode-terminal": "0.12.0",
@@ -82,5 +82,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "npx nyc@15.1.0 node --experimental-test-coverage --test test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/peers/*.js test/responses/*.js test/routing/*.js test/services/*.js test/swaps/*.js test/tags/*.js test/telegram/*.js test/wallets/*.js"
   },
-  "version": "16.0.0"
+  "version": "16.0.2"
 }

package/peers/open_channels.js

@@ -15,6 +15,7 @@ const asyncRetry = require('async/retry');
 const {broadcastChainTransaction} = require('ln-service');
 const {cancelPendingChannel} = require('ln-service');
 const {fundPendingChannels} = require('ln-service');
+const {getChainBalance} = require('ln-service');
 const {getChannels} = require('ln-service');
 const {getFundedTransaction} = require('ln-sync');
 const {getNetwork} = require('ln-sync');
@@ -53,6 +54,7 @@ const peerAddedDelayMs = 1000 * 5;
 const pendingCheckTimes = 60 * 10;
 const per = (a, b) => (a / b).toFixed(2);
 const relockIntervalMs = 1000 * 20;
+const sumOf = arr => arr.reduce((sum, n) => sum + n, 0);
 const times = 10;
 const tokAsBigUnit = tokens => (tokens / 1e8).toFixed(8);
 const uniq = arr => Array.from(new Set(arr));
@@ -470,8 +472,35 @@ module.exports = (args, cbk) => {
         ({internal}) => cbk(null, !internal));
       }],
 
+      // Get the chain balance to see if there is enough available
+      getBalance: ['isExternal', ({isExternal}, cbk) => {
+        // Exit early when not using internal balance to fund
+        if (!!isExternal) {
+          return cbk();
+        }
+
+        return getChainBalance({lnd: args.lnd}, cbk);
+      }],
+
+      // Make sure there is enough coins to fund the opens
+      checkBalance: ['getBalance', 'opens', ({getBalance, opens}, cbk) => {
+        // Exit early when externally funding
+        if (!getBalance) {
+          return cbk();
+        }
+
+        const capacities = opens.map(n => n.channels.map(n => n.capacity));
+
+        // Make sure that the chain balance is sufficient
+        if (getBalance.chain_balance < sumOf(flatten(capacities))) {
+          return cbk([400, 'ExpectedChainBalanceAboveCapacityBeingOpened']);
+        }
+
+        return cbk();
+      }],
+
       // Ask for the fee rate to use for internally funded opens
-      askForFeeRate: ['isExternal', ({isExternal}, cbk) => {
+      askForFeeRate: ['checkBalance', 'isExternal', ({isExternal}, cbk) => {
         // Exit early when there are no internal funds being spent or internal fee rate is specified
         if (!!isExternal || !!args.internal_fund_fee_rate) {
           return cbk(null, {});
@@ -484,6 +513,7 @@ module.exports = (args, cbk) => {
       openChannels: [
         'askForFeeRate',
         'capacities',
+        'checkBalance',
         'connect',
         'getLnds',
         'getNodes',