ln-docker-daemons 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 2.2.0
+## 2.2.1
 
 - `spawnLightningCluster`, `spawnLightningDocker`: Add `lnd_configuration` to
     allow specifying additional LND configuration parameters

package/lnd/spawn_lnd_docker.js

@@ -139,40 +139,28 @@ module.exports = (args, cbk) => {
               cipher_seed_mnemonic: res.cipher_seed_mnemonic,
               wallet_password: Buffer.from('password', 'utf8'),
             },
-            err => {
+            (err, res) => {
               if (!!err) {
                 return cbk([503, 'UnexpectedErrorInitializingWallet', {err}]);
               }
 
-              return cbk();
+              return cbk(null, res.admin_macaroon);
             });
           });
         },
         cbk);
       }],
 
-      // Get the macaroon out of the docker image
-      getMacaroon: [
-        'createWallet',
-        'spawnDocker',
-        ({createWallet, spawnDocker}, cbk) =>
-      {
-        return asyncRetry({interval, times}, cbk => {
-          return spawnDocker.getFile({path: macaroonPath}, cbk);
-        },
-        cbk);
-      }],
-
       // Wait for gRPC to respond
       waitForRpc: [
+        'createWallet',
         'getCertificate',
-        'getMacaroon',
         'spawnDocker',
-        ({getCertificate, getMacaroon, spawnDocker}, cbk) =>
+        ({createWallet, getCertificate, spawnDocker}, cbk) =>
       {
         const {lnd} = authenticatedLndGrpc({
           cert: getCertificate.file.toString('hex'),
-          macaroon: getMacaroon.file.toString('hex'),
+          macaroon: createWallet.toString('hex'),
           socket: `localhost:${args.rpc_port}`,
         });
 
@@ -184,17 +172,17 @@ module.exports = (args, cbk) => {
 
       // LND fully spawned
       spawned: [
+        'createWallet',
         'getCertificate',
-        'getMacaroon',
         'spawnDocker',
         'waitForRpc',
-        ({getCertificate, getMacaroon, spawnDocker, waitForRpc}, cbk) =>
+        ({createWallet, getCertificate, spawnDocker, waitForRpc}, cbk) =>
       {
         return cbk(null, {
           cert: getCertificate.file.toString('base64'),
           host: spawnDocker.host,
           kill: spawnDocker.kill,
-          macaroon: getMacaroon.file.toString('base64'),
+          macaroon: createWallet.toString('hex'),
           public_key: waitForRpc.public_key,
           socket: `localhost:${args.rpc_port}`,
         });

package/package.json

@@ -12,7 +12,7 @@
     "asyncjs-util": "1.2.8",
     "dockerode": "3.3.1",
     "find-free-ports": "3.0.0",
-    "lightning": "5.3.1",
+    "lightning": "5.4.1",
     "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.2.0"
+  "version": "2.2.1"
 }