balanceofsatoshis 23.2.0 → 23.3.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 23.3.0
+
+- `call`: Add `subscribeToMessages` to listen for received onion messages
+
 ## 23.2.0
 
 - `invoice`: Add `--encrypted-hints` to hide the node behind blinded paths in

package/chain/fund_transaction.js

@@ -1,6 +1,7 @@
 const asyncAuto = require('async/auto');
 const asyncEach = require('async/each');
 const {broadcastTransaction} = require('ln-sync');
+const {componentsOfTransaction} = require('@alexbosworth/blockchain');
 const {formatTokens} = require('ln-sync');
 const {fundPsbt} = require('ln-service');
 const {getChainFeeRate} = require('ln-service');
@@ -10,7 +11,7 @@ const {getUtxos} = require('ln-service');
 const {parseAmount} = require('ln-accounting');
 const {returnResult} = require('asyncjs-util');
 const {signPsbt} = require('ln-service');
-const {Transaction} = require('bitcoinjs-lib');
+const {sizeOfTransaction} = require('@alexbosworth/blockchain');
 const {unlockUtxo} = require('ln-service');
 
 const allowUnconfirmed = 0;
@@ -18,19 +19,14 @@ const asBigUnit = n => (n / 1e8).toFixed(8);
 const asOutpoint = utxo => `${utxo.transaction_id}:${utxo.transaction_vout}`;
 const asInput = n => ({transaction_id: n.id, transaction_vout: n.vout});
 const asUtxo = n => ({id: n.slice(0, 64), vout: Number(n.slice(65))});
-const bufferAsHex = buffer => buffer.toString('hex');
 const dustValue = 293;
 const formattedFeeRate = n => n.toFixed(2);
-const {fromHex} = Transaction;
 const hasMaxAmount = amounts => !!amounts.find(n => !!n && !!/max/gim.test(n));
 const {isArray} = Array;
 const isOutpoint = n => !!n && /^[0-9A-F]{64}:[0-9]{1,6}$/i.test(n);
 const isPublicKey = n => !!n && /^0[2-3][0-9A-F]{64}$/i.test(n);
 const isValidFeeRate = n => !n || Number.isInteger(Number(n));
-const minConfs = 1;
 const sumOf = arr => arr.reduce((sum, n) => sum + n, Number());
-const taprootAddressVersion = 1;
-const txHashAsTxId = hash => hash.reverse().toString('hex');
 
 /** Fund and sign a transaction
 
@@ -332,13 +328,13 @@ module.exports = (args, cbk) => {
       // Final funded transaction
       funded: ['getUtxos', 'sign', ({getUtxos, sign}, cbk) => {
         // Match the inputs of the tx up to the wallet outputs
-        const tx = fromHex(sign.transaction);
+        const tx = componentsOfTransaction({transaction: sign.transaction});
 
         // Find the UTXOs that are being spent in the final transaction
-        const spending = tx.ins.map(input => {
+        const spending = tx.inputs.map(input => {
           const outpoint = asOutpoint({
-            transaction_id: txHashAsTxId(input.hash),
-            transaction_vout: input.index,
+            transaction_id: input.id,
+            transaction_vout: input.vout,
           });
 
           return getUtxos.utxos.find(n => asOutpoint(n) === outpoint);
@@ -350,12 +346,14 @@ module.exports = (args, cbk) => {
         }
 
         const inputsValue = sumOf(spending.map(n => n.tokens));
-        const outputsValue = sumOf(tx.outs.map(n => n.value));
+        const outputsValue = sumOf(tx.outputs.map(n => n.tokens));
 
         const feeTotal = inputsValue - outputsValue;
 
+        const {vsize} = sizeOfTransaction({transaction: sign.transaction});
+
         return cbk(null, {
-          fee_tokens_per_vbyte: formattedFeeRate(feeTotal / tx.virtualSize()),
+          fee_tokens_per_vbyte: formattedFeeRate(feeTotal / vsize),
           signed_transaction: sign.transaction,
         });
       }],

package/commands/api.json

@@ -971,6 +971,10 @@
       "events": ["invoice_updated"],
       "method": "subscribeToInvoices"
     },
+    {
+      "events": ["message_received"],
+      "method": "subscribeToMessages"
+    },
     {
       "arguments": [{
         "description": "Payment hash id hex-encoded",

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": {
     "name": "Alex Bosworth",
-    "url": "https://twitter.com/alexbosworth"
+    "url": "https://x.com/alexbosworth"
   },
   "bin": {
     "bos": "bos"
@@ -30,7 +30,7 @@
     "bitcoinjs-lib": "6.1.7",
     "bolt01": "4.0.0",
     "bolt03": "2.0.0",
-    "bolt04": "1.2.0",
+    "bolt04": "1.3.0",
     "bolt07": "2.0.0",
     "cbor": "10.0.12",
     "colorette": "2.0.20",
@@ -41,7 +41,7 @@
     "ini": "7.0.0",
     "inquirer": "14.2.2",
     "ln-accounting": "10.0.7",
-    "ln-service": "59.6.0",
+    "ln-service": "59.7.0",
     "ln-sync": "8.0.6",
     "ln-telegram": "8.0.6",
     "moment": "2.31.0",
@@ -109,5 +109,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "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/offchain/*.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": "23.2.0"
+  "version": "23.3.0"
 }