balanceofsatoshis 19.2.2 → 19.3.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 19.3.1
+
+- `fund`: Fix validation for funding when using `--select-utxos`
+
+## 19.3.0
+
+- `chainfees`: Add support for `min_relay_feerate` for LND 0.18.3 and higher
+
 ## 19.2.2
 
 - `fees`: Add `--set-inbound-rate-discount` to set a source-based rate discount

package/chain/fund_transaction.js

@@ -168,7 +168,7 @@ module.exports = (args, cbk) => {
             }
 
             const tokens = sumOf(input.map(utxo => {
-              return utxos.find(n => asOutpoint(n) === utxo).tokens;
+              return utxos.find(n => asOutpoint(n) === utxo.value).tokens;
             }));
 
             // Exit early when the amount is open ended

package/chain/get_chain_fees.js

@@ -2,6 +2,7 @@ const asyncAuto = require('async/auto');
 const asyncTimesSeries = require('async/timesSeries');
 const {getChainFeeRate} = require('ln-service');
 const {getHeight} = require('ln-service');
+const {getMinimumRelayFee} = require('ln-service');
 const {returnResult} = require('asyncjs-util');
 
 const bytesPerKb = 1e3;
@@ -26,6 +27,7 @@ const start = 2;
     fee_by_block_target: {
       $number: <Kvbyte Fee Rate Number>
     }
+    min_relay_feerate: <Chain Backend Minimum KVbyte Fee Rate Number>
   }
 */
 module.exports = ({blocks, lnd}, cbk) => {
@@ -63,8 +65,16 @@ module.exports = ({blocks, lnd}, cbk) => {
       // Get chain info
       getHeight: ['validate', ({}, cbk) => getHeight({lnd}, cbk)],
 
+      // Get the minimum relay fee rate
+      getMinFee: ['validate', ({}, cbk) => getMinimumRelayFee({lnd}, cbk)],
+
       // Collapse chain fees into steps
-      chainFees: ['getFees', 'getHeight', ({getFees, getHeight}, cbk) => {
+      chainFees: [
+        'getFees',
+        'getHeight',
+        'getMinFee',
+        ({getFees, getHeight, getMinFee}, cbk) =>
+      {
         let cursor = {};
         const feeByBlockTarget = {};
 
@@ -83,6 +93,7 @@ module.exports = ({blocks, lnd}, cbk) => {
         return cbk(null, {
           current_block_hash: getHeight.current_block_hash,
           fee_by_block_target: feeByBlockTarget,
+          min_relay_feerate: ceil(getMinFee.tokens_per_vbyte * bytesPerKb),
         });
       }],
     },

package/package.json

@@ -37,12 +37,12 @@
     "ini": "4.1.3",
     "inquirer": "10.1.8",
     "ln-accounting": "8.0.3",
-    "ln-service": "57.17.0",
+    "ln-service": "57.18.0",
     "ln-sync": "6.1.0",
     "ln-telegram": "6.1.6",
     "minimist": "1.2.8",
     "moment": "2.30.1",
-    "paid-services": "6.1.4",
+    "paid-services": "6.1.5",
     "probing": "5.0.3",
     "psbt": "3.0.0",
     "qrcode-terminal": "0.12.0",
@@ -56,7 +56,7 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "invoices": "3.0.0",
-    "ln-docker-daemons": "6.0.21"
+    "ln-docker-daemons": "6.0.22"
   },
   "engines": {
     "node": ">=18"
@@ -83,5 +83,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@17.0.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": "19.2.2"
+  "version": "19.3.1"
 }

package/test/chain/test_get_chain_fees.js

@@ -54,6 +54,7 @@ const tests = [
           estimateFee: (args, cbk) => {
             return cbk(null, {
               sat_per_kw: 1 + Math.round(1 / args.conf_target),
+              min_relay_fee_sat_per_kw: '250',
             });
           },
         },
@@ -63,6 +64,7 @@ const tests = [
     expected: {
       current_block_hash: '00',
       fee_by_block_target: {'2': 8, '3': 4},
+      min_relay_feerate: 1000,
     },
   },
 ];