balanceofsatoshis 11.63.1 → 11.64.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 11.64.2
+
+- `trade-secret`: Fix connecting when not already peered with seller
+
+## 11.64.0
+
+- `lnurl`: Add `--avoid`, `--max-paths`, `--out` options to control payments
+
 ## 11.63.1
 
 - `lnurl`: Add command to decode and make payments to LNURL payRequests

package/Dockerfile

@@ -9,6 +9,8 @@ ENV GROUP_ID=$GROUP_ID
 
 WORKDIR /app/
 
+RUN apk add --no-cache --upgrade bash
+
 RUN chown -R $USER_ID:$GROUP_ID /app/
 
 USER $USER_ID:$GROUP_ID

package/bos

@@ -1023,8 +1023,11 @@ prog
   .command('lnurl', 'Collection of lnurl features')
   .argument('<function>', 'lnurl function', keys(lnurlFunctions))
   .help(`Functions: ${keys(lnurlFunctions).join(', ')}`)
+  .option('--avoid <avoid>', 'Avoid forwarding via node/chan/tag', REPEATABLE)
   .option('--max-fee <max_fee>', 'Maximum fee to pay', INT, 1337)
+  .option('--max-paths <max_paths>', 'Maximum paths to use', INT, 1)
   .option('--node <node_name>', 'Node to run a lnurl function')
+  .option('--out <public_key>', 'Make first hop through peer', REPEATABLE)
   .option('--url <url>', 'URL to pay', STRING)
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
@@ -1032,10 +1035,13 @@ prog
         return lnurl.pay({
           logger,
           ask: (n, cbk) => inquirer.prompt(n).then(n => cbk(n)),
+          avoid: flatten([options.avoid].filter(n => !!n)),
           function: args.function,
           lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
           lnurl: options.url,
           max_fee: options.maxFee,
+          max_paths: options.maxPaths,
+          out: flatten([options.out].filter(n => !!n)),
           request: commands.simpleRequest,
         },
         responses.returnObject({logger, reject, resolve}));

package/lnurl/pay.js

@@ -13,7 +13,6 @@ const asLnurl = n => n.substring(n.startsWith('lightning:') ? 10 : 0);
 const bech32CharLimit = 2000;
 const errorStatus = 'ERROR';
 const {decode} = bech32;
-const defaultMaxPaths = 1;
 const {isArray} = Array;
 const isNumber = n => !isNaN(n);
 const lowestSendableValue = 1000;
@@ -36,11 +35,14 @@ const wordsAsUtf8 = n => Buffer.from(bech32.fromWords(n)).toString('utf8');
 /** Pay to lnurl
  {
   ask: <Ask Function>
+  avoid: [<Avoid Forwarding Through String>]
   fetch: <Fetch Function>
   lnd: <Authenticated LND API Object>
   lnurl: <Lnurl String>
   logger: <Winston Logger Object>
   max_fee: <Max Fee Tokens Number>
+  max_paths: <Maximum Paths Number>
+  out: [<Out Through Peer With Public Key Hex String>]
  }
 */
 module.exports = (args, cbk) => {
@@ -52,6 +54,10 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedAskFunctionToGetPaymentRequestFromLnurl']);
         }
 
+        if (!isArray(args.avoid)) {
+          return cbk([400, 'ExpectedAvoidArrayToGetPaymentRequestFromLnurl']);
+        }
+
         if (!args.request) {
           return cbk([400, 'ExpectedRequestFunctionToGetLnurlData']);
         }
@@ -82,6 +88,14 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedMaxFeeToGetPaymentRequestFromLnurl']);
         }
 
+        if (!args.max_paths) {
+          return cbk([400, 'ExpectedMaxPathsCountToPayViaLnurl']);
+        }
+
+        if (!isArray(args.out)) {
+          return cbk([400, 'ExpectedArrayOfOutPeersToPayViaLnurl']);
+        }
+
         return cbk();
       },
 
@@ -303,12 +317,12 @@ module.exports = (args, cbk) => {
       // Pay the payment request
       pay: ['confirm', 'getRequest', ({getRequest}, cbk) => {
         return pay({
-          avoid: [],
+          avoid: args.avoid,
           lnd: args.lnd,
           logger: args.logger,
           max_fee: args.max_fee,
-          max_paths: defaultMaxPaths,
-          out: [],
+          max_paths: args.max_paths,
+          out: args.out,
           request: getRequest,
         },
         cbk);

package/package.json

@@ -11,38 +11,38 @@
   },
   "dependencies": {
     "@alexbosworth/caporal": "1.4.1",
-    "@alexbosworth/fiat": "1.0.1",
+    "@alexbosworth/fiat": "1.0.2",
     "@alexbosworth/html2unicode": "1.1.5",
     "@alexbosworth/node-fetch": "2.6.2",
     "abort-controller": "3.0.0",
     "asciichart": "1.5.25",
     "async": "3.2.3",
-    "asyncjs-util": "1.2.8",
+    "asyncjs-util": "1.2.9",
     "bech32": "2.0.0",
     "bip66": "1.1.5",
     "bitcoinjs-lib": "6.0.1",
-    "bolt01": "1.2.3",
-    "bolt03": "1.2.13",
-    "bolt07": "1.8.0",
+    "bolt01": "1.2.4",
+    "bolt03": "1.2.14",
+    "bolt07": "1.8.1",
     "cbor": "8.1.0",
     "colorette": "2.0.16",
     "crypto-js": "4.1.1",
     "csv-parse": "5.0.4",
-    "goldengate": "11.1.0",
+    "goldengate": "11.1.1",
     "grammy": "1.7.1",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
-    "ini": "2.0.0",
+    "ini": "3.0.0",
     "inquirer": "8.2.2",
-    "invoices": "2.0.4",
-    "ln-accounting": "5.0.5",
-    "ln-service": "53.9.3",
-    "ln-sync": "3.11.0",
-    "ln-telegram": "3.21.0",
-    "moment": "2.29.1",
-    "paid-services": "3.14.4",
-    "probing": "2.0.3",
-    "psbt": "2.0.0",
+    "invoices": "2.0.5",
+    "ln-accounting": "5.0.6",
+    "ln-service": "53.11.0",
+    "ln-sync": "3.12.0",
+    "ln-telegram": "3.21.1",
+    "moment": "2.29.2",
+    "paid-services": "3.14.5",
+    "probing": "2.0.5",
+    "psbt": "2.0.1",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.3",
     "socks-proxy-agent": "6.2.0-beta.0",
@@ -53,7 +53,7 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.11",
-    "ln-docker-daemons": "2.2.5",
+    "ln-docker-daemons": "2.2.7",
     "mock-lnd": "1.4.1",
     "tiny-secp256k1": "2.2.1"
   },
@@ -78,8 +78,9 @@
   "scripts": {
     "build-docker": "docker build -t alexbosworth/balanceofsatoshis . && docker save alexbosworth/balanceofsatoshis > balanceofsatoshis.tar && gzip balanceofsatoshis.tar",
     "integration-tests": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 120 test/integration/*.js",
+    "postpack": "PACKAGE_VERSION=$(cat package.json | grep \\\"version\\\" | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag -s v$PACKAGE_VERSION -m v$PACKAGE_VERSION && git push github --tags",
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis --push .",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 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": "11.63.1"
+  "version": "11.64.2"
 }