ln-service 58.1.0 → 59.0.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 59.0.0
+
+### Breaking Changes
+
+- Eliminate support for `channel_capacity` in payment hops
+- End support for node.js 20, require 22 or higher
+- End support for LND 0.19 and below
+
 ## 58.1.0
 
 - `getChannels`: Add support for `partner_scid_alias`

package/README.md

@@ -2268,7 +2268,6 @@ Requires `offchain:read` permission
             fee_mtokens: <Route Fee Millitokens String>
             hops: [{
               channel: <Standard Format Channel Id String>
-              channel_capacity: <Channel Capacity Tokens Number>
               fee: <Fee Number>
               fee_mtokens: <Fee Millitokens String>
               forward: <Forward Tokens Number>
@@ -2999,7 +2998,6 @@ Requires `offchain:read` permission
           fee_mtokens: <Total Fee Millitokens Paid String>
           hops: [{
             channel: <Standard Format Channel Id String>
-            channel_capacity: <Channel Capacity Tokens Number>
             fee: <Fee Tokens Rounded Down Number>
             fee_mtokens: <Fee Millitokens String>
             forward_mtokens: <Forward Millitokens String>
@@ -3024,7 +3022,6 @@ Requires `offchain:read` permission
           fee_mtokens: <Total Fee Millitokens Paid String>
           hops: [{
             channel: <Standard Format Channel Id String>
-            channel_capacity: <Channel Capacity Tokens Number>
             fee: <Fee Tokens Rounded Down Number>
             fee_mtokens: <Fee Millitokens String>
             forward: <Forwarded Tokens Number>
@@ -3108,7 +3105,6 @@ Requires `offchain:read` permission
             fee_mtokens: <Route Fee Millitokens String>
             hops: [{
               channel: <Standard Format Channel Id String>
-              channel_capacity: <Channel Capacity Tokens Number>
               fee: <Fee Number>
               fee_mtokens: <Fee Millitokens String>
               forward: <Forward Tokens Number>
@@ -3351,7 +3347,6 @@ Requires `offchain:read` permission
             fee_mtokens: <Route Fee Millitokens String>
             hops: [{
               channel: <Standard Format Channel Id String>
-              channel_capacity: <Channel Capacity Tokens Number>
               fee: <Fee Number>
               fee_mtokens: <Fee Millitokens String>
               forward: <Forward Tokens Number>
@@ -3519,7 +3514,6 @@ Requires `offchain:read` permission
         fee_mtokens: <Route Fee Millitokens String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -3595,7 +3589,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       [routes]: [[{
         [base_fee_mtokens]: <Base Routing Fee In Millitokens String>
         [channel]: <Standard Format Channel Id String>
-        [channel_capacity]: <Channel Capacity Tokens Number>
         [cltv_delta]: <CLTV Delta Blocks Number>
         [fee_rate]: <Fee Rate In Millitokens Per Million Number>
         public_key: <Forward Edge Public Key Hex String>
@@ -3613,7 +3606,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Route Fee Millitokens String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -4345,7 +4337,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
           fee_mtokens: <Total Fee Millitokens To Pay String>
           hops: [{
             channel: <Standard Format Channel Id String>
-            channel_capacity: <Channel Capacity Tokens Number>
             fee: <Fee Number>
             fee_mtokens: <Fee Millitokens String>
             forward: <Forward Tokens Number>
@@ -4375,7 +4366,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       fee_mtokens: <Fee Paid Millitokens String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Hop Channel Capacity Tokens Number>
         fee_mtokens: <Hop Forward Fee Millitokens String>
         forward_mtokens: <Hop Forwarded Millitokens String>
         timeout: <Hop CLTV Expiry Block Height Number>
@@ -4453,7 +4443,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       fee_mtokens: <Total Fee Millitokens Paid String>
       hops: [{
         channel: <First Route Standard Format Channel Id String>
-        channel_capacity: <First Route Channel Capacity Tokens Number>
         fee: <First Route Fee Tokens Rounded Down Number>
         fee_mtokens: <First Route Fee Millitokens String>
         forward_mtokens: <First Route Forward Millitokens String>
@@ -4466,7 +4455,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens Paid String>
         hops: [{
           channel: <First Route Standard Format Channel Id String>
-          channel_capacity: <First Route Channel Capacity Tokens Number>
           fee: <First Route Fee Tokens Rounded Down Number>
           fee_mtokens: <First Route Fee Millitokens String>
           forward_mtokens: <First Route Forward Millitokens String>
@@ -4530,7 +4518,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       fee_mtokens: <Total Fee Millitokens Paid String>
       hops: [{
         channel: <First Route Standard Format Channel Id String>
-        channel_capacity: <First Route Channel Capacity Tokens Number>
         fee: <First Route Fee Tokens Rounded Down Number>
         fee_mtokens: <First Route Fee Millitokens String>
         forward_mtokens: <First Route Forward Millitokens String>
@@ -4544,7 +4531,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens Paid String>
         hops: [{
           channel: <First Route Standard Format Channel Id String>
-          channel_capacity: <First Route Channel Capacity Tokens Number>
           fee: <First Route Fee Tokens Rounded Down Number>
           fee_mtokens: <First Route Fee Millitokens String>
           forward_mtokens: <First Route Forward Millitokens String>
@@ -4585,7 +4571,6 @@ Requires `offchain:write` permission
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -4619,7 +4604,6 @@ Requires `offchain:write` permission
       fee_mtokens: <Fee Paid Millitokens String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Hop Channel Capacity Tokens Number>
         fee_mtokens: <Hop Forward Fee Millitokens String>
         forward_mtokens: <Hop Forwarded Millitokens String>
         timeout: <Hop CLTV Expiry Block Height Number>
@@ -4737,7 +4721,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       [probe_timeout_ms]: <Probe Timeout Milliseconds Number>
       [routes]: [[{
         [base_fee_mtokens]: <Base Routing Fee In Millitokens Number String>
-        [channel_capacity]: <Channel Capacity Tokens Number>
         [channel]: <Standard Format Channel Id String>
         [cltv_delta]: <CLTV Blocks Delta Number>
         [fee_rate]: <Fee Rate In Millitokens Per Million Number>
@@ -4755,7 +4738,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Route Fee Millitokens String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -5122,7 +5104,6 @@ Either next hop destination in channels or final destination is required
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6281,7 +6262,6 @@ Requires `offchain:read` permission
         fee_mtokens: <Total Fee Millitokens Paid String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6322,7 +6302,6 @@ Requires `offchain:read` permission
         fee_mtokens: <Total Fee Millitokens Pending String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6387,7 +6366,6 @@ Note: Method not supported on LND 0.13.4 and below
         fee_mtokens: <Total Fee Millitokens Paid String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward_mtokens: <Forward Millitokens String>
@@ -6473,7 +6451,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       fee_mtokens: <Total Fee Millitokens Paid String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Channel Capacity Tokens Number>
         fee_mtokens: <Fee Millitokens String>
         forward_mtokens: <Forward Millitokens String>
         public_key: <Public Key Hex String>
@@ -6500,7 +6477,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Route Total Fee Millitokens String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Hop Forwarding Fee Rounded Down Tokens Number>
           fee_mtokens: <Hop Forwarding Fee Millitokens String>
           forward: <Hop Forwarding Tokens Rounded Down Number>
@@ -6527,7 +6503,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens Pending String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6557,7 +6532,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Route Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6628,7 +6602,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       fee_mtokens: <Total Fee Millitokens To Pay String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Channel Capacity Tokens Number>
         fee_mtokens: <Fee Millitokens String>
         forward_mtokens: <Forward Millitokens String>
         public_key: <Public Key Hex String>
@@ -6657,7 +6630,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Route Total Fee Millitokens String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Hop Forwarding Fee Rounded Down Tokens Number>
           fee_mtokens: <Hop Forwarding Fee Millitokens String>
           forward: <Hop Forwarding Tokens Rounded Down Number>
@@ -6685,7 +6657,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens Pending String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6715,7 +6686,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Route Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6756,7 +6726,6 @@ Requires `offchain:write` permission
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6819,7 +6788,6 @@ Requires `offchain:write` permission
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6853,7 +6821,6 @@ Requires `offchain:write` permission
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6884,7 +6851,6 @@ Requires `offchain:write` permission
       fee_mtokens: <Fee Paid Millitokens String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Hop Channel Capacity Tokens Number>
         fee_mtokens: <Hop Forward Fee Millitokens String>
         forward_mtokens: <Hop Forwarded Millitokens String>
         timeout: <Hop CLTV Expiry Block Height Number>
@@ -6898,7 +6864,6 @@ Requires `offchain:write` permission
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -6959,7 +6924,6 @@ Note: Method not supported on LND 0.15.5 and below
         fee_mtokens: <Total Fee Millitokens Paid String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -7001,7 +6965,6 @@ Note: Method not supported on LND 0.15.5 and below
         fee_mtokens: <Total Fee Millitokens Pending String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Tokens Rounded Down Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -7143,7 +7106,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
       [probe_timeout_ms]: <Fail Entire Probe After Milliseconds Number>
       [routes]: [[{
         [base_fee_mtokens]: <Base Routing Fee In Millitokens String>
-        [channel_capacity]: <Channel Capacity Tokens Number>
         [channel]: <Standard Format Channel Id String>
         [cltv_delta]: <CLTV Blocks Delta Number>
         [fee_rate]: <Fee Rate In Millitokens Per Million Number>
@@ -7167,7 +7129,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -7197,7 +7158,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -7239,7 +7199,6 @@ Preferred `confidence` is not supported on LND 0.14.5 and below
         fee_mtokens: <Total Fee Millitokens To Pay String>
         hops: [{
           channel: <Standard Format Channel Id String>
-          channel_capacity: <Channel Capacity Tokens Number>
           fee: <Fee Number>
           fee_mtokens: <Fee Millitokens String>
           forward: <Forward Tokens Number>
@@ -7364,7 +7323,6 @@ This method is not supported in LND 0.13.4 and below
           fee_mtokens: <Route Fee Millitokens String>
           hops: [{
             channel: <Standard Format Channel Id String>
-            channel_capacity: <Channel Capacity Tokens Number>
             fee: <Fee Tokens Number>
             fee_mtokens: <Fee Millitokens String>
             forward: <Forward Tokens Number>

package/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "bolt07": "1.9.5",
     "invoices": "5.0.2",
-    "lightning": "11.1.0",
+    "lightning": "12.0.0",
     "macaroon": "3.0.4"
   },
   "description": "Interaction helper for your Lightning Network daemon",
@@ -24,7 +24,7 @@
     "bn.js": "5.2.3",
     "bs58check": "4.0.0",
     "ecpair": "3.0.1",
-    "ln-docker-daemons": "7.0.2",
+    "ln-docker-daemons": "8.0.0",
     "p2tr": "2.0.0",
     "portfinder": "1.0.38",
     "psbt": "5.0.0",
@@ -34,7 +34,7 @@
     "varuint-bitcoin": "2.0.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "bitcoin",
@@ -53,34 +53,7 @@
   "scripts": {
     "integration-test-0.20.1": "DOCKER_LND_VERSION=v0.20.1-beta npm run test",
     "integration-test-0.20.0": "DOCKER_LND_VERSION=v0.20.0-beta npm run test",
-    "integration-test-0.19.3": "DOCKER_LND_VERSION=v0.19.3-beta npm run test",
-    "integration-test-0.19.2": "DOCKER_LND_VERSION=v0.19.2-beta npm run test",
-    "integration-test-0.19.1": "DOCKER_LND_VERSION=v0.19.1-beta npm run test",
-    "integration-test-0.19.0": "DOCKER_LND_VERSION=v0.19.0-beta npm run test",
-    "integration-test-0.18.5": "DOCKER_LND_VERSION=v0.18.5-beta npm run test",
-    "integration-test-0.18.4": "DOCKER_LND_VERSION=v0.18.4-beta npm run test",
-    "integration-test-0.18.3": "DOCKER_LND_VERSION=v0.18.3-beta npm run test",
-    "integration-test-0.18.2": "DOCKER_LND_VERSION=v0.18.2-beta npm run test",
-    "integration-test-0.18.1": "DOCKER_LND_VERSION=v0.18.1-beta npm run test",
-    "integration-test-0.18.0": "DOCKER_LND_VERSION=v0.18.0-beta npm run test",
-    "integration-test-0.17.5": "DOCKER_LND_VERSION=v0.17.5-beta npm run test",
-    "integration-test-0.17.4": "DOCKER_LND_VERSION=v0.17.4-beta npm run test",
-    "integration-test-0.17.3": "DOCKER_LND_VERSION=v0.17.3-beta npm run test",
-    "integration-test-0.17.2": "DOCKER_LND_VERSION=v0.17.2-beta npm run test",
-    "integration-test-0.17.1": "DOCKER_LND_VERSION=v0.17.1-beta npm run test",
-    "integration-test-0.17.0": "DOCKER_LND_VERSION=v0.17.0-beta npm run test",
-    "integration-test-0.16.4": "DOCKER_LND_VERSION=v0.16.4-beta npm run test",
-    "integration-test-0.16.3": "DOCKER_LND_VERSION=v0.16.3-beta npm run test",
-    "integration-test-0.16.2": "DOCKER_LND_VERSION=v0.16.2-beta npm run test",
-    "integration-test-0.16.1": "DOCKER_LND_VERSION=v0.16.1-beta npm run test",
-    "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",
-    "integration-test-0.15.2": "DOCKER_LND_VERSION=v0.15.2-beta npm run test",
-    "integration-test-0.14.5": "DOCKER_LND_VERSION=v0.14.5-beta npm run test",
-    "integration-test-0.14.4": "DOCKER_LND_VERSION=v0.14.4-beta npm run test",
     "test": "echo $DOCKER_LND_VERSION && node test/runner"
   },
-  "version": "58.1.0"
+  "version": "59.0.0"
 }

package/test/integration/test_pay.js

@@ -28,120 +28,122 @@ test(`Pay`, async ({end, equal, strictSame}) => {
 
   const [{generate, lnd}, target, remote] = nodes;
 
-  const channel = await setupChannel({generate, lnd, to: target});
-
-  const remoteChan = await setupChannel({
-    generate: target.generate,
-    lnd: target.lnd,
-    to: remote,
-  });
-
-  await addPeer({lnd, public_key: remote.id, socket: remote.socket});
-
-  const invoice = await createInvoice({tokens, lnd: remote.lnd});
-
-  const commitTxFee = channel.commit_transaction_fee;
-
-  const paid = await asyncRetry({interval, times}, async () => {
-    return await pay({lnd, request: invoice.request});
-  });
-
-  strictEqual(paid.fee, 1, 'Fee paid for hop');
-  strictEqual(paid.fee_mtokens, '1000', 'Fee mtokens tokens paid');
-  strictEqual(paid.id, invoice.id, 'Payment hash is equal on both sides');
-  strictEqual(paid.is_confirmed, true, 'Invoice is paid');
-  strictEqual(paid.is_outgoing, true, 'Payments are outgoing');
-  strictEqual(paid.mtokens, '101000', 'Paid mtokens');
-  strictEqual(paid.secret, invoice.secret, 'Paid for invoice secret');
-  strictEqual(paid.tokens, invoice.tokens + 1, 'Paid correct number of tok');
-
-  const height = (await getHeight({lnd})).current_block_height;
-
-  paid.hops.forEach(n => {
-    strictEqual(
-      n.timeout === height + 40 ||
-      n.timeout === height + 43 ||
-      n.timeout === height + 80,
-      true
-    );
-
-    delete n.timeout;
-
-    return;
-  });
-
-  const expectedHops = [
-    {
-      channel: channel.id,
-      channel_capacity: 1000000,
-      fee: 1,
-      fee_mtokens: '1000',
-      forward: 100,
-      forward_mtokens: `${invoice.tokens}${mtokPadding}`,
-      public_key: target.id,
-    },
-    {
-      channel: remoteChan.id,
-      channel_capacity: 1000000,
-      fee: 0,
-      fee_mtokens: '0',
-      forward: 100,
-      forward_mtokens: '100000',
-      public_key: remote.id,
-    },
-  ];
-
-  deepStrictEqual(paid.hops, expectedHops, 'Hops are returned');
-
-  const invoice2 = await createInvoice({lnd: remote.lnd, tokens: 100});
-
-  const {destination} = await decodePaymentRequest({
-    lnd: remote.lnd,
-    request: invoice2.request,
-  });
-
-  await generate({count: confirmationCount});
-
-  const route = await asyncRetry({interval, times}, async () => {
-    const {route} = await getRouteToDestination({
-      destination,
-      lnd,
-      payment: invoice2.payment,
-      tokens: invoice2.tokens,
-      total_mtokens: !!invoice2.payment ? invoice2.mtokens : undefined,
+  try {
+    const channel = await setupChannel({generate, lnd, to: target});
+
+    const remoteChan = await setupChannel({
+      generate: target.generate,
+      lnd: target.lnd,
+      to: remote,
     });
 
-    if (!route) {
-      throw new Error('ExpectedRouteToDestination');
-    }
+    await addPeer({lnd, public_key: remote.id, socket: remote.socket});
 
-    return route;
-  });
+    const invoice = await createInvoice({tokens, lnd: remote.lnd});
 
-  // Test paying to a route, but to an id that isn't known
-  try {
-    await pay({
-      lnd,
-      path: {routes: [route], id: randomBytes(32).toString('hex')},
+    const commitTxFee = channel.commit_transaction_fee;
+
+    const paid = await asyncRetry({interval, times}, async () => {
+      return await pay({lnd, request: invoice.request});
     });
-  } catch (err) {
-    const [code, message] = err;
 
-    strictEqual(code, 404, 'Unknown payment hashes mean user error');
-    strictEqual(message, 'UnknownPaymentHash', 'Specifically unknown error');
-  }
+    strictEqual(paid.fee, 1, 'Fee paid for hop');
+    strictEqual(paid.fee_mtokens, '1000', 'Fee mtokens tokens paid');
+    strictEqual(paid.id, invoice.id, 'Payment hash is equal on both sides');
+    strictEqual(paid.is_confirmed, true, 'Invoice is paid');
+    strictEqual(paid.is_outgoing, true, 'Payments are outgoing');
+    strictEqual(paid.mtokens, '101000', 'Paid mtokens');
+    strictEqual(paid.secret, invoice.secret, 'Paid for invoice secret');
+    strictEqual(paid.tokens, invoice.tokens + 1, 'Paid correct number of tok');
+
+    const height = (await getHeight({lnd})).current_block_height;
+
+    paid.hops.forEach(n => {
+      strictEqual(
+        n.timeout === height + 40 ||
+        n.timeout === height + 43 ||
+        n.timeout === height + 80,
+        true
+      );
+
+      delete n.timeout;
+
+      return;
+    });
+
+    const expectedHops = [
+      {
+        channel: channel.id,
+        fee: 1,
+        fee_mtokens: '1000',
+        forward: 100,
+        forward_mtokens: `${invoice.tokens}${mtokPadding}`,
+        public_key: target.id,
+      },
+      {
+        channel: remoteChan.id,
+        fee: 0,
+        fee_mtokens: '0',
+        forward: 100,
+        forward_mtokens: '100000',
+        public_key: remote.id,
+      },
+    ];
+
+    deepStrictEqual(paid.hops, expectedHops, 'Hops are returned');
+
+    const invoice2 = await createInvoice({lnd: remote.lnd, tokens: 100});
+
+    const {destination} = await decodePaymentRequest({
+      lnd: remote.lnd,
+      request: invoice2.request,
+    });
+
+    await generate({count: confirmationCount});
 
-  // Test paying regularly to a destination
-  const directPay = await pay({
-    lnd,
-    path: {routes: [route], id: invoice2.id},
-  });
+    const route = await asyncRetry({interval, times}, async () => {
+      const {route} = await getRouteToDestination({
+        destination,
+        lnd,
+        payment: invoice2.payment,
+        tokens: invoice2.tokens,
+        total_mtokens: !!invoice2.payment ? invoice2.mtokens : undefined,
+      });
 
-  const zeroInvoice = await createInvoice({lnd: target.lnd});
+      if (!route) {
+        throw new Error('ExpectedRouteToDestination');
+      }
 
-  await pay({lnd, request: zeroInvoice.request, mtokens: '1000'});
+      return route;
+    });
+
+    // Test paying to a route, but to an id that isn't known
+    try {
+      await pay({
+        lnd,
+        path: {routes: [route], id: randomBytes(32).toString('hex')},
+      });
+    } catch (err) {
+      const [code, message] = err;
+
+      strictEqual(code, 404, 'Unknown payment hashes mean user error');
+      strictEqual(message, 'UnknownPaymentHash', 'Specifically unknown error');
+    }
 
-  await kill({});
+    // Test paying regularly to a destination
+    const directPay = await pay({
+      lnd,
+      path: {routes: [route], id: invoice2.id},
+    });
+
+    const zeroInvoice = await createInvoice({lnd: target.lnd});
+
+    await pay({lnd, request: zeroInvoice.request, mtokens: '1000'});
+  } catch (err) {
+    strictEqual(err, null, 'Not expecting an error');
+  } finally {
+    await kill({});
+  }
 
   return;
 });

package/test/integration/test_subscribe_to_rpc_requests.js

@@ -273,7 +273,6 @@ test(`Subscribe to RPC requests`, async () => {
               fee_mtokens: '0',
               hops: [{
                 channel: '0x0x1',
-                channel_capacity: 1,
                 fee: 0,
                 fee_mtokens: '0',
                 forward: 0,

package/test/integration/test_trusted_funding.js

@@ -202,6 +202,8 @@ test(`Open unconfirmed channels`, async () => {
 
     // Remove the channel
     await asyncRetry({interval, times}, async () => {
+      await generate({});
+
       await closeChannel({lnd, id: confirmed.id});
     });
 
@@ -252,7 +254,21 @@ test(`Open unconfirmed channels`, async () => {
       return confirmed;
     });
 
-    const [closedChannel] = (await getClosedChannels({lnd})).channels;
+    const [closedChannel] = await asyncRetry({interval, times}, async () => {
+      const {channels} = await getClosedChannels({lnd});
+
+      await generate({});
+
+      if (!channels.length) {
+        throw new Error('ExpectedAClosedChannel');
+      }
+
+      if (!closings.length) {
+        throw new Error('ExpectedClosingEvent');
+      }
+
+      return channels;
+    });
 
     equal(closedChannel.id, confirmed.id, 'Closed channel shows confirmed id');
     deepEqual(closedChannel.other_ids, confirmed.other_ids, 'Saved temp id');

package/test/integration/test_update_routing_fees.js

@@ -10,7 +10,7 @@ const {updateRoutingFees} = require('./../../');
 
 const baseFeeTokens = 9;
 const channelCapacityTokens = 1e6;
-const cltvDelta = 18;
+const cltvDelta = 24;
 const confirmationCount = 6;
 const defaultFee = 1e3;
 const feeRate = 0;

package/test/macros/wait_for_route.js

@@ -13,7 +13,6 @@ const times = 1500;
     [routes]: [[{
       [base_fee_mtokens]: <Base Routing Fee In Millitokens String>
       [channel]: <Standard Format Channel Id String>
-      [channel_capacity]: <Channel Capacity Tokens Number>
       [cltv_delta]: <CLTV Delta Blocks Number>
       [fee_rate]: <Fee Rate In Millitokens Per Million Number>
       public_key: <Forward Edge Public Key Hex String>
@@ -28,7 +27,6 @@ const times = 1500;
       fee_mtokens: <Route Fee Millitokens String>
       hops: [{
         channel: <Standard Format Channel Id String>
-        channel_capacity: <Channel Capacity Tokens Number>
         fee: <Fee Number>
         fee_mtokens: <Fee Millitokens String>
         forward: <Forward Tokens Number>

package/test/routerrpc-integration/test_get_payment.js

@@ -103,7 +103,6 @@ test(`Get payment`, async () => {
     const expectedHops = [
       {
         channel: channel.id,
-        channel_capacity: 1000000,
         fee: 1,
         fee_mtokens: '1000',
         forward: invoice.tokens,
@@ -112,7 +111,6 @@ test(`Get payment`, async () => {
       },
       {
         channel: remoteChan.id,
-        channel_capacity: 1000000,
         fee: 0,
         fee_mtokens: '0',
         forward: 100,

package/test/routerrpc-integration/test_pay_via_payment_details.js

@@ -53,7 +53,6 @@ test(`Pay via payment details`, async () => {
     const expectedHops = [
       {
         channel: channel.id,
-        channel_capacity: 1000000,
         fee: 1,
         fee_mtokens: '1000',
         forward: invoice.tokens,
@@ -62,7 +61,6 @@ test(`Pay via payment details`, async () => {
       },
       {
         channel: remoteChan.id,
-        channel_capacity: 1000000,
         fee: 0,
         fee_mtokens: '0',
         forward: invoice.tokens,

package/test/routerrpc-integration/test_pay_via_payment_request.js

@@ -106,7 +106,6 @@ test(`Pay via payment request`, async () => {
       const expectedHops = [
         {
           channel: channel.id,
-          channel_capacity: 1000000,
           fee: 1,
           fee_mtokens: '1000',
           forward: 100,
@@ -115,7 +114,6 @@ test(`Pay via payment request`, async () => {
         },
         {
           channel: remoteChan.id,
-          channel_capacity: 1000000,
           fee: 0,
           fee_mtokens: '0',
           forward: 100,

package/test/routerrpc-integration/test_subscribe_to_forward_requests.js

@@ -96,7 +96,6 @@ test(`Subscribe to requests`, async () => {
           hops: [
             {
               channel: channel.id,
-              channel_capacity: 1e6,
               fee: 1,
               fee_mtokens: '1000',
               forward: 100,
@@ -106,7 +105,6 @@ test(`Subscribe to requests`, async () => {
             },
             {
               channel: remoteChan.id,
-              channel_capacity: 1e6,
               fee: 0,
               fee_mtokens: '0',
               forward: 100,
@@ -154,7 +152,6 @@ test(`Subscribe to requests`, async () => {
           hops: [
             {
               channel: forward.in_channel,
-              channel_capacity: 1e6,
               fee: 1,
               fee_mtokens: '1000',
               forward: 100,
@@ -164,7 +161,6 @@ test(`Subscribe to requests`, async () => {
             },
             {
               channel: forward.out_channel,
-              channel_capacity: 1e6,
               fee: 0,
               fee_mtokens: '0',
               forward: 100,