ln-docker-daemons 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 2.1.0
+
+- `DOCKER_LND_VERSION`: add environment variable to control docker lnd image
+
 ## 2.0.0
 
 - `spawnLightningCluster`: add `socket` to reveal node LN p2p sockets

package/README.md

@@ -18,6 +18,16 @@ const publicKey = (await getIdentity({lnd})).public_key;
 await kill({});
 ```
 
+## Environment Variables
+
+- `DOCKER_LND_VERSION`: set this to use a custom LND docker image
+
+Example:
+
+```shell
+export DOCKER_LND_VERSION="v0.14.0-beta"
+```
+
 ## spawnBitcoindDocker
 
 Spawn a Bitcoin Core Docker image
@@ -83,11 +93,10 @@ const {spawnLightningCluster} = require('ln-docker-daemons');
 const {nodes} = await spawnLightningCluster({});
 const [{lnd, generate, kill}] = nodes;
 
-const pubilcKey = (await getIdentity({lnd})).public_key;
+const publicKey = (await getIdentity({lnd})).public_key;
 
 // Generate some coins for the wallet
-const {address} = await createChainAddress({lnd, format: 'p2wpkh'});
-await generate({address, count: 500});
+await generate({count: 500});
 
 // Stop the image
 await kill({});

package/cluster/spawn_lightning_cluster.js

@@ -17,7 +17,7 @@ const count = size => size || 1;
 const endPort = 65000;
 const generateAddress = '2N8hwP1WmJrFF5QWABn38y63uYLhnJYJYTF';
 const interval = 10;
-const makeAddress = ({lnd}) => createChainAddress({lnd, format: 'p2wpkh'});
+const makeAddress = ({lnd}) => createChainAddress({lnd});
 const maturity = 100;
 const pairs = n => n.map((x, i) => n.slice(i + 1).map(y => [x, y])).flat();
 const portsPerLnd = 6;
@@ -46,7 +46,7 @@ module.exports = (args, cbk) => {
     return asyncAuto({
       // Spawn nodes
       spawn: async () => {
-        return await asyncRetry({}, async () => {
+        return await asyncRetry({interval, times: 25}, async () => {
           const options = {startPort: between(startPort, endPort)};
 
           // Find ports for the requested daemons

package/docker/spawn_docker_image.js

@@ -67,6 +67,8 @@ module.exports = ({arguments, expose, image, ports}, cbk) => {
             throw [503, 'CannotConnectToDockerDaemon'];
           }
 
+          console.log("ERR", err);
+
           throw [503, 'UnexpectedErrorGettingDockerImage', {err}];
         }
       }],

package/lnd/constants.json

@@ -1,3 +1,3 @@
 {
-  "dockerLndImage": "lightninglabs/lnd:v0.13.4-beta"
+  "dockerLndImage": "lightninglabs/lnd:v0.14.0-beta"
 }

package/lnd/spawn_lnd_docker.js

@@ -8,7 +8,8 @@ const {unauthenticatedLndGrpc} = require('lightning');
 const {dockerLndImage} = require('./constants');
 const {spawnDockerImage} = require('./../docker');
 
-const interval = 50;
+const imageName = ver => !!ver ? `lightninglabs/lnd:${ver}` : dockerLndImage;
+const interval = 100;
 const macaroonPath = '/root/.lnd/data/chain/bitcoin/regtest/admin.macaroon';
 const times = 500;
 const tlsCertPath = '/root/.lnd/tls.cert';
@@ -101,7 +102,7 @@ module.exports = (args, cbk) => {
             '--trickledelay=1',
             '--unsafe-disconnect',
           ],
-          image: dockerLndImage,
+          image: imageName(process.env.DOCKER_LND_VERSION),
           ports: {
             '9735/tcp': args.p2p_port,
             '10009/tcp': args.rpc_port,

package/package.json

@@ -12,7 +12,7 @@
     "asyncjs-util": "1.2.7",
     "dockerode": "3.3.1",
     "find-free-ports": "3.0.0",
-    "lightning": "4.14.4",
+    "lightning": "5.0.0",
     "tar-stream": "2.2.0"
   },
   "description": "Spawn and control LN Docker daemons",
@@ -35,5 +35,5 @@
   "scripts": {
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -j 1 test/bitcoind/*.js test/lnd/*.js"
   },
-  "version": "2.0.0"
+  "version": "2.1.0"
 }