ln-service 54.10.6 → 55.0.0

package/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Versions
 
-## 54.10.6
+## 55.0.0
+
+- `openChannel`: Add `is_max_funding` to fund a channel maximally
+- `subscribeToRpcRequests`: Add support for returning `is_max_funding` in
+    `open_channel_request`
+
+### Breaking Changes
+
+- `subscribeToRpcRequests`: `open_channel_request`: `local_tokens` is now an
+    optional value
+
+## 54.10.7
 
 - `signChainAddressMessage`: Add method to sign a message given a chain address
 - `verifyChainAddressMessage`: Add method to verify a chain address message

package/README.md

@@ -3697,12 +3697,15 @@ Requires `offchain:write`, `onchain:write`, `peers:write` permissions
 `base_fee_mtokens` is not supported on LND 0.15.5 and below
 `fee_rate` is not supported on LND 0.15.5 and below
 
+`is_max_funding` is not supported on LND 0.16.0 and below
+
     {
       [base_fee_mtokens]: <Routing Base Fee Millitokens Charged String>
       [chain_fee_tokens_per_vbyte]: <Chain Fee Tokens Per VByte Number>
       [cooperative_close_address]: <Restrict Cooperative Close To Address String>
       [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
       [give_tokens]: <Tokens to Gift To Partner Number> // Defaults to zero
+      [is_max_funding]: <Use Maximal Chain Funds For Local Funding Bool>
       [is_private]: <Channel is Private Bool> // Defaults to false
       lnd: <Authenticated LND API Object>
       local_tokens: <Total Channel Capacity Tokens Number>
@@ -6826,7 +6829,9 @@ This method is not supported in LND 0.13.4 and below
         [fee_rate]: <Routing Fee Rate In Millitokens Per Million Number>
         [give_tokens]: <Tokens to Gift To Partner Number>
         [is_private]: <Channel is Private Bool>
-        local_tokens: <Local Tokens Number>
+        [is_max_funding]: <Use Maximal Chain Funds For Local Funding Bool>
+        [is_private]: <Channel is Private Bool>
+        [local_tokens]: <Local Tokens Number>
         [min_confirmations]: <Spend UTXOs With Minimum Confirmations Number>
         [min_htlc_mtokens]: <Minimum HTLC Millitokens String>
         [partner_csv_delay]: <Peer Output CSV Delay Number>

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.3",
-    "lightning": "7.1.6",
+    "lightning": "8.0.0",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.13.0"
@@ -28,11 +28,11 @@
     "bn.js": "5.2.1",
     "bs58check": "3.0.1",
     "ecpair": "2.1.0",
-    "ln-docker-daemons": "4.1.2",
+    "ln-docker-daemons": "4.1.4",
     "p2tr": "1.3.3",
     "portfinder": "1.0.32",
     "psbt": "2.7.2",
-    "rimraf": "4.4.1",
+    "rimraf": "5.0.0",
     "secp256k1": "5.0.0",
     "tiny-secp256k1": "2.2.1",
     "uuid": "9.0.0",
@@ -56,6 +56,7 @@
     "url": "https://github.com/alexbosworth/ln-service.git"
   },
   "scripts": {
+    "integration-test-0.16.0": "DOCKER_LND_VERSION=v0.16.0-beta npm run test",
     "integration-test-0.15.5": "DOCKER_LND_VERSION=v0.15.5-beta npm run test",
     "integration-test-0.15.4": "DOCKER_LND_VERSION=v0.15.4-beta npm run test",
     "integration-test-0.15.3": "DOCKER_LND_VERSION=v0.15.3-beta npm run test",
@@ -64,5 +65,5 @@
     "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 200 test/autopilotrpc-integration/*.js test/chainrpc-integration/*.js test/integration/*.js test/invoicesrpc-integration/*.js test/peersrpc-integration/*.js test/routerrpc-integration/*.js test/signerrpc-integration/*.js test/tower_clientrpc-integration/*.js test/tower_serverrpc-integration/*.js test/walletrpc-integration/*.js"
   },
-  "version": "54.10.6"
+  "version": "55.0.0"
 }

package/test/integration/test_delete_pending_channel.js

@@ -30,7 +30,7 @@ const interval = 100;
 const race = promises => Promise.race(promises);
 const size = 3;
 const timeout = 1000 * 20;
-const times = 200;
+const times = 300;
 
 // Forfeiting a pending channel should remove the pending channel
 test(`Forfeit pending channel`, async ({end, equal, strictSame}) => {

package/test/integration/test_subscribe_to_graph.js

@@ -12,147 +12,153 @@ const {subscribeToGraph} = require('./../../');
 const capacity = 1e6;
 const interval = 10;
 const size = 2;
-const times = 2000;
+const times = 1000;
 
 // Subscribing to graph should trigger graph events
 test('Subscribe to channels', async ({end, equal, fail, strictSame}) => {
-  const {kill, nodes} = await spawnLightningCluster({size});
+  await asyncRetry({interval, times}, async () => {
+    const {kill, nodes} = await spawnLightningCluster({size});
 
-  const [control, target] = nodes;
+    const [control, target] = nodes;
 
-  const {generate, lnd} = control;
+    const {generate, lnd} = control;
 
-  const channelClosed = [];
-  const channelUpdated = [];
-  const nodeUpdated = [];
-  const {socket} = target;
+    const channelClosed = [];
+    const channelUpdated = [];
+    const nodeUpdated = [];
+    const {socket} = target;
 
-  await delay(3000);
+    await delay(3000);
 
-  const sub = subscribeToGraph({lnd});
+    const sub = subscribeToGraph({lnd});
 
-  sub.on('channel_closed', update => channelClosed.push(update));
-  sub.on('channel_updated', update => channelUpdated.push(update));
-  sub.on('node_updated', update => nodeUpdated.push(update));
-  sub.on('err', err => {});
+    sub.on('channel_closed', update => channelClosed.push(update));
+    sub.on('channel_updated', update => channelUpdated.push(update));
+    sub.on('node_updated', update => nodeUpdated.push(update));
+    sub.on('err', err => {});
 
-  const channel = await setupChannel({
-    capacity,
-    generate,
-    lnd,
-    to: target,
-  });
+    try {
+      const channel = await setupChannel({
+        capacity,
+        generate,
+        lnd,
+        to: target,
+      });
 
-  const {id} = channel;
+      const {id} = channel;
 
-  const channelPolicies = await getChannel({id, lnd});
+      const channelPolicies = await getChannel({id, lnd});
 
-  await asyncRetry({interval, times}, async () => {
-    await addPeer({lnd, public_key: target.id, socket: target.socket});
+      await asyncRetry({interval, times}, async () => {
+        await addPeer({lnd, public_key: target.id, socket: target.socket});
 
-    if (!channelUpdated.length) {
-      throw new Error('ExpectedChannelUpdated');
-    }
+        if (!channelUpdated.length) {
+          throw new Error('ExpectedChannelUpdated');
+        }
 
-    if (nodeUpdated.length !== [control, target].length) {
-      throw new Error('ExpectedNodesUpdated');
-    }
+        if (nodeUpdated.length !== [control, target].length) {
+          throw new Error('ExpectedNodesUpdated');
+        }
 
-    return;
-  });
+        return;
+      });
 
-  await closeChannel({id, lnd})
+      await closeChannel({id, lnd})
 
-  await asyncRetry({interval, times}, async () => {
-    await generate({});
+      await asyncRetry({interval, times}, async () => {
+        await generate({});
 
-    if (!channelClosed.length) {
-      throw new Error('ExpectedChannelClosed');
-    }
+        if (!channelClosed.length) {
+          throw new Error('ExpectedChannelClosed');
+        }
 
-    return;
-  });
+        return;
+      });
 
-  const [channelClose] = channelClosed;
-
-  equal(channelClose.capacity, capacity, 'Got closed channel capacity');
-  equal(!!channelClose.close_height, true, 'Got closed channel height');
-  equal(channelClose.id, id, 'Got closed channel id');
-  equal(channelClose.transaction_id, channel.transaction_id, 'Got close tx');
-  equal(channelClose.transaction_vout, channel.transaction_vout, 'Got vout');
-  equal(!!channelClose.updated_at, true, 'Got close updated at');
-
-  const expectedUpdates = channelPolicies.policies.map(policy => {
-    const peer = channelPolicies.policies
-      .find(n => n.public_key !== policy.public_key);
-
-    return {
-      capacity,
-      id,
-      base_fee_mtokens: policy.base_fee_mtokens,
-      cltv_delta: policy.cltv_delta,
-      fee_rate: policy.fee_rate,
-      is_disabled: policy.is_disabled,
-      max_htlc_mtokens: policy.max_htlc_mtokens,
-      min_htlc_mtokens: policy.min_htlc_mtokens,
-      public_keys: [policy.public_key, peer.public_key],
-      transaction_id: channel.transaction_id,
-      transaction_vout: channel.transaction_vout,
-    };
-  });
+      const [channelClose] = channelClosed;
 
-  expectedUpdates.forEach(update => {
-    const [key1, key2] = update.public_keys;
+      equal(channelClose.capacity, capacity, 'Got closed channel capacity');
+      equal(!!channelClose.close_height, true, 'Got closed channel height');
+      equal(channelClose.id, id, 'Got closed channel id');
+      equal(channelClose.transaction_id, channel.transaction_id, 'Got close tx');
+      equal(channelClose.transaction_vout, channel.transaction_vout, 'Got vout');
+      equal(!!channelClose.updated_at, true, 'Got close updated at');
 
-    const gotUpdate = channelUpdated.find(chan => {
-      const [k1, k2] = chan.public_keys;
+      const expectedUpdates = channelPolicies.policies.map(policy => {
+        const peer = channelPolicies.policies
+          .find(n => n.public_key !== policy.public_key);
 
-      return key1 === k1 && key2 === k2;
-    });
+        return {
+          capacity,
+          id,
+          base_fee_mtokens: policy.base_fee_mtokens,
+          cltv_delta: policy.cltv_delta,
+          fee_rate: policy.fee_rate,
+          is_disabled: policy.is_disabled,
+          max_htlc_mtokens: policy.max_htlc_mtokens,
+          min_htlc_mtokens: policy.min_htlc_mtokens,
+          public_keys: [policy.public_key, peer.public_key],
+          transaction_id: channel.transaction_id,
+          transaction_vout: channel.transaction_vout,
+        };
+      });
 
-    equal(!!gotUpdate.updated_at, true, 'Got updated at policy date');
+      expectedUpdates.forEach(update => {
+        const [key1, key2] = update.public_keys;
 
-    delete gotUpdate.updated_at;
+        const gotUpdate = channelUpdated.find(chan => {
+          const [k1, k2] = chan.public_keys;
 
-    strictSame(gotUpdate, update, 'Got expected channel policy announcement');
+          return key1 === k1 && key2 === k2;
+        });
 
-    return;
-  });
+        equal(!!gotUpdate.updated_at, true, 'Got updated at policy date');
+
+        delete gotUpdate.updated_at;
 
+        strictSame(gotUpdate, update, 'Got expected channel policy announcement');
 
-  const gotControl = nodeUpdated.find(n => n.public_key === control.id);
+        return;
+      });
 
-  const expectedControl = {
-    alias: control.id.substring(0, 20),
-    color: '#3399ff',
-    public_key: control.id,
-    sockets: gotControl.sockets,
-  };
 
-  const gotTarget = nodeUpdated.find(n => n.public_key === target.id);
+      const gotControl = nodeUpdated.find(n => n.public_key === control.id);
 
-  const expectedTarget = {
-    alias: target.id.substring(0, 20),
-    color: '#3399ff',
-    public_key: target.id,
-    sockets: gotTarget.sockets,
-  };
+      const expectedControl = {
+        alias: control.id.substring(0, 20),
+        color: '#3399ff',
+        public_key: control.id,
+        sockets: gotControl.sockets,
+      };
 
-  equal(!!gotControl.features, true, 'Got control features');
-  equal(!!gotControl.updated_at, true, 'Got control updated at');
+      const gotTarget = nodeUpdated.find(n => n.public_key === target.id);
 
-  delete gotControl.features;
-  delete gotControl.updated_at;
+      const expectedTarget = {
+        alias: target.id.substring(0, 20),
+        color: '#3399ff',
+        public_key: target.id,
+        sockets: gotTarget.sockets,
+      };
 
-  delete gotTarget.features;
-  delete gotTarget.updated_at;
+      equal(!!gotControl.features, true, 'Got control features');
+      equal(!!gotControl.updated_at, true, 'Got control updated at');
 
-  equal(!!gotTarget, true, 'Got target updated at');
+      delete gotControl.features;
+      delete gotControl.updated_at;
 
-  strictSame(gotControl, expectedControl, 'Got control node announcement');
-  strictSame(gotTarget, expectedTarget, 'Got target node announcement');
+      delete gotTarget.features;
+      delete gotTarget.updated_at;
 
-  await kill({});
+      equal(!!gotTarget, true, 'Got target updated at');
 
-  return;
+      strictSame(gotControl, expectedControl, 'Got control node announcement');
+      strictSame(gotTarget, expectedTarget, 'Got target node announcement');
+
+      await kill({});
+    } catch (err) {
+      await kill({});
+
+      throw err;
+    }
+  });
 });

package/test/integration/test_trusted_funding.js

@@ -22,7 +22,7 @@ const capacity = 1e6;
 const interval = 10;
 const maturity = 100;
 const size = 2;
-const times = 2000;
+const times = 4000;
 
 // Opening unconfirmed channels should in immediate channel opening
 test(`Open unconfirmed channels`, async ({end, equal, match, strictSame}) => {
@@ -222,19 +222,9 @@ test(`Open unconfirmed channels`, async ({end, equal, match, strictSame}) => {
         throw new Error('ExpectedClosedChannel');
       }
 
-      if (!confirmed.other_ids.length) {
-        throw new Error('ExpectedChangeToRealPrivateChannelId');
-      }
-
       return confirmed;
     });
 
-    equal(privateConfirmed.other_ids.length, 1, 'Got private ephemeral ids');
-
-    const [privateOtherId] = privateConfirmed.other_ids;
-
-    match(privateOtherId, /16000000x0/, 'Got private id');
-
     const [closedChannel] = (await getClosedChannels({lnd})).channels;
 
     equal(closedChannel.id, confirmed.id, 'Closed channel shows confirmed id');

package/test/invoicesrpc-integration/test_cancel_invoice.js

@@ -10,6 +10,7 @@ const {cancelHodlInvoice} = require('./../../');
 const {createHodlInvoice} = require('./../../');
 const {getInvoice} = require('./../../');
 const {getInvoices} = require('./../../');
+const {getPayment} = require('./../../');
 const {pay} = require('./../../');
 const {subscribeToInvoice} = require('./../../');
 
@@ -46,6 +47,10 @@ test(`Cancel back a hodl invoice`, async ({end, equal}) => {
       equal(invoice.is_confirmed, false, 'HTLC has not yet been settled');
       equal(invoice.is_held, true, 'HTLC is locked in place');
 
+      const payment = await getPayment({lnd, id: invoice.id});
+
+      equal(payment.is_pending, true, 'payment is pending');
+
       await cancelHodlInvoice({id, lnd: target.lnd});
     });
 

package/test/invoicesrpc-integration/test_get_sweep_transactions.js

@@ -91,6 +91,9 @@ test(`Get sweep transactions`, async ({end, equal}) => {
     if (sweepTokens === 890455) {
       equal(anchorTokens, 149, 'Sweep has tokens amount');
       equal(sweepTokens, 890455, 'Sweep has tokens amount');
+    } else if (anchorTokens === 147) {
+      equal(anchorTokens, 147, 'Sweep has tokens amount');
+      equal(sweepTokens, 889855, 'Sweep has tokens amount');
     } else {
       equal(anchorTokens, 136, 'Sweep has tokens amount');
       equal(sweepTokens, 889855, 'Sweep has tokens amount');