ln-service 54.6.0 → 54.7.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 54.7.0
+
+- `getBlock`: add `height` to allow fetching a raw block at a specified height
+
 ## 54.6.0
 
 - `getBlock`: Add method to retrieve the raw bytes of a block in the chain

package/README.md

@@ -1420,7 +1420,8 @@ Requires `onchain:read` permission
 This method is not supported on LND 0.15.5 and below
 
     {
-      id: <Block Hash Hex String>
+      [height]: <Block Height Number>
+      [id]: <Block Hash Hex String>
       lnd: <Authenticated LND API Object>
     }
 

package/package.json

@@ -11,7 +11,7 @@
     "cors": "2.8.5",
     "express": "4.18.2",
     "invoices": "2.2.2",
-    "lightning": "6.6.0",
+    "lightning": "6.7.1",
     "macaroon": "3.0.4",
     "morgan": "1.10.0",
     "ws": "8.11.0"
@@ -64,5 +64,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.6.0"
+  "version": "54.7.0"
 }

package/test/chainrpc-integration/test_get_block.js

@@ -18,15 +18,41 @@ test(`Get height`, async ({end, equal, fail}) => {
 
   const blockchain = await getHeight({lnd});
 
+  const hash = blockchain.current_block_hash;
+  const height = blockchain.current_block_height;
+
+  // Try getting a block by the hash
   try {
     const {block} = await getBlock({lnd, id: blockchain.current_block_hash});
 
-    equal(fromHex(block).getId(), blockchain.current_block_hash, 'Got block');
+    equal(fromHex(block).getId(), hash, 'Got block');
   } catch (err) {
     const [code, message] = err;
 
     equal(code, 501, 'Got expected code');
     equal(message, 'GetBlockMethodNotSupported', 'Got expected message');
+
+    await kill({});
+
+    return end();
+  }
+
+  // Try getting a block by the height
+  try {
+    const {block} = await getBlock({height, lnd});
+
+    equal(fromHex(block).getId(), hash, 'Got block for height');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
+  }
+
+  // Try getting the chain tip block
+  try {
+    const {block} = await getBlock({lnd});
+
+    equal(fromHex(block).getId(), hash, 'Got chain tip block');
+  } catch (err) {
+    equal(err, null, 'Expected no error');
   }
 
   await kill({});

package/test/routerrpc-integration/test_multipath_payment.js

@@ -122,26 +122,30 @@ test(`Pay with multiple paths`, async ({end, equal, rejects, strictSame}) => {
 
   const parsed = parsePaymentRequest({request: controlInvoice.request});
 
-  const route1 = await getRouteToDestination({
-    cltv_delta: parsed.cltv_delta,
-    destination: parsed.destination,
-    features: parsed.features,
-    lnd: target.lnd,
-    outgoing_channel: channel1.id,
-    payment: parsed.payment,
-    tokens: ceil(parsed.tokens / channels.length),
-    total_mtokens: parsed.mtokens,
+  const route1 = await asyncRetry({interval, times}, async () => {
+    return await getRouteToDestination({
+      cltv_delta: parsed.cltv_delta,
+      destination: parsed.destination,
+      features: parsed.features,
+      lnd: target.lnd,
+      outgoing_channel: channel1.id,
+      payment: parsed.payment,
+      tokens: ceil(parsed.tokens / channels.length),
+      total_mtokens: parsed.mtokens,
+    });
   });
 
-  const route2 = await getRouteToDestination({
-    cltv_delta: parsed.cltv_delta,
-    destination: parsed.destination,
-    features: parsed.features,
-    lnd: target.lnd,
-    outgoing_channel: channel2.id,
-    payment: parsed.payment,
-    tokens: ceil(parsed.tokens / channels.length),
-    total_mtokens: parsed.mtokens,
+  const route2 = await asyncRetry({interval, times}, async () => {
+    return await getRouteToDestination({
+      cltv_delta: parsed.cltv_delta,
+      destination: parsed.destination,
+      features: parsed.features,
+      lnd: target.lnd,
+      outgoing_channel: channel2.id,
+      payment: parsed.payment,
+      tokens: ceil(parsed.tokens / channels.length),
+      total_mtokens: parsed.mtokens,
+    });
   });
 
   // Pay using routes. Multiple channels must be used to avoid tempChanFail
@@ -149,10 +153,12 @@ test(`Pay with multiple paths`, async ({end, equal, rejects, strictSame}) => {
     const routes = [route1.route, route2.route];
 
     const payRoutes = routes.map(route => {
-      return payViaRoutes({
-        id: parsed.id,
-        lnd: target.lnd,
-        routes: [route],
+      return asyncRetry({interval, times}, async () => {
+        return payViaRoutes({
+          id: parsed.id,
+          lnd: target.lnd,
+          routes: [route],
+        });
       });
     });