Fix path to macaroon file due to lnd changes

Now, each network has its own macaroons.

Author: valentinewallace

public/electron.js

@@ -9,6 +9,7 @@ const { startLndProcess, startBtcdProcess } = require('./lnd-child-process');
 const grcpClient = require('./grpc-client');
 const {
   PREFIX_NAME,
+  NETWORK,
   LND_PORT,
   LND_PEER_PORT,
   LND_INIT_DELAY,
@@ -122,6 +123,7 @@ function createWindow() {
     ipcMain,
     lndSettingsDir,
     lndPort: LND_PORT,
+    network: isDev ? 'simnet' : NETWORK,
   });
 }
 

public/grpc-client.js

@@ -32,17 +32,25 @@ async function getCredentials(lndSettingsDir) {
   return grpc.credentials.createSsl(lndCert);
 }
 
-function getMacaroonCreds(lndSettingsDir) {
-  return grpc.credentials.createFromMetadataGenerator(function(args, callback) {
+function getMacaroonCreds(lndSettingsDir, network) {
+  return grpc.credentials.createFromMetadataGenerator((args, callback) => {
     const metadata = new grpc.Metadata();
-    const macaroonPath = path.join(lndSettingsDir, 'admin.macaroon');
+    const macaroonPath = path.join(
+      lndSettingsDir,
+      `data/chain/bitcoin/${network}/admin.macaroon`
+    );
     const macaroonHex = fs.readFileSync(macaroonPath).toString('hex');
     metadata.add('macaroon', macaroonHex);
     callback(null, metadata);
   });
 }
 
-module.exports.init = async function({ ipcMain, lndPort, lndSettingsDir }) {
+module.exports.init = async function({
+  ipcMain,
+  lndPort,
+  lndSettingsDir,
+  network,
+}) {
   let credentials;
   let protoPath;
   let lnrpc;
@@ -65,7 +73,7 @@ module.exports.init = async function({ ipcMain, lndPort, lndSettingsDir }) {
   });
 
   ipcMain.on('lndInit', event => {
-    const macaroonCreds = getMacaroonCreds(lndSettingsDir);
+    const macaroonCreds = getMacaroonCreds(lndSettingsDir, network);
     credentials = grpc.credentials.combineChannelCredentials(
       credentials,
       macaroonCreds

src/config.js

@@ -9,6 +9,7 @@ module.exports.RATE_DELAY = 15 * 60 * 1000;
 
 module.exports.LND_PORT = 10009;
 module.exports.LND_PEER_PORT = 10019;
+module.exports.NETWORK = 'testnet';
 module.exports.BTCD_MINING_ADDRESS = 'rfu4i1Mo2NF7TQsN9bMVLFSojSzcyQCEH5';
 
 const prefixName = 'lightning';

test/integration/action/action-integration.spec.js

@@ -25,6 +25,7 @@ const grcpClient = require('../../../public/grpc-client');
 /* eslint-disable no-unused-vars */
 
 const isDev = true;
+const NETWORK = 'simnet';
 const BTCD_PORT = 18555;
 const BTCD_SETTINGS_DIR = 'test/data/btcd';
 const LND_SETTINGS_DIR_1 = 'test/data/lnd_1';
@@ -132,11 +133,13 @@ describe('Action Integration Tests', function() {
       ipcMain: ipcMainStub1,
       lndPort: LND_PORT_1,
       lndSettingsDir: LND_SETTINGS_DIR_1,
+      network: NETWORK,
     });
     await grcpClient.init({
       ipcMain: ipcMainStub2,
       lndPort: LND_PORT_2,
       lndSettingsDir: LND_SETTINGS_DIR_2,
+      network: NETWORK,
     });
 
     db1 = sinon.createStubInstance(AppStorage);