Update dependencies (#121)

BlueWallet · Jan 4, 2021 · cf40d77 · cf40d77
1 parent b8cd8d0
commit cf40d77
Show file tree

Hide file tree

Showing 16 changed files with 10,877 additions and 4,826 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,16 +1,16 @@
 {
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "plugins": [
       "prettier"
   ],
   "extends": ["prettier"],
   "rules": {
-    'prettier/prettier': [
-      'warn',
+    "prettier/prettier": [
+      "warn",
       {
-        singleQuote: true,
-        printWidth: 140,
-        trailingComma: 'all'
+        "singleQuote": true,
+        "printWidth": 140,
+        "trailingComma": "all"
       }
     ]
   },

diff --git a/class/Invo.js b/class/Invo.js
@@ -103,7 +103,7 @@ export class Invo {
           num_max_invoices: 99000111,
           reversed: true,
         },
-        function(err, response) {
+        function (err, response) {
           if (err) return reject(err);
           resolve(response);
         },

diff --git a/class/Paym.js b/class/Paym.js
@@ -22,8 +22,8 @@ export class Paym {
 
   async decodePayReqViaRpc(invoice) {
     let that = this;
-    return new Promise(function(resolve, reject) {
-      that._lightning.decodePayReq({ pay_req: invoice }, function(err, info) {
+    return new Promise(function (resolve, reject) {
+      that._lightning.decodePayReq({ pay_req: invoice }, function (err, info) {
         if (err) return reject(err);
         that._decoded = info;
         return resolve(info);
@@ -42,8 +42,8 @@ export class Paym {
       fee_limit: { fixed: Math.floor(this._decoded.num_satoshis * 0.01) + 1 },
     };
     let that = this;
-    return new Promise(function(resolve, reject) {
-      that._lightning.queryRoutes(request, function(err, response) {
+    return new Promise(function (resolve, reject) {
+      that._lightning.queryRoutes(request, function (err, response) {
         if (err) return reject(err);
         resolve(response);
       });
@@ -62,8 +62,8 @@ export class Paym {
     console.log('sendToRouteSync:', { request });
 
     let that = this;
-    return new Promise(function(resolve, reject) {
-      that._lightning.sendToRouteSync(request, function(err, response) {
+    return new Promise(function (resolve, reject) {
+      that._lightning.sendToRouteSync(request, function (err, response) {
         if (err) reject(err);
         resolve(that.processSendPaymentResponse(response));
       });
@@ -133,7 +133,7 @@ export class Paym {
 
   async listPayments() {
     return new Promise((resolve, reject) => {
-      this._lightning.listPayments({}, function(err, response) {
+      this._lightning.listPayments({}, function (err, response) {
         if (err) return reject(err);
         resolve(response);
       });

diff --git a/class/User.js b/class/User.js
@@ -232,8 +232,8 @@ export class User {
 
   async lookupInvoice(payment_hash) {
     let that = this;
-    return new Promise(function(resolve, reject) {
-      that._lightning.lookupInvoice({ r_hash_str: payment_hash }, function(err, response) {
+    return new Promise(function (resolve, reject) {
+      that._lightning.lookupInvoice({ r_hash_str: payment_hash }, function (err, response) {
         if (err) resolve({});
         resolve(response);
       });
@@ -557,11 +557,7 @@ export class User {
   }
 
   _hash(string) {
-    return crypto
-      .createHash('sha256')
-      .update(string)
-      .digest()
-      .toString('hex');
+    return crypto.createHash('sha256').update(string).digest().toString('hex');
   }
 
   /**
@@ -577,6 +573,6 @@ export class User {
   }
 
   static async _sleep(s) {
-    return new Promise(r => setTimeout(r, s * 1000));
+    return new Promise((r) => setTimeout(r, s * 1000));
   }
 }
diff --git a/controllers/api.js b/controllers/api.js
@@ -8,8 +8,8 @@ console.log('using config', JSON.stringify(config));
 
 var Redis = require('ioredis');
 var redis = new Redis(config.redis);
-redis.monitor(function(err, monitor) {
-  monitor.on('monitor', function(time, args, source, database) {
+redis.monitor(function (err, monitor) {
+  monitor.on('monitor', function (time, args, source, database) {
     // console.log('REDIS', JSON.stringify(args));
   });
 });
@@ -19,7 +19,7 @@ let lightning = require('../lightning');
 let identity_pubkey = false;
 // ###################### SMOKE TESTS ########################
 
-bitcoinclient.request('getblockchaininfo', false, function(err, info) {
+bitcoinclient.request('getblockchaininfo', false, function (err, info) {
   if (info && info.result && info.result.blocks) {
     if (info.result.chain === 'mainnet' && info.result.blocks < 550000) {
       console.error('bitcoind is not caught up');
@@ -31,7 +31,7 @@ bitcoinclient.request('getblockchaininfo', false, function(err, info) {
   }
 });
 
-lightning.getInfo({}, function(err, info) {
+lightning.getInfo({}, function (err, info) {
   if (err) {
     console.error('lnd failure');
     console.dir(err);
@@ -111,7 +111,7 @@ const postLimiter = rateLimit({
   max: 100,
 });
 
-router.post('/create', postLimiter, async function(req, res) {
+router.post('/create', postLimiter, async function (req, res) {
   logger.log('/create', [req.id]);
   if (!(req.body.partnerid && req.body.partnerid === 'bluewallet' && req.body.accounttype)) return errorBadArguments(res);
 
@@ -121,7 +121,7 @@ router.post('/create', postLimiter, async function(req, res) {
   res.send({ login: u.getLogin(), password: u.getPassword() });
 });
 
-router.post('/auth', postLimiter, async function(req, res) {
+router.post('/auth', postLimiter, async function (req, res) {
   logger.log('/auth', [req.id]);
   if (!((req.body.login && req.body.password) || req.body.refresh_token)) return errorBadArguments(res);
 
@@ -142,7 +142,7 @@ router.post('/auth', postLimiter, async function(req, res) {
   }
 });
 
-router.post('/addinvoice', postLimiter, async function(req, res) {
+router.post('/addinvoice', postLimiter, async function (req, res) {
   logger.log('/addinvoice', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -154,18 +154,21 @@ router.post('/addinvoice', postLimiter, async function(req, res) {
 
   const invoice = new Invo(redis, bitcoinclient, lightning);
   const r_preimage = invoice.makePreimageHex();
-  lightning.addInvoice({ memo: req.body.memo, value: req.body.amt, expiry: 3600 * 24, r_preimage: Buffer.from(r_preimage, 'hex').toString('base64') }, async function(err, info) {
-    if (err) return errorLnd(res);
-
-    info.pay_req = info.payment_request; // client backwards compatibility
-    await u.saveUserInvoice(info);
-    await invoice.savePreimage(r_preimage);
-
-    res.send(info);
-  });
+  lightning.addInvoice(
+    { memo: req.body.memo, value: req.body.amt, expiry: 3600 * 24, r_preimage: Buffer.from(r_preimage, 'hex').toString('base64') },
+    async function (err, info) {
+      if (err) return errorLnd(res);
+
+      info.pay_req = info.payment_request; // client backwards compatibility
+      await u.saveUserInvoice(info);
+      await invoice.savePreimage(r_preimage);
+
+      res.send(info);
+    },
+  );
 });
 
-router.post('/payinvoice', async function(req, res) {
+router.post('/payinvoice', async function (req, res) {
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
     return errorBadAuth(res);
@@ -195,7 +198,7 @@ router.post('/payinvoice', async function(req, res) {
     return errorTryAgainLater(res);
   }
 
-  lightning.decodePayReq({ pay_req: req.body.invoice }, async function(err, info) {
+  lightning.decodePayReq({ pay_req: req.body.invoice }, async function (err, info) {
     if (err) {
       await lock.releaseLock();
       return errorNotAValidInvoice(res);
@@ -263,7 +266,7 @@ router.post('/payinvoice', async function(req, res) {
       // else - regular lightning network payment:
 
       var call = lightning.sendPayment();
-      call.on('data', async function(payment) {
+      call.on('data', async function (payment) {
         // payment callback
         await u.unlockFunds(req.body.invoice);
         if (payment && payment.payment_route && payment.payment_route.total_amt_msat) {
@@ -305,7 +308,7 @@ router.post('/payinvoice', async function(req, res) {
   });
 });
 
-router.get('/getbtc', async function(req, res) {
+router.get('/getbtc', async function (req, res) {
   logger.log('/getbtc', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   await u.loadByAuthorization(req.headers.authorization);
@@ -324,7 +327,7 @@ router.get('/getbtc', async function(req, res) {
   res.send([{ address }]);
 });
 
-router.get('/checkpayment/:payment_hash', async function(req, res) {
+router.get('/checkpayment/:payment_hash', async function (req, res) {
   logger.log('/checkpayment', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   await u.loadByAuthorization(req.headers.authorization);
@@ -334,13 +337,14 @@ router.get('/checkpayment/:payment_hash', async function(req, res) {
   }
 
   let paid = true;
-  if (!(await u.getPaymentHashPaid(req.params.payment_hash))) { // Not found on cache
+  if (!(await u.getPaymentHashPaid(req.params.payment_hash))) {
+    // Not found on cache
     paid = await u.syncInvoicePaid(req.params.payment_hash);
   }
-  res.send({paid: paid});
+  res.send({ paid: paid });
 });
 
-router.get('/balance', postLimiter, async function(req, res) {
+router.get('/balance', postLimiter, async function (req, res) {
   let u = new User(redis, bitcoinclient, lightning);
   try {
     logger.log('/balance', [req.id]);
@@ -360,20 +364,20 @@ router.get('/balance', postLimiter, async function(req, res) {
   }
 });
 
-router.get('/getinfo', postLimiter, async function(req, res) {
+router.get('/getinfo', postLimiter, async function (req, res) {
   logger.log('/getinfo', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
     return errorBadAuth(res);
   }
 
-  lightning.getInfo({}, function(err, info) {
+  lightning.getInfo({}, function (err, info) {
     if (err) return errorLnd(res);
     res.send(info);
   });
 });
 
-router.get('/gettxs', async function(req, res) {
+router.get('/gettxs', async function (req, res) {
   logger.log('/gettxs', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -402,7 +406,7 @@ router.get('/gettxs', async function(req, res) {
   }
 });
 
-router.get('/getuserinvoices', postLimiter, async function(req, res) {
+router.get('/getuserinvoices', postLimiter, async function (req, res) {
   logger.log('/getuserinvoices', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -419,7 +423,7 @@ router.get('/getuserinvoices', postLimiter, async function(req, res) {
   }
 });
 
-router.get('/getpending', async function(req, res) {
+router.get('/getpending', async function (req, res) {
   logger.log('/getpending', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -433,7 +437,7 @@ router.get('/getpending', async function(req, res) {
   res.send(txs);
 });
 
-router.get('/decodeinvoice', async function(req, res) {
+router.get('/decodeinvoice', async function (req, res) {
   logger.log('/decodeinvoice', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -442,13 +446,13 @@ router.get('/decodeinvoice', async function(req, res) {
 
   if (!req.query.invoice) return errorGeneralServerError(res);
 
-  lightning.decodePayReq({ pay_req: req.query.invoice }, function(err, info) {
+  lightning.decodePayReq({ pay_req: req.query.invoice }, function (err, info) {
     if (err) return errorNotAValidInvoice(res);
     res.send(info);
   });
 });
 
-router.get('/checkrouteinvoice', async function(req, res) {
+router.get('/checkrouteinvoice', async function (req, res) {
   logger.log('/checkrouteinvoice', [req.id]);
   let u = new User(redis, bitcoinclient, lightning);
   if (!(await u.loadByAuthorization(req.headers.authorization))) {
@@ -459,7 +463,7 @@ router.get('/checkrouteinvoice', async function(req, res) {
 
   // at the momment does nothing.
   // TODO: decode and query actual route to destination
-  lightning.decodePayReq({ pay_req: req.query.invoice }, function(err, info) {
+  lightning.decodePayReq({ pay_req: req.query.invoice }, function (err, info) {
     if (err) return errorNotAValidInvoice(res);
     res.send(info);
   });

diff --git a/controllers/website.js b/controllers/website.js
@@ -11,14 +11,14 @@ let lightningListChannels = {};
 function updateLightning() {
   console.log('updateLightning()');
   try {
-    lightning.getInfo({}, function(err, info) {
+    lightning.getInfo({}, function (err, info) {
       if (err) {
         console.error('lnd failure:', err);
       }
       lightningGetInfo = info;
     });
 
-    lightning.listChannels({}, function(err, response) {
+    lightning.listChannels({}, function (err, response) {
       if (err) {
         console.error('lnd failure:', err);
         return;
@@ -79,7 +79,7 @@ const pubkey2name = {
   '037cc5f9f1da20ac0d60e83989729a204a33cc2d8e80438969fadf35c1c5f1233b': 'lnd2.bluewallet.io',
 };
 
-router.get('/', function(req, res) {
+router.get('/', function (req, res) {
   logger.log('/', [req.id]);
   if (!lightningGetInfo) {
     console.error('lnd failure');
@@ -104,7 +104,7 @@ router.get('/about', function(req, res) {
   return res.status(200).send(mustache.render(html, {}));
 });
 
-router.use(function(req, res) {
+router.use(function (req, res) {
   res.status(404).send('404');
 });
 

diff --git a/index.js b/index.js
@@ -1,12 +1,12 @@
-process.on('uncaughtException', function(err) {
+process.on('uncaughtException', function (err) {
   console.error(err);
   console.log('Node NOT Exiting...');
 });
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 let express = require('express');
 let morgan = require('morgan');
-let uuid = require('node-uuid');
+import { v4 as uuidv4 } from 'uuid';
 let logger = require('./utils/logger');
 
 morgan.token('id', function getId(req) {
@@ -23,8 +23,8 @@ const limiter = rateLimit({
 });
 app.use(limiter);
 
-app.use(function(req, res, next) {
-  req.id = uuid.v4();
+app.use(function (req, res, next) {
+  req.id = uuidv4();
   next();
 });
 
@@ -44,7 +44,7 @@ app.use('/static', express.static('static'));
 app.use(require('./controllers/api'));
 app.use(require('./controllers/website'));
 
-let server = app.listen(process.env.PORT || 3000, function() {
+let server = app.listen(process.env.PORT || 3000, function () {
   logger.log('BOOTING UP', 'Listening on port ' + (process.env.PORT || 3000));
 });
 module.exports = server;