paid-services 4.3.5 → 5.0.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Versions
 
+## Version 5.0.1
+
+- `createGroupChannel`, `joinGroupChannel`, `manageGroupJoin`: Double check
+    open channel acceptance when peering
+
+## Version 5.0.0
+
+- 'createGroupChannel': Repeatedly broadcast chain transaction
+
+### Breaking Changes
+
+- node.js 14 is no longer supported, node.js 16+ required
+
 ## Version 4.3.5
 
 - `createGroupChannel`: Show members that are present

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Alex Bosworth
+Copyright (c) 2021-2023 Alex Bosworth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/groups/assemble_channel_group.js

@@ -47,7 +47,6 @@ const times = 2 * 60 * 10;
   // Open is publishing
   @event 'broadcasting'
   {
-    id: <Transaction Id Hex String>
     transaction: <Transaction Hex String>
   }
 
@@ -105,16 +104,20 @@ module.exports = ({capacity, count, ecp, identity, lnd, members, rate}) => {
   coordinator.events.once('joined', async ({ids}) => {
     emitter.emit('filled', {ids});
 
-    // Exit early when this is a pair group
-    if (count === minGroupCount) {
-      return coordinator.connected();
-    }
+    try {
+      // Exit early when this is a pair group
+      if (count === minGroupCount) {
+        const [outbound] = ids.filter(n => n !== identity);
 
-    const {inbound, outbound} = coordinator.partners(identity);
+        await peerWithPartners({capacity, lnd, outbound});
 
-    // Connect to the inbound and outbound partners
-    try {
-      await peerWithPartners({inbound, lnd, outbound});
+        return coordinator.connected();
+      }
+
+      const {inbound, outbound} = coordinator.partners(identity);
+
+      // Connect to the inbound and outbound partners
+      await peerWithPartners({capacity, inbound, lnd, outbound});
 
       // Register as connected
       return coordinator.connected();

package/groups/coordinate_channel_group.js

@@ -1,5 +1,6 @@
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
+const {broadcastTransaction} = require('ln-sync');
 const {getIdentity} = require('ln-service');
 const {getNodeAlias} = require('ln-sync');
 const {returnResult} = require('asyncjs-util');
@@ -8,6 +9,7 @@ const tinysecp = require('tiny-secp256k1');
 const askForGroupDetails = require('./ask_for_group_details');
 const assembleChannelGroup = require('./assemble_channel_group');
 
+const descriptionForGroup = 'group channel open';
 const join = arr => arr.join(', ');
 const niceName = ({alias, id}) => `${alias} ${id}`.trim();
 
@@ -20,10 +22,6 @@ const niceName = ({alias, id}) => `${alias} ${id}`.trim();
   }
 
   @returns via cbk or Promise
-  {
-    id: <Transaction Id Hex String>
-    transaction: <Raw Transaction Hex String>
-  }
 */
 module.exports = ({ask, lnd, logger}, cbk) => {
   return new Promise((resolve, reject) => {
@@ -107,7 +105,15 @@ module.exports = ({ask, lnd, logger}, cbk) => {
         coordinate.events.once('broadcast', broadcast => {
           coordinate.events.removeAllListeners();
 
-          return cbk(null, {transaction_id: broadcast.id});
+          logger.info({transaction_id: broadcast.id});
+
+          return broadcastTransaction({
+            lnd,
+            logger,
+            description: descriptionForGroup,
+            transaction: broadcast.transaction,
+          },
+          cbk);
         });
 
         coordinate.events.once('error', err => {

package/groups/create_group_channel.js

@@ -1,5 +1,6 @@
 const asyncAuto = require('async/auto');
 const asyncMap = require('async/map');
+const {broadcastTransaction} = require('ln-sync');
 const {getChainBalance} = require('ln-service');
 const {getIdentity} = require('ln-service');
 const {getMethods} = require('ln-service');
@@ -9,6 +10,7 @@ const tinysecp = require('tiny-secp256k1');
 
 const assembleChannelGroup = require('./assemble_channel_group');
 
+const descriptionForGroup = 'group channel open';
 const halfOf = n => n / 2;
 const {isArray} = Array;
 const isPublicKey = n => !!n && /^0[2-3][0-9A-F]{64}$/i.test(n);
@@ -214,7 +216,21 @@ module.exports = (args, cbk) => {
         coordinate.events.once('broadcast', broadcast => {
           coordinate.events.removeAllListeners();
 
-          return cbk(null, {transaction_id: broadcast.id});
+          args.logger.info({transaction_id: broadcast.id});
+
+          return broadcastTransaction({
+            description: descriptionForGroup,
+            lnd: args.lnd,
+            logger: args.logger,
+            transaction: broadcast.transaction,
+          },
+          err => {
+            if (!!err) {
+              return cbk(err);
+            }
+
+            return cbk(null, {transaction_id: broadcast.id});
+          });
         });
 
         coordinate.events.once('error', err => {

package/groups/join_channel_group.js

@@ -107,6 +107,7 @@ module.exports = ({capacity, coordinator, count, id, lnd, rate}, cbk) => {
       });
 
       return peerWithPartners({
+        capacity,
         lnd,
         inbound: partners.inbound,
         outbound: partners.outbound,

package/groups/join_group_channel.js

@@ -80,7 +80,11 @@ module.exports = (args, cbk) => {
         ({getJoinDetails}, cbk) =>
       {
         if (getJoinDetails.rate > args.max_rate) {
-          return cbk([400, 'ExpectedHigherMaxFeeRateToJoinGroup']);
+          return cbk([
+            400,
+            'ExpectedHigherMaxFeeRateToJoinGroup',
+            {needed_max_fee_rate: getJoinDetails.rate},
+          ]);
         }
 
         args.logger.info({waiting_for_other_members: true});

package/groups/p2p/find_group_partners.js

@@ -21,13 +21,14 @@ const typeGroupChannelId = '1';
 
   {
     coordinator: <Group Coordinator Identity Public Key Hex String>
+    count: <Group Member Count Number>
     id: <Group Identifier Hex String>
     lnd: <Authenticated LND API Object>
   }
 
   @returns via cbk or Promise
   {
-    inbound: <Inbound Peer Public Key Identity Hex String>
+    [inbound]: <Inbound Peer Public Key Identity Hex String>
     outbound: <Outbound Peer Public Key Identity Hex String>
   }
 */

package/groups/p2p/peer_with_partners.js

@@ -1,3 +1,4 @@
+const {acceptsChannelOpen} = require('ln-sync');
 const asyncAuto = require('async/auto');
 const asyncRetry = require('async/retry');
 const {connectPeer} = require('ln-sync');
@@ -9,20 +10,21 @@ const times = 2 * 60 * 30;
 /** Peer up with group channel partners
 
   {
-    inbound: <Inbound Identity Public Key Hex String>
+    capacity: <Channel Capacity Tokens Number>
+    [inbound]: <Inbound Identity Public Key Hex String>
     lnd: <Authenticated LND API Object>
     outbound: <Outbound Identity Public Key Hex String>
   }
 
   @returns via cbk or Promise
 */
-module.exports = ({inbound, lnd, outbound}, cbk) => {
+module.exports = ({capacity, inbound, lnd, outbound}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
       // Check arguments
       validate: cbk => {
-        if (!inbound) {
-          return cbk([400, 'ExpectedInboundPeerIdentityToConnectTo']);
+        if (!capacity) {
+          return cbk([400, 'ExpectedChannelCapacityToPeerWithPartners']);
         }
 
         if (!lnd) {
@@ -38,6 +40,11 @@ module.exports = ({inbound, lnd, outbound}, cbk) => {
 
       // Attempt connecting to the inbound peer
       connectInbound: ['validate', ({}, cbk) => {
+        // Exit early when there is no inbound peer
+        if (!inbound) {
+          return cbk();
+        }
+
         return asyncRetry({interval, times}, cbk => {
           return connectPeer({lnd, id: inbound}, cbk);
         },
@@ -51,6 +58,25 @@ module.exports = ({inbound, lnd, outbound}, cbk) => {
         },
         cbk);
       }],
+
+      // Test if outbound peer would accept a channel
+      getAcceptance: ['connectOutbound', ({}, cbk) => {
+        return acceptsChannelOpen({
+          capacity,
+          lnd,
+          partner_public_key: outbound,
+        },
+        cbk);
+      }],
+
+      // Check that the proposal would be accepted
+      checkAcceptance: ['getAcceptance', ({getAcceptance}, cbk) => {
+        if (!getAcceptance.is_accepted) {
+          return cbk([503, 'PeerRejectedChanOpenRequest', {peer: outbound}]);
+        }
+
+        return cbk();
+      }],
     },
     returnResult({reject, resolve}, cbk));
   });

package/package.json

@@ -16,7 +16,7 @@
     "ecpair": "2.1.0",
     "goldengate": "12.0.5",
     "invoices": "2.2.3",
-    "ln-service": "54.10.5",
+    "ln-service": "56.1.0",
     "ln-sync": "4.3.2",
     "psbt": "2.7.2",
     "p2tr": "1.3.3",
@@ -25,12 +25,12 @@
   "description": "Lightning Paid Services library",
   "devDependencies": {
     "@alexbosworth/tap": "15.0.12",
-    "ln-docker-daemons": "4.1.2",
+    "ln-docker-daemons": "5.0.1",
     "mock-lnd": "1.4.4",
     "secp256k1": "5.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "keywords": [
     "lightning",
@@ -47,5 +47,5 @@
     "integration-tests": "tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 180 test/integration/*.js",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 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"
   },
-  "version": "4.3.5"
+  "version": "5.0.1"
 }

package/swaps/complete_on_to_off_swap.js

@@ -584,6 +584,7 @@ module.exports = (args, cbk) => {
         const vout = tx.outs.findIndex(n => n.script.equals(script));
 
         args.emitter.emit('update', {
+          funding_transaction: signFunding.transaction,
           funding_transaction_id: id,
           funding_transaction_vout: vout,
         });

package/test/integration/test_group_noninteractive.js

@@ -81,12 +81,25 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
           capacity,
           count: nodes.length,
           lnd: control.lnd,
-          logger: {info: line => createLog.push(line)},
+          logger: {info: line => {createLog.push(line)}},
           members: [],
           rate: feeRate,
         });
       },
 
+      // Make blocks to activate the channel
+      generate: async () => {
+        await asyncRetry({interval, times}, async () => {
+          await generate({});
+
+          const {channels} = await getChannels({lnd, is_active: true});
+
+          if (!channels.length) {
+            throw new Error('ExpectedChannelActivation');
+          }
+        });
+      },
+
       // Join the group
       join: async () => {
         return await asyncRetry({interval, times}, async () => {
@@ -108,21 +121,6 @@ test(`Setup joint channel group`, async ({end, equal, strictSame}) => {
 
     const ids = [group.join.transaction_id, group.create.transaction_id];
 
-    // Finished, wait for the channels to activate
-    await generate({count});
-
-    const {getPendingChannels} = require('ln-service');
-
-    await asyncRetry({interval, times}, async () => {
-      await generate({});
-
-      const {channels} = await getChannels({lnd, is_active: true});
-
-      if (!channels.length) {
-        throw new Error('ExpectedChannelActivation');
-      }
-    });
-
     strictSame(ids.length, nodes.length, 'Got tx ids');
   } catch (err) {
     strictSame(err, null, 'Expected no failure');

package/test/integration/test_request_swap_out.js

@@ -1,4 +1,5 @@
 const asyncRetry = require('async/retry');
+const {broadcastChainTransaction} = require('ln-service');
 const {createChainAddress} = require('ln-service');
 const {createInvoice} = require('ln-service');
 const {getChannelBalance} = require('ln-service');
@@ -79,6 +80,16 @@ test(`Start offchain swap`, async ({end, equal, strictSame}) => {
       await target.generate({count: maturity});
     }
 
+    // Make sure control can pay off chain to target
+    {
+      await asyncRetry({interval, times}, async () => {
+        return await pay({
+          lnd,
+          request: (await createInvoice({tokens, lnd: target.lnd})).request,
+        });
+      });
+    }
+
     // Collect request messages
     const messages = [];
 
@@ -116,6 +127,14 @@ test(`Start offchain swap`, async ({end, equal, strictSame}) => {
             lnd: target.lnd,
             logger: {
               info: async message => {
+                // Make sure that target gets the funding transaction
+                if (message.funding_transaction) {
+                  await broadcastChainTransaction({
+                    lnd: target.lnd,
+                    transaction: message.funding_transaction,
+                  });
+                }
+
                 if (!!message.response) {
                   return cbk({response: message.response});
                 }

package/test/integration/test_sign_capacity_replacement.js

@@ -71,8 +71,9 @@ test(`Sign capacity replacement`, async ({end, equal, strictSame}) => {
     // Close the channel
     const channelClose = await closeChannel({
       lnd,
-      id: channel.id,
       is_force_close: true,
+      transaction_id: channel.transaction_id,
+      transaction_vout: channel.transaction_vout,
     });
 
     // Find the open tx
@@ -124,6 +125,7 @@ test(`Sign capacity replacement`, async ({end, equal, strictSame}) => {
     });
 
     await broadcastChainTransaction({transaction, lnd});
+    await broadcastChainTransaction({transaction, lnd: target.lnd});
 
     await generate({count: maturity});
 

package/test/integration/test_swap_with_claim_path.js

@@ -1,4 +1,5 @@
 const asyncRetry = require('async/retry');
+const {broadcastChainTransaction} = require('ln-service');
 const {createChainAddress} = require('ln-service');
 const {createInvoice} = require('ln-service');
 const {getChannelBalance} = require('ln-service');
@@ -52,6 +53,18 @@ test(`Swap with claim path`, async ({end, equal, strictSame}) => {
         });
       });
 
+      // Make sure control can pay off chain to target
+      {
+        await asyncRetry({interval, times}, async () => {
+          await generate({});
+
+          return await pay({
+            lnd,
+            request: (await createInvoice({tokens, lnd: target.lnd})).request,
+          });
+        });
+      }
+
       await asyncRetry({interval, times}, async () => {
         const {channels} = await getChannels({lnd, is_active: true});
 
@@ -116,6 +129,14 @@ test(`Swap with claim path`, async ({end, equal, strictSame}) => {
             lnd: target.lnd,
             logger: {
               info: async message => {
+                // Make sure that target gets the funding transaction
+                if (message.funding_transaction) {
+                  await broadcastChainTransaction({
+                    lnd: target.lnd,
+                    transaction: message.funding_transaction,
+                  });
+                }
+
                 if (!!message.response) {
                   return cbk({response: message.response});
                 }

package/test/integration/test_swap_with_refund_path.js

@@ -84,6 +84,18 @@ test(`Timeout a swap`, async ({end, equal, strictSame}) => {
       await target.generate({count: maturity});
     }
 
+    // Make sure control can pay off chain to target
+    {
+      await asyncRetry({interval, times}, async () => {
+        await generate({});
+
+        return await pay({
+          lnd,
+          request: (await createInvoice({tokens, lnd: target.lnd})).request,
+        });
+      });
+    }
+
     // Collect request messages
     const messages = [];