paid-services 8.0.6 → 9.0.0

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Versions
 
-## Version 8.0.6
+## Version 9.0.0
+
+### Breaking Changes
+
+- `changeChannelCapacity`: Remove method to change channel capacity
+
+## Version 8.0.7
 
 ### Breaking Changes
 

package/index.js

@@ -1,5 +1,4 @@
 const {balancedOpenRequest} = require('./balanced');
-const {changeChannelCapacity} = require('./capacity');
 const {confirmServiceUse} = require('./client');
 const {createAnchoredTrade} = require('./trades');
 const {createGroupChannel} = require('./groups');
@@ -25,7 +24,6 @@ const serviceIds = schema.types;
 
 module.exports = {
   balancedOpenRequest,
-  changeChannelCapacity,
   confirmServiceUse,
   createAnchoredTrade,
   createGroupChannel,

package/package.json

@@ -1,36 +1,58 @@
 {
+  "allowScripts": {
+    "cpu-features@0.0.10": true,
+    "protobufjs@7.6.6": true,
+    "ssh2@1.17.0": true
+  },
   "author": {
     "name": "Alex Bosworth",
-    "url": "https://twitter.com/alexbosworth"
+    "url": "https://x.com/alexbosworth"
   },
   "bugs": {
     "url": "https://github.com/alexbosworth/paid-services/issues"
   },
   "dependencies": {
-    "@alexbosworth/blockchain": "4.0.0",
+    "@alexbosworth/blockchain": "4.8.0",
     "@alexbosworth/fiat": "2.0.0",
     "async": "3.2.6",
     "asyncjs-util": "1.2.12",
-    "bech32": "2.0.0",
-    "bolt01": "3.0.0",
-    "bolt07": "1.9.5",
+    "bolt01": "4.0.0",
+    "bolt07": "2.0.0",
     "ecpair": "2.1.0",
-    "goldengate": "16.0.5",
-    "invoices": "6.0.0",
-    "ln-service": "59.2.4",
-    "ln-sync": "8.0.4",
-    "psbt": "5.0.0",
-    "p2tr": "2.0.0",
+    "goldengate": "16.0.7",
+    "invoices": "6.2.0",
+    "ln-service": "59.7.0",
+    "ln-sync": "8.0.6",
+    "psbt": "6.0.4",
+    "p2tr": "3.0.0",
     "tiny-secp256k1": "2.2.4"
   },
   "description": "Lightning Paid Services library",
   "devDependencies": {
-    "ln-docker-daemons": "8.0.2",
+    "ln-docker-daemons": "8.0.5",
     "mock-lnd": "4.0.0"
   },
   "engines": {
     "node": ">=22"
   },
+  "files": [
+    "actions/",
+    "balanced/",
+    "CHANGELOG.md",
+    "client/",
+    "config/",
+    "groups/",
+    "index.js",
+    "jobs/",
+    "p2p/",
+    "records/",
+    "respond/",
+    "server/",
+    "service_types.json",
+    "services/",
+    "swaps/",
+    "trades/"
+  ],
   "keywords": [
     "lightning",
     "lightning-network"
@@ -40,11 +62,11 @@
   "name": "paid-services",
   "repository": {
     "type": "git",
-    "url": "https://github.com/alexbosworth/paid-services.git"
+    "url": "git+https://github.com/alexbosworth/paid-services.git"
   },
   "scripts": {
     "integration-tests": "node test/integration",
-    "test": "node --experimental-test-coverage --test test/actions/*.js test/balanced/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/swaps/*.js test/services/*.js test/trades/*.js"
+    "test": "node --experimental-test-coverage --test test/actions/*.js test/balanced/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/swaps/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "8.0.6"
+  "version": "9.0.0"
 }

package/swaps/complete_off_to_on_swap.js

@@ -7,7 +7,6 @@ const asyncMapSeries = require('async/mapSeries');
 const asyncRace = require('async/race');
 const asyncReflect = require('async/reflect');
 const asyncTimeout = require('async/timeout');
-const {bech32m} = require('bech32');
 const {beginGroupSigningSession} = require('ln-service');
 const {broadcastChainTransaction} = require('ln-service');
 const {cancelSwapOut} = require('goldengate');
@@ -15,6 +14,7 @@ const {confirmationFee} = require('goldengate');
 const {controlBlock} = require('p2tr');
 const {createChainAddress} = require('ln-service');
 const {diffieHellmanComputeSecret} = require('ln-service');
+const {encodeBech32Address} = require('@alexbosworth/blockchain');
 const {findConfirmedOutput} = require('ln-sync');
 const {findDeposit} = require('goldengate');
 const {getChainFeeRate} = require('ln-service');
@@ -61,7 +61,6 @@ const defaultMaxFeeMultiplier = 1000;
 const defaultMaxPreimagePushFee = 10;
 const defaultMinSweepBlocks = 20;
 const defaultWaitForChainFundingMs = 1000 * 60 * 60 * 3;
-const encodeAddress = (prefix, data) => bech32m.encode(prefix, data);
 const externalKeyAsOutputScript = key => `5120${key}`;
 const family = 805;
 const {floor} = Math;
@@ -92,7 +91,7 @@ const sweepInputIndex = 0;
 const times = n => Array(n).fill(null).map((_, i) => i);
 const tokensForPushPreimage = 1;
 const uniqBy = (a,b) => a.filter((e,i) => a.findIndex(n => n[b] == e[b]) == i);
-const v1AddressWords = key => [].concat(1).concat(bech32m.toWords(key));
+const witnessVersionTaproot = 1;
 
 /** Complete the off to on swap
 
@@ -691,7 +690,11 @@ module.exports = (args, cbk) => {
         const outputScript = swap.output_script;
         const prefix = networks[getNetwork.bitcoinjs].bech32;
 
-        const address = encodeAddress(prefix, v1AddressWords(key));
+        const {address} = encodeBech32Address({
+          prefix,
+          program: key,
+          version: witnessVersionTaproot,
+        });
 
         args.emitter.emit('update', {
           waiting_for_chain_funding: address,

package/.gitattributes

@@ -1 +0,0 @@
-package-lock.json binary

package/.prettierignore

@@ -1,2 +0,0 @@
-bos
-*.js

package/.tm_properties

@@ -1 +0,0 @@
-exclude = '{$exclude,node_modules}'

package/capacity/accept_capacity_change.js

@@ -1,292 +0,0 @@
-const asyncAuto = require('async/auto');
-const {getChainTransactions} = require('ln-service');
-const {getChannel} = require('ln-service');
-const {getChannels} = require('ln-service');
-const {returnResult} = require('asyncjs-util');
-const {stopAllHtlcs} = require('ln-sync');
-const {Transaction} = require('bitcoinjs-lib');
-
-const encodeSignCapacityResponse = require('./encode_sign_capacity_response');
-const getReplacementSignature = require('./get_replacement_signature');
-const {makePeerRequest} = require('./../p2p');
-const parseAcceptResponse = require('./parse_accept_response');
-const parseSignCapacityRequest = require('./parse_sign_capacity_request');
-const {servicePeerRequests} = require('./../p2p');
-const {serviceTypeAcceptCapacityChange} = require('./../service_types');
-const {serviceTypeSignCapacityChange} = require('./../service_types');
-const {serviceTypeWaitOnConfirmation} = require('./../service_types');
-
-const acceptChangeTimeoutMs = 1000 * 45;
-const bufferAsHex = buffer => buffer.toString('hex');
-const findId = records => (records.find(n => n.type === '0') || {}).value;
-const {fromHex} = Transaction;
-const idType = '0';
-const openTxType = '1';
-
-/** Accept a request from a peer to change a channel's capacity
-
-  {
-    channel: <Standard Format Channel Id String>
-    from: <Accept Request From Public Key Hex String>
-    id: <Request Id Hex String>
-    [increase]: <Increase Tokens Number>
-    lnd: <Authenticated LND API Object>
-    logger: <Winston Logger Object>
-    to: <Expect Channel from Public Key Hex String>
-  }
-
-  @returns via cbk or Promise
-  {
-    base_fee_mtokens: <Original Forwarding Base Fee Millitokens String>
-    cltv_delta: <Original Forwarding CLTV Delta Number>
-    fee_rate: <Original Forwarding Parts Per Million Fee Rate Number>
-    transaction_id: <Replacement Channel Transaction Id Hex String> 
-    transaction_vout: <Replacement Channel Transaction Output Index Number>
-  }
-*/
-module.exports = ({channel, from, id, increase, lnd, logger, to}, cbk) => {
-  return new Promise((resolve, reject) => {
-    return asyncAuto({
-      // Check arguments
-      validate: cbk => {
-        if (!channel) {
-          return cbk([400, 'ExpectedChannelIdToAcceptCapacityChange']);
-        }
-
-        if (!from) {
-          return cbk([400, 'ExpectedFromPublicKeyToAcceptCapacityChange']);
-        }
-
-        if (!id) {
-          return cbk([400, 'ExpectedRequestIdToAcceptCapacityChange']);
-        }
-
-        if (!lnd) {
-          return cbk([400, 'ExpectedAuthenticatedLndToAcceptCapacityChange']);
-        }
-
-        if (!logger) {
-          return cbk([400, 'ExpectedLoggerObjectToAcceptCapacityChange']);
-        }
-
-        if (!to) {
-          return cbk([400, 'ExpectedToPublicKeyToAcceptCapacityChange']);
-        }
-
-        return cbk();
-      },
-
-      // Get the fee policies on the channel to set it back on success
-      getChannel: ['validate', ({}, cbk) => {
-        return getChannel({lnd, id: channel}, cbk);
-      }],
-
-      // Get all channel ids with the peer in order to stop HTLCs on them
-      getChannels: ['validate', ({}, cbk) => {
-        return getChannels({lnd, partner_public_key: from}, cbk);
-      }],
-
-      // Get chain transactions to look for the channel open tx
-      getChainTxs: ['validate', ({}, cbk) => {
-        return getChainTransactions({lnd}, cbk);
-      }],
-
-      // Policy for the channel
-      policy: ['getChannel', ({getChannel}, cbk) => {
-        const policy = getChannel.policies.find(n => n.public_key !== from);
-
-        if (!policy.cltv_delta) {
-          return cbk([404, 'FailedToFindChannelRoutingPolicyDetails']);
-        }
-
-        return cbk(null, {
-          base_fee_mtokens: policy.base_fee_mtokens,
-          cltv_delta: policy.cltv_delta,
-          fee_rate: policy.fee_rate,
-          transaction_id: getChannel.transaction_id,
-          transaction_vout: getChannel.transaction_vout,
-        });
-      }],
-
-      // Send the initial proposal acceptance to the peer
-      acceptChange: [
-        'getChainTxs',
-        'getChannel',
-        'getChannels',
-        'policy',
-        ({getChainTxs, getChannel}, cbk) =>
-      {
-        const records = [{type: idType, value: id}];
-
-        const tx = getChainTxs.transactions.find(transaction => {
-          return transaction.id === getChannel.transaction_id;
-        });
-
-        const txRecordValue = !!tx && !!tx.transaction ? tx.transaction : null;
-
-        if (!!txRecordValue) {
-          records.push({type: openTxType, value: txRecordValue});
-        }
-
-        // Kick off the capacity change
-        return makePeerRequest({
-          lnd,
-          records,
-          timeout: acceptChangeTimeoutMs,
-          to: from,
-          type: serviceTypeAcceptCapacityChange,
-        },
-        (err, res) => {
-          if (!!err) {
-            return cbk(err);
-          }
-
-          try {
-            const {transaction} = parseAcceptResponse({
-              records: res.records,
-              transaction_id: getChannel.transaction_id,
-            });
-
-            if (!transaction && !txRecordValue) {
-              return cbk([404, 'MissingTransactionOpenRawTxData']);
-            }
-
-            return cbk(null, {transaction: transaction || txRecordValue});
-          } catch (err) {
-            return cbk([503, err.message]);
-          }
-        });
-      }],
-
-      // Stop HTLCs with the peer until the channel is closed
-      stopHtlcs: ['getChannels', ({getChannels}, cbk) => {
-        return stopAllHtlcs({
-          lnd,
-          id: channel,
-          ids: getChannels.channels.map(n => n.id),
-          peer: from,
-        },
-        cbk);
-      }],
-
-      // Lookup the open transaction and get the output script
-      output: [
-        'acceptChange',
-        'getChannel',
-        ({acceptChange, getChannel}, cbk) =>
-      {
-        const {outs} = fromHex(acceptChange.transaction);
-
-        const output = outs[getChannel.transaction_vout];
-
-        if (!output) {
-          return cbk([503, 'ExpectedOpenTxFundingTransactionOutput']);
-        }
-
-        return cbk(null, bufferAsHex(output.script));
-      }],
-
-      // Ask to change capacity and return the final signature when needed
-      changeCapacity: ['output', 'policy', ({output, policy}, cbk) => {
-        logger.info({starting_capacity_change: true});
-
-        const service = servicePeerRequests({lnd});
-
-        // Listen for close-and-replace signals
-        service.request({type: serviceTypeSignCapacityChange}, (req, res) => {
-          // Exit early when the request is from a different peer/change
-          if (req.from !== from || findId(req.records) !== id) {
-            return;
-          }
-
-          const {failure, success} = res;
-
-          const parameters = {
-            increase,
-            id: policy.transaction_id,
-            records: req.records,
-            vout: policy.transaction_vout,
-          };
-
-          // Check to make sure that the request records make sense
-          try {
-            parseSignCapacityRequest(parameters);
-          } catch (err) {
-            logger.error({err: [503, err.message]});
-
-            return failure([503, 'FailedToParseSignChangeRequest']);
-          }
-
-          logger.info({closing_and_reopening_channel: true});
-
-          // Trigger the replacement flow and sign the unsigned tx
-          return getReplacementSignature({
-            channel,
-            lnd,
-            output,
-            to,
-            id: parameters.id,
-            unsigned: parseSignCapacityRequest(parameters).unsigned,
-            vout: parameters.vout,
-          },
-          (err, res) => {
-            if (!!err) {
-              logger.error({err});
-
-              return failure([503, 'UnexpectedErrorGettingSignature']);
-            }
-
-            // Stop listening for sign capacity change requests
-            service.stop({});
-
-            // Encode the signature into records
-            const {records} = encodeSignCapacityResponse({
-              id: parameters.id,
-              signature: res.signature,
-            });
-
-            // Send the replacement signature for the change request
-            success({records});
-
-            logger.info({new_channel_transaction_id: res.transaction_id});
-
-            // Return the replacement funding outpoint
-            return cbk(null, {
-              transaction_id: res.transaction_id,
-              transaction_vout: res.transaction_vout,
-            });
-          });
-        });
-
-        // Listen for wait-for-confirmation signals
-        service.request({type: serviceTypeWaitOnConfirmation}, (req, res) => {
-          // Exit early when the request is from a different peer/change
-          if (req.from !== from || findId(req.records) !== id) {
-            return;
-          }
-
-          logger.info({peer_is_looking_for_confirmation: new Date()});
-
-          // Return an ack that the waiting signal was heard
-          return res.success({});
-        });
-      }],
-
-      // Accepted the capacity change
-      accepted: [
-        'changeCapacity',
-        'policy',
-        ({changeCapacity, policy}, cbk) =>
-      {
-        return cbk(null, {
-          base_fee_mtokens: policy.base_fee_mtokens,
-          cltv_delta: policy.cltv_delta,
-          fee_rate: policy.fee_rate,
-          transaction_id: changeCapacity.transaction_id,
-          transaction_vout: changeCapacity.transaction_vout,
-        });
-      }],
-    },
-    returnResult({reject, resolve, of: 'accepted'}, cbk));
-  });
-};