balanceofsatoshis 25.7.0 → 26.0.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Versions
 
+## 26.0.0
+
+- `swap-api-key`: Add `--max-fee` to limit what is paid for an API key
+- `swap-in`: Use the shared address swap in protocol of the swap service,
+    swapping in a deposit of the exact amount once it has 3 confirmations
+- `swap-in`: Add `--max-fee-rate` to limit the swap fee in parts per million
+- `swap-in`, `swap-out`: Add `--max-api-key-fee` to limit what is paid for a
+    swap service API key
+- `swap-out`: Use the Taproot MuSig2 swap out protocol of the swap service,
+    like `swap` does
+- `swap-out`: Add `--out` to select the peer or tag to increase inbound
+    liquidity from, with `--out-filter` formulas like `rebalance`
+
+### Breaking Changes
+
+- `increase-inbound-liquidity`: Rename command to `swap-out`
+- `swap-in`: `--recovery` takes a shared address secret, not old recovery codes
+- `swap-in`: `--refund-address` with `--recovery` refunds expired deposits
+    and unpaid swaps that timed out
+- `swap-in`: Remove `--test-refund`
+- `swap-in`: Use 25.7.0 to refund swaps in started with earlier versions
+- `swap-out`: `--recovery` takes the restart code of the new swap protocol,
+    which `swap` also accepts, not the previous recovery code
+- `swap-out`: Remove `--max-hours`, `--show-raw-recovery`, `--spend-address`
+    and `--spend-amount`
+- `swap-out`: Rename `--with` to `--out`
+
 ## 25.7.0
 
 - `accounting`: Add `lightning-fees` category to report the routing fees paid

package/README.md

@@ -123,9 +123,6 @@ bos inbound-liquidity
 # Enforce rules on inbound channels
 bos inbound-channel-rules
 
-# Increase inbound liquidity to the node
-bos increase-inbound-liquidity
-
 # Increase the outbound liquidity of the node
 bos increase-outbound-liquidity
 
@@ -171,6 +168,12 @@ bos server
 # Stream a payment to a lnurl or lightning address in a series of payments
 bos stream "amount" --lnurl "lnurl/lightning_address"
 
+# Trade on-chain funds for off-chain funds to increase outbound liquidity
+bos swap-in
+
+# Trade off-chain funds for on-chain funds to increase inbound liquidity
+bos swap-out
+
 # Connect up to a Telegram bot
 bos telegram
 
@@ -617,6 +620,7 @@ Formula amounts are supported in the following commands:
 - `probe`
 - `rebalance`
 - `send`
+- `swap-out`
 
 When passing an amount you can pass a formula expression, and the following variables are
 defined:
@@ -676,6 +680,25 @@ Example:
 bos send <key> --amount "1*usd"
 ```
 
+#### `swap-out`
+
+Swap out defines variables for `--out-filter`:
+
+- `capacity`: The total capacity with the peer
+- `heights`: The set of heights of the channels with the peer
+- `inbound_base_fee`: The base fee the peer is charging
+- `inbound_fee_rate`: The fee rate the peer is charging
+- `inbound_liquidity`: The inbound liquidity with the peer
+- `outbound_liquidity`: The outbound liquidity with the peer
+- `pending_payments`: The number of pending payments
+
+Example:
+
+```shell
+// Swap out 1,000,000 with a peer of the tag that has under 2,000,000 inbound
+bos swap-out --amount "1*m" --out "tag" --out-filter "inbound_liquidity < 2*m"
+```
+
 #### `transfer`
 
 Transfer variables:

package/balances/constants.json

@@ -8,6 +8,7 @@
   },
   "chainPricesFile": "chain_prices.json",
   "coinbaseProvider": "coinbase",
+  "dayFormat": "YYYY-MM-DD",
   "defaultCurrency": "BTC",
   "defaultFiat": "USD",
   "failedRequestErrors": ["UnexpectedErrorGettingCoinbaseCandles"],
@@ -45,5 +46,14 @@
     "FailedToReplacePricesFile",
     "FailedToWritePricesFile",
     "UnsupportedPricesFileVersion"
+  ],
+  "summaryHeadings": [
+    "Total",
+    "Asset",
+    "Report Date",
+    "Total Fiat",
+    "Category",
+    "Start Date",
+    "End Date"
   ]
 }

package/balances/get_accounting_report.js

@@ -6,6 +6,7 @@ const {chainRates} = require('@alexbosworth/fiat');
 const {getAccountingReport} = require('ln-accounting');
 const {getNetwork} = require('ln-sync');
 const {harmonize} = require('ln-accounting');
+const moment = require('moment');
 const {returnResult} = require('asyncjs-util');
 
 const categories = require('./accounting_categories');
@@ -13,6 +14,7 @@ const {chainBlocksFile} = require('./constants');
 const {chainPricesFile} = require('./constants');
 const chainPricesLogger = require('./chain_prices_logger');
 const {coinbaseProvider} = require('./constants');
+const {dayFormat} = require('./constants');
 const {defaultCurrency} = require('./constants');
 const {defaultFiat} = require('./constants');
 const {fsMethods} = require('./constants');
@@ -20,21 +22,20 @@ const getRecordRate = require('./get_record_rate');
 const guardChainRate = require('./guard_chain_rate');
 const {homePath} = require('./../storage');
 const {mainnet} = require('./constants');
-const {monthNumbers} = require('./constants');
-const {monthOffset} = require('./constants');
-const {notFoundIndex} = require('./constants');
 const rangeForDate = require('./range_for_date');
 const {sortBy} = require('./../arrays');
+const {summaryHeadings} = require('./constants');
 const tableRowsFromCsv = require('./table_rows_from_csv');
 
 const assetType = 'BTC';
+const dayOf = n => moment.utc(n).format(dayFormat);
 const empty = '';
 const flatten = arr => [].concat(...arr);
 const {isArray} = Array;
 const {keys} = Object;
+const lastDayBefore = n => moment.utc(n).subtract(1, 'ms').format(dayFormat);
 const round = n => parseFloat(n).toFixed(2);
 const sumOf = arr => arr.reduce((sum, n) => sum + n, 0);
-const summaryHeadings = ['Total', 'Asset', 'Report Date', 'Total Fiat'];
 
 /** Get an accounting report
 
@@ -254,7 +255,12 @@ module.exports = (args, cbk) => {
       }],
 
       // Clean rows for display if necessary
-      report: ['accounting', 'total', ({accounting, total}, cbk) => {
+      report: [
+        'accounting',
+        'dateRange',
+        'total',
+        ({accounting, dateRange, total}, cbk) =>
+      {
         // Exit early when there is no cleaning necessary
         if (!!args.is_csv) {
           return cbk(null, accounting);
@@ -280,7 +286,15 @@ module.exports = (args, cbk) => {
 
         const summary = [
           summaryHeadings,
-          [total.tokens, assetType, new Date().toISOString(), total.fiat],
+          [
+            total.tokens,
+            assetType,
+            new Date().toISOString(),
+            total.fiat,
+            args.category,
+            !dateRange.after ? empty : dayOf(dateRange.after),
+            !dateRange.before ? empty : lastDayBefore(dateRange.before),
+          ],
         ];
 
         return cbk(null, {rows, rows_summary: summary});

package/bos

@@ -72,7 +72,7 @@ prog
   .help(`Rate providers: ${rateProviders.join(', ')}`)
   .help('By default fiat rates after 2021-10-19 use chain data derived rates')
   .help('Multiple --node arguments are supported to report on nodes together')
-  .help('Privacy note: this requests tx related data from third parties')
+  .help('Privacy note: other rates are looked up from third parties by time')
   .option('--csv', 'Output a CSV')
   .option('--date <day>', 'Show only records for specific date')
   .option('--disable-fiat', 'Avoid looking up fiat conversions for records')
@@ -331,7 +331,6 @@ prog
   // Show a chart of chain fees paid
   .command('chart-chain-fees', 'Get a chart of chain fee expenses')
   .help('Show chart of mining fee expenditure over time')
-  .help('Privacy note: this requests tx data from third parties')
   .option('--days <days>', 'Chart over the past number of days', INT)
   .option('--end <end_date>', 'End date for chart as YYYY-MM-DD', STRING)
   .option('--no-color', 'Disable colors')
@@ -345,7 +344,6 @@ prog
           end_date: options.end,
           is_monochrome: !!options.noColor,
           lnds: (await lnd.getLnds({logger, nodes: options.node})).lnds,
-          request: commands.simpleRequest,
           start_date: options.start,
         },
         responses.returnChart({logger, reject, resolve, data: 'data'}));
@@ -1013,66 +1011,6 @@ prog
     });
   })
 
-  // Increase inbound liquidity
-  .command('increase-inbound-liquidity', 'Increase node inbound liquidity')
-  .help('Spend down a channel to get inbound. Fee is an estimate, may be more')
-  .help('If you want to control chain fee increases, use show-raw-recoveries')
-  .help('Formulas supported for --amount like 5*m or 0.05*BTC for 5 million')
-  .option('--address <out_address>', 'Out chain address to send funds out to')
-  .option('--api-key <api_key>', 'Pre-paid API key to use')
-  .option('--amount <amount>', 'Amount to increase inbound', STRING, '500*k')
-  .option('--avoid <pubkey/chan/tag>', 'Avoid forwarding through', REPEATABLE)
-  .option('--confs <confs>', 'Confs to consider reorg safe', INT, 1)
-  .option('--dryrun', 'Only show cost estimate for increase')
-  .option('--fast', 'Request swap server avoid batching delay')
-  .option('--max-deposit <max_deposit>', 'Maximum deposit amount', INT, 5e4)
-  .option('--max-fee <max_fee>', 'Maximum estimated fee tokens', INT, 3e4)
-  .option('--max-hours <max_hours>', 'Maximum hours to wait', INT, 65)
-  .option('--max-paths <max_paths>', 'Maximum paths to attempt', INT, 1)
-  .option('--no-color', 'Mute all colors')
-  .option('--node <node_name>', 'Increase inbound liquidity on saved node')
-  .option('--recovery <recovery>', 'Recover in-progress swap')
-  .option('--service-socket', 'Specify a custom swap service address')
-  .option('--spend-address', 'Send an exact amount to a specific address')
-  .option('--spend-amount', 'Exact amount to send to a specific address')
-  .option('--show-raw-recovery', 'Show raw recovery transactions')
-  .option('--with <peer>', 'Public key of peer to increase liquidity from')
-  .action((args, options, logger) => {
-    return new Promise(async (resolve, reject) => {
-      try {
-        return swaps.swapOut({
-          fetch,
-          logger,
-          api_key: options.apiKey || undefined,
-          avoid: flatten([options.avoid].filter(n => !!n)),
-          confs: options.confs,
-          fs: {getFile: readFile},
-          is_fast: options.fast || false,
-          is_raw_recovery_shown: options.showRawRecovery || undefined,
-          is_dry_run: options.dryrun || false,
-          lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
-          max_deposit: options.maxDeposit,
-          max_fee: options.maxFee,
-          max_paths: options.maxPaths || undefined,
-          max_wait_blocks: Math.ceil((options.maxHours) * 60 / 10),
-          node: options.node || undefined,
-          out_address: options.address || undefined,
-          peer: options.with || undefined,
-          recovery: options.recovery,
-          request: commands.fetchRequest({fetch}),
-          socket: options.serviceSocket || undefined,
-          spend_address: options.spendAddress || undefined,
-          spend_tokens: options.spendAmount || undefined,
-          timeout: 1000 * 60 * 60 * 10,
-          tokens: accounting.parseAmount({amount: options.amount}).tokens,
-        },
-        responses.returnObject({exit, logger, reject, resolve}));
-      } catch (err) {
-        return logger.error({err}) && reject();
-      }
-    });
-  })
-
   // Increase outbound liquidity
   .command('increase-outbound-liquidity', 'Move on-chain funds off-chain')
   .help('Open a new channel to add more off-chain liquidity')
@@ -1264,7 +1202,7 @@ prog
   .option('--above <tokens>', 'Return amount above watermark', INT)
   .option('--fast', 'Avoid any server batching wait time')
   .option('--node <node_name>', 'Node to get liquidity cost')
-  .option('--service-socket', 'Specify a custom swap service address')
+  .option('--service-socket <socket>', 'Specify a custom swap service address')
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
@@ -2008,10 +1946,11 @@ prog
   .command('swap-api-key', 'Purchase a swap API key or inspect a swap API key')
   .visible(false)
   .option('--api-key <api_key>', 'Hex encoded full swap API key')
-  .option('--purchase', 'Purchase a new swap API key')
   .option('--macaroon <macaroon>', 'Hex encoded macaroon of swap API key')
+  .option('--max-fee <max_fee>', 'Max tokens to pay for the API key', INT)
   .option('--node <node_name>', 'Node to use to pay for API key')
   .option('--preimage <preimage>', 'Hex encoded preimage of swap API key')
+  .option('--purchase', 'Purchase a new swap API key')
   .option('--service-socket <swap_service_socket>', 'host:port for service')
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
@@ -2023,6 +1962,7 @@ prog
           is_purchase: options.purchase,
           lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
           macaroon: options.macaroon,
+          max_fee: options.maxFee,
           node: options.node,
           preimage: options.preimage,
           socket: options.serviceSocket,
@@ -2056,15 +1996,17 @@ prog
   // Create submarine swap to convert on-chain funds to off-chain
   .command('swap-in', 'Trade on-chain coins for off-chain via submarine swap')
   .argument('[amount]', 'Amount to receive', INT, 1e6)
+  .help('Use the recovery secret of a swap with --refund-address to refund it')
   .option('--api-key <api_key>', 'Pre-paid API key to use', hexMatch)
   .option('--in <peer>', 'Request receiving through a specific peer')
+  .option('--max-api-key-fee <fee>', 'Max tokens to pay for API key', INT)
   .option('--max-fee <max_fee>', 'Max fee in tokens to pay', INT, 4000)
+  .option('--max-fee-rate <ppm>', 'Max fee rate in parts per million', INT)
   .option('--no-color', 'Mute all colors')
   .option('--node <node_name>', 'Node to receive funds on')
-  .option('--recovery <refund_recovery>', 'Attempt refund of swap', hexMatch)
-  .option('--refund-address <refund_address>', 'Refund address for swap')
+  .option('--recovery <recovery>', 'Reuse the shared address', hexMatch)
+  .option('--refund-address <address>', 'Refund expired deposits/unpaid swaps')
   .option('--service-socket <swap_service_socket>', 'host:port for service')
-  .option('--test-refund', 'Reduce refund timeout height to test refund')
   .action((args, options, logger) => {
     return new Promise(async (resolve, reject) => {
       try {
@@ -2072,15 +2014,13 @@ prog
           fetch,
           logger,
           api_key: options.apiKey || undefined,
-          fs: {getFile: readFile},
           in_through: options.in || undefined,
-          is_refund_test: options.testRefund,
           lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
+          max_api_key_fee: options.maxApiKeyFee,
           max_fee: options.maxFee,
-          node: options.node,
+          max_fee_rate: options.maxFeeRate,
           recovery: options.recovery,
           refund_address: options.refundAddress,
-          request: commands.simpleRequest,
           socket: options.serviceSocket || undefined,
           tokens: args.amount,
         },
@@ -2091,6 +2031,62 @@ prog
     });
   })
 
+  // Trade off-chain funds for on-chain funds through a swap out
+  .command('swap-out', 'Trade off-chain coins for on-chain with swap service')
+  .help('Spend down a channel to get inbound. Fee is an estimate, may be more')
+  .help('Formulas supported for --amount like 5*m or 0.05*BTC for 5 million')
+  .help('--out can take a tag, --out-filter narrows the peers of the tag')
+  .help('--out-filter vars: CAPACITY/HEIGHTS/INBOUND_LIQUIDITY')
+  .help('--out-filter vars: OUTBOUND_LIQUIDITY/PENDING_PAYMENTS')
+  .help('--out-filter vars: INBOUND_BASE_FEE/INBOUND_FEE_RATE')
+  .option('--address <out_address>', 'Out chain address to send funds out to')
+  .option('--amount <amount>', 'Amount to increase inbound', STRING, '500*k')
+  .option('--api-key <api_key>', 'Pre-paid API key to use')
+  .option('--avoid <pubkey/chan/tag>', 'Avoid forwarding through', REPEATABLE)
+  .option('--confs <confs>', 'Confs to consider reorg safe', INT, 1)
+  .option('--dryrun', 'Only show cost estimate for increase')
+  .option('--fast', 'Request swap server avoid batching delay')
+  .option('--max-api-key-fee <fee>', 'Max tokens to pay for API key', INT)
+  .option('--max-deposit <max_deposit>', 'Maximum deposit amount', INT, 5e4)
+  .option('--max-fee <max_fee>', 'Maximum estimated fee tokens', INT, 3e4)
+  .option('--max-paths <max_paths>', 'Maximum paths to attempt', INT, 1)
+  .option('--no-color', 'Mute all colors')
+  .option('--node <node_name>', 'Increase inbound liquidity on saved node')
+  .option('--out <peer>', 'Peer or tag to increase inbound liquidity from')
+  .option('--out-filter <out_filter>', 'Filter outbound peer/tag', REPEATABLE)
+  .option('--recovery <recovery>', 'Recover in-progress swap')
+  .option('--service-socket <socket>', 'Specify a custom swap service address')
+  .action((args, options, logger) => {
+    return new Promise(async (resolve, reject) => {
+      try {
+        return swaps.swapOut({
+          fetch,
+          logger,
+          api_key: options.apiKey || undefined,
+          avoid: flatten([options.avoid].filter(n => !!n)),
+          confs: options.confs,
+          fs: {getFile: readFile},
+          is_dry_run: options.dryrun || false,
+          is_fast: options.fast || false,
+          lnd: (await lnd.authenticatedLnd({logger, node: options.node})).lnd,
+          max_api_key_fee: options.maxApiKeyFee,
+          max_deposit: options.maxDeposit,
+          max_fee: options.maxFee,
+          max_paths: options.maxPaths || undefined,
+          out_address: options.address || undefined,
+          out_filters: flatten([options.outFilter].filter(n => !!n)),
+          peer: options.out || undefined,
+          recovery: options.recovery,
+          socket: options.serviceSocket || undefined,
+          tokens: accounting.parseAmount({amount: options.amount}).tokens,
+        },
+        responses.returnObject({exit, logger, reject, resolve}));
+      } catch (err) {
+        return logger.error({err}) && reject();
+      }
+    });
+  })
+
   // Adjust the set of tagged nodes
   .command('tags', 'View or adjust the set of tagged nodes')
   .help('Tags can be used in other commands via --tag and --avoid options')

package/package.json

@@ -29,20 +29,20 @@
     "bolt07": "2.0.0",
     "colorette": "2.0.20",
     "csv-parse": "7.0.3",
-    "goldengate": "16.0.10",
+    "goldengate": "17.0.0",
     "grammy": "1.46.0",
     "import-lazy": "4.0.0",
     "ini": "7.0.0",
-    "inquirer": "14.2.5",
+    "inquirer": "14.3.0",
     "ln-accounting": "11.0.0",
     "ln-service": "60.3.0",
     "ln-sync": "8.1.0",
     "ln-telegram": "8.2.0",
     "moment": "2.31.0",
-    "paid-services": "10.3.3",
+    "paid-services": "11.0.0",
     "probing": "7.1.0",
     "qrcode-terminal": "0.12.0",
-    "sanitize-filename": "1.6.4",
+    "sanitize-filename": "1.6.5",
     "socks-proxy-agent": "10.1.0",
     "table": "6.10.1",
     "tiny-secp256k1": "2.2.5",
@@ -50,8 +50,13 @@
   },
   "description": "Lightning balance CLI",
   "devDependencies": {
+    "@grpc/grpc-js": "1.14.7",
+    "@grpc/proto-loader": "0.8.1",
     "invoices": "6.3.3",
-    "ln-docker-daemons": "8.1.4"
+    "ln-docker-daemons": "8.1.4",
+    "macaroon": "3.0.4",
+    "p2tr": "3.0.0",
+    "psbt": "7.0.1"
   },
   "engines": {
     "node": ">=22"
@@ -103,5 +108,5 @@
     "reinstall-dependencies": "rm -rf node_modules package-lock.json && npm i",
     "test": "node --experimental-test-coverage --test test/arrays/*.js test/balances/*.js test/chain/*.js test/commands/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/lnurl/*.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": "25.7.0"
+  "version": "26.0.0"
 }

package/routing/get_chain_fees_chart.js

@@ -30,7 +30,6 @@ const parseDate = n => Date.parse(n);
     [end_date]: <End Date YYYY-MM-DD String>
     is_monochrome: <Omit Colors Bool>
     lnds: [<Authenticated LND API Object>]
-    request: <Request Function>
     [start_date]: <Start Date YYYY-MM-DD String>
   }
 
@@ -50,10 +49,6 @@ module.exports = (args, cbk) => {
           return cbk([400, 'ExpectedLndToGetChainFeesChart']);
         }
 
-        if (!args.request) {
-          return cbk([400, 'ExpectedRequestFunctionToGetChainFees']);
-        }
-
         // Exit early when there is no end date and no start date
         if (!args.end_date && !args.start_date) {
           return cbk();
@@ -154,7 +149,6 @@ module.exports = (args, cbk) => {
               lnd,
               after: start.toISOString(),
               network: res.network,
-              request: args.request,
             },
             cbk);
           });

package/swaps/cancel_unsigned_swap_in.js

@@ -0,0 +1,94 @@
+const asyncAuto = require('async/auto');
+const asyncReflect = require('async/reflect');
+const {cancelHodlInvoice} = require('ln-service');
+const {cancelSwapIn} = require('goldengate');
+const {returnResult} = require('asyncjs-util');
+
+const isHash = n => !!n && /^[0-9A-F]{64}$/i.test(n);
+
+/** Cancel a swap in that is not signed yet, along with its swap invoice
+
+  {
+    id: <Swap Hash Hex String>
+    lnd: <Authenticated LND API Object>
+    logger: <Winston Logger Object>
+    metadata: <Authentication Metadata Object>
+    service: <Swap Service Object>
+  }
+
+  @returns via cbk or Promise
+*/
+module.exports = (args, cbk) => {
+  return new Promise((resolve, reject) => {
+    return asyncAuto({
+      // Check arguments
+      validate: cbk => {
+        if (!isHash(args.id)) {
+          return cbk([400, 'ExpectedSwapHashToCancelUnsignedSwapIn']);
+        }
+
+        if (!args.lnd) {
+          return cbk([400, 'ExpectedLndToCancelUnsignedSwapIn']);
+        }
+
+        if (!args.logger) {
+          return cbk([400, 'ExpectedLoggerToCancelUnsignedSwapIn']);
+        }
+
+        if (!args.metadata) {
+          return cbk([400, 'ExpectedAuthMetadataToCancelUnsignedSwapIn']);
+        }
+
+        if (!args.service) {
+          return cbk([400, 'ExpectedServiceToCancelUnsignedSwapIn']);
+        }
+
+        return cbk();
+      },
+
+      // Cancel the swap with the service, releasing its deposits
+      cancelSwap: ['validate', asyncReflect(({}, cbk) => {
+        return cancelSwapIn({
+          id: args.id,
+          metadata: args.metadata,
+          service: args.service,
+        },
+        cbk);
+      })],
+
+      // Cancel the swap invoice so that it can no longer be paid
+      cancelInvoice: ['cancelSwap', asyncReflect(({}, cbk) => {
+        return cancelHodlInvoice({id: args.id, lnd: args.lnd}, cbk);
+      })],
+
+      // Report the cancel of the swap
+      reportSwap: ['cancelSwap', ({cancelSwap}, cbk) => {
+        // Exit early when the swap could not be canceled
+        if (!!cancelSwap.error) {
+          args.logger.error({failed_to_cancel_swap_in: cancelSwap.error});
+
+          return cbk();
+        }
+
+        args.logger.info({canceled_swap_in: args.id});
+
+        return cbk();
+      }],
+
+      // Report a failure to cancel the swap invoice
+      reportInvoice: ['cancelInvoice', ({cancelInvoice}, cbk) => {
+        // Exit early when the swap invoice was canceled
+        if (!cancelInvoice.error) {
+          return cbk();
+        }
+
+        args.logger.error({
+          failed_to_cancel_swap_in_invoice: cancelInvoice.error,
+        });
+
+        return cbk();
+      }],
+    },
+    returnResult({reject, resolve}, cbk));
+  });
+};

package/swaps/constants.json

@@ -1,23 +1,36 @@
 {
   "cltvDeltaBuffer": 3,
   "estimatedSweepVbytes": 153,
+  "externalPayUpdates": [
+    "external_funding_pay_to_fund_swap_offchain",
+    "external_pay_deposit_request"
+  ],
   "fastDelayMinutes": 1,
-  "feeRateDenominator": 1000000,
-  "fuzzBlocks": 5,
-  "maxCltvExpiration": 2016,
+  "invoiceNetworks": {
+    "btc": "bitcoin",
+    "btcregtest": "regtest",
+    "btcsignet": "signet",
+    "btctestnet": "testnet",
+    "btctestnet4": "testnet"
+  },
   "maxDepositTokens": 50000,
   "maxExecutionFeeTokens": 1000,
-  "maxFeeMultiplier": 1000,
   "maxFeeRate": 0.06,
   "maxPathfindingMs": 1200000,
-  "maxRouteFailProbability": 1000000,
   "maxRoutingFeeDenominator": 100,
-  "minCltvDelta": 16,
   "minConfs": 1,
-  "minSweepConfs": 1,
   "minutesPerBlock": 10,
-  "requiredBufferBlocks": 36,
+  "sharedAddressKeyFamily": 42060,
   "slowDelayMinutes": 30,
-  "swapTypes": ["inbound", "outbound"],
-  "sweepProgressLogDelayMs": 2000
+  "swapInCosignQuietMs": 30000,
+  "swapInDepositConfs": 3,
+  "swapInEventsMinAliveMs": 60000,
+  "swapInEventsRetryMs": 10000,
+  "swapInEventsRetryStepMs": 1000,
+  "swapInMaxTimeoutBlocks": 2016,
+  "swapInPaymentTimeoutSeconds": 60,
+  "swapInRefundConfTarget": 6,
+  "swapInSweepRequestsWaitMs": 180000,
+  "swapInUtxosCount": 1,
+  "swapTypes": ["inbound", "outbound"]
 }