es6 migration

29 files changed, 132 insertions, 140 deletions

diff --git a/routes/admin.js b/routes/admin.js
index 14f97a19..1be6612d 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -1,12 +1,11 @@
-var express = require('express');
+import express from 'express';
 var router = express.Router();
 
-const parseInput = require('../scripts/apiParse')
-
-const Sequelize = require('sequelize')
+import parseInput from '../scripts/apiParse.js';
+import Sequelize from 'sequelize';
 const Op = Sequelize.Op;
 
-const { v4: uuidv4 } = require('uuid');
+import { v4 as uuidv4 } from 'uuid';
 
 /**
  * @api {get} /users Retrieve user list
@@ -123,33 +122,33 @@ router.get(
  *        ]
  *     }
  */
- router.get(
-  "/waiting_list",
-  // auth,
-  ah(async (req, res) => {
-    var {search, starts_with, contains} = req.query
+router.get(
+ "/waiting_list",
+ // auth,
+ ah(async (req, res) => {
+   var {search, starts_with, contains} = req.query
 
-    var queue = knex
-      .select(
-        'waiting_list.email', 
-        'waiting_list.phone', 
-        'waiting_list.created_at as requested',
-        'users.id as current_user_id'
-      )
-      .from('waiting_list')
-      .leftJoin('users', 'users.email', 'waiting_list.email')
-      .where('waiting_list.id', '>', 0)
+   var queue = knex
+     .select(
+       'waiting_list.email', 
+       'waiting_list.phone', 
+       'waiting_list.created_at as requested',
+       'users.id as current_user_id'
+     )
+     .from('waiting_list')
+     .leftJoin('users', 'users.email', 'waiting_list.email')
+     .where('waiting_list.id', '>', 0)
 
-    var timeCondition = parseInput.addTimeSearch(req.query, 'waiting_list.updated_at')
-    var userCondition = parseInput.addUserSearch(req.query)
+   var timeCondition = parseInput.addTimeSearch(req.query, 'waiting_list.updated_at')
+   var userCondition = parseInput.addUserSearch(req.query)
 
-    if (timeCondition) queue = queue.whereRaw(timeCondition)
-    if (userCondition) queue = queue.whereRaw(userCondition)
+   if (timeCondition) queue = queue.whereRaw(timeCondition)
+   if (userCondition) queue = queue.whereRaw(userCondition)
 
-    const found = await queue
+   const found = await queue
 
-    return res.send({queue: found})
-  })
+   return res.send({queue: found})
+ })
 );
 
 /**
@@ -569,4 +568,4 @@ router.get(
   })
 );
 
-module.exports = router;
+export default router;
diff --git a/routes/assets.js b/routes/assets.js
index 342bb601..884d1c77 100644
--- a/routes/assets.js
+++ b/routes/assets.js
@@ -1,6 +1,6 @@
-const axios = require("axios");
-const crypto = require("crypto");
-const fs = require("fs");
+import axios from 'axios';
+import crypto from 'crypto';
+import fs from 'fs';
 
 let fetchAssets;
 (fetchAssets = async () => {
diff --git a/routes/bitcoin/broadcast.js b/routes/bitcoin/broadcast.js
index a32e9067..5ee7d6bb 100644
--- a/routes/bitcoin/broadcast.js
+++ b/routes/bitcoin/broadcast.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   try {
     const { user } = req;
     let hash = await bc.sendRawTransaction(req.body.tx);
diff --git a/routes/bitcoin/fee.js b/routes/bitcoin/fee.js
index 913c3e9b..20dc8e9a 100644
--- a/routes/bitcoin/fee.js
+++ b/routes/bitcoin/fee.js
@@ -1,6 +1,6 @@
-const buildTx = require("../../lib/buildtx");
+import buildTx from '../../lib/buildtx';
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { user } = req;
   let { address, amount, feeRate, replaceable } = req.body;
   let tx, fee;
diff --git a/routes/bitcoin/generate.js b/routes/bitcoin/generate.js
index b8706891..92df1e12 100644
--- a/routes/bitcoin/generate.js
+++ b/routes/bitcoin/generate.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let address = await bc.getNewAddress();
   await bc.generateToAddress(1, address);
   res.end();
diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js
index 0c3c4a8e..ac9aa1e7 100644
--- a/routes/bitcoin/receive.js
+++ b/routes/bitcoin/receive.js
@@ -1,9 +1,8 @@
-const reverse = require("buffer-reverse");
-const zmq = require("zeromq/v5-compat");
-const { Op } = require("sequelize");
-const { fromBase58 } = require("bip32");
-
-const bitcoin = require("bitcoinjs-lib");
+import reverse from 'buffer-reverse';
+import zmq from 'zeromq/v5-compat';
+import { Op } from 'sequelize';
+import { fromBase58 } from 'bip32';
+import bitcoin from 'bitcoinjs-lib';
 
 const zmqRawBlock = zmq.socket("sub");
 zmqRawBlock.connect(config.bitcoin.zmqrawblock);
@@ -21,7 +20,7 @@ const network =
 const queue = {};
 const seen = [];
 
-const { computeConversionFee } = require("./conversionFee.js");
+import { computeConversionFee } from './conversionFee.js';
 
 zmqRawTx.on("message", async (topic, message, sequence) => {
   const hex = message.toString("hex");
diff --git a/routes/bitcoin/send.js b/routes/bitcoin/send.js
index 9113d3db..85117dbb 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -1,7 +1,7 @@
 const btc = config.liquid.btcasset;
-let { computeConversionFee, conversionFeeReceiver } = require('./conversionFee.js');
+import { computeConversionFee, conversionFeeReceiver } from './conversionFee.js';
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { user } = req;
   let { address, memo, tx } = req.body;
   let { hex } = tx;
diff --git a/routes/bitcoin/sweep.js b/routes/bitcoin/sweep.js
index 615e78f3..f056bdeb 100644
--- a/routes/bitcoin/sweep.js
+++ b/routes/bitcoin/sweep.js
@@ -1,14 +1,14 @@
-const axios = require("axios");
-const bitcoin = require("bitcoinjs-lib");
-const coinselect = require("coinselect");
-const split = require("coinselect/split");
+import axios from 'axios';
+import bitcoin from 'bitcoinjs-lib';
+import coinselect from 'coinselect';
+import split from 'coinselect/split';
 const api = prod ? "https://blockstream.info/api" : config.bitcoin.electrs;
 const SATS = 100000000;
 const network = prod
   ? bitcoin.networks["bitcoin"]
   : bitcoin.networks["regtest"];
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { address: from, amount, feeRate, target } = req.body;
   let utxos;
   if (!feeRate) feeRate = (await bc.estimateSmartFee(6)).feerate * SATS;
diff --git a/routes/funding.js b/routes/funding.js
index d9cf3097..7edcd713 100644
--- a/routes/funding.js
+++ b/routes/funding.js
@@ -1,4 +1,5 @@
-const mailgun = require("mailgun-js")(config.mailgun);
+import mailgunFactory from 'mailgun-js';
+const mailgun = mailgunFactory(config.mailgun);
 
 app.post(
   "/id",
diff --git a/routes/info.js b/routes/info.js
index 8d098a2f..0be7f27d 100644
--- a/routes/info.js
+++ b/routes/info.js
@@ -1,4 +1,4 @@
-const sequelize = require("sequelize");
+import sequelize from 'sequelize';
 const { Op } = sequelize;
 
 /**
diff --git a/routes/invoices.js b/routes/invoices.js
index a86b5580..9e3fedb7 100644
--- a/routes/invoices.js
+++ b/routes/invoices.js
@@ -1,5 +1,5 @@
-const { Op } = require("sequelize");
-const axios = require("axios");
+import { Op } from 'sequelize';
+import axios from 'axios';
 
 app.get(
   "/invoice",
diff --git a/routes/lightning/channel.js b/routes/lightning/channel.js
index cb8ddf07..fe6d9520 100644
--- a/routes/lightning/channel.js
+++ b/routes/lightning/channel.js
@@ -1,6 +1,6 @@
-const axios = require("axios");
+import axios from 'axios';
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   const { params } = req.body;
   const [pubkey, host] = params.uri.split("@");
 
diff --git a/routes/lightning/channelRequest.js b/routes/lightning/channelRequest.js
index 169de654..96b6d71f 100644
--- a/routes/lightning/channelRequest.js
+++ b/routes/lightning/channelRequest.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { localAmt, pushAmt } = req.body;
 
   pushAmt = 0;
diff --git a/routes/lightning/invoice.js b/routes/lightning/invoice.js
index 31f23bd6..38bad042 100644
--- a/routes/lightning/invoice.js
+++ b/routes/lightning/invoice.js
@@ -1,5 +1,5 @@
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { amount, memo, tip } = req.body;
   if (!tip) tip = 0;
   let value = amount + tip;
diff --git a/routes/lightning/query.js b/routes/lightning/query.js
index dc867371..0d034604 100644
--- a/routes/lightning/query.js
+++ b/routes/lightning/query.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   const { payreq } = req.body;
 
   const invoice = await db.Invoice.findOne({
diff --git a/routes/lightning/receive.js b/routes/lightning/receive.js
index c9e7dec7..1c3dc8eb 100644
--- a/routes/lightning/receive.js
+++ b/routes/lightning/receive.js
@@ -1,4 +1,4 @@
-const { computeConversionFee } = require('./conversionFee.js');
+import { computeConversionFee } from './conversionFee.js';
 
 const handlePayment = async (msg) => {
   l.info("incoming lightning payment", msg.value, msg.payment_request, msg.settled);
diff --git a/routes/lightning/send.js b/routes/lightning/send.js
index c0a472d8..a2eedcc8 100644
--- a/routes/lightning/send.js
+++ b/routes/lightning/send.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { amount, route, memo, payreq } = req.body;
   let { user } = req;
 
diff --git a/routes/liquid/broadcast.js b/routes/liquid/broadcast.js
index 095f851d..168e9518 100644
--- a/routes/liquid/broadcast.js
+++ b/routes/liquid/broadcast.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   try {
     const { user } = req;
     let hash = await lq.sendRawTransaction(req.body.tx);
diff --git a/routes/liquid/fee.js b/routes/liquid/fee.js
index 253810a9..0488b31e 100644
--- a/routes/liquid/fee.js
+++ b/routes/liquid/fee.js
@@ -1,4 +1,4 @@
-const buildTx = require("../../lib/buildliquidtx");
+import buildTx from '../../lib/buildliquidtx';
 
 liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
   let tx, fee;
@@ -71,7 +71,7 @@ liquidTx = async ({ address, asset, amount, feeRate, replaceable, user }) => {
   return { feeRate, tx };
 };
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   try {
     let tx = await liquidTx({ ...req.body, user: req.user })
     res.send(tx);
diff --git a/routes/liquid/generate.js b/routes/liquid/generate.js
index 5bcb1c0a..50c63dcf 100644
--- a/routes/liquid/generate.js
+++ b/routes/liquid/generate.js
@@ -1,4 +1,4 @@
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let address = await lq.getNewAddress();
   await lq.generateToAddress(1, address);
   res.end();
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 312613e2..151ffb40 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -1,11 +1,11 @@
-const reverse = require("buffer-reverse");
-const zmq = require("zeromq/v5-compat");
-const { Op } = require("sequelize");
-const { fromBase58 } = require("bip32");
-const bitcoin = require("bitcoinjs-lib");
-const { Block, networks, Transaction } = require("liquidjs-lib");
-const wretch = require("wretch");
-const fetch = require("node-fetch");
+import reverse from 'buffer-reverse';
+import zmq from 'zeromq/v5-compat';
+import { Op } from 'sequelize';
+import { fromBase58 } from 'bip32';
+import bitcoin from 'bitcoinjs-lib';
+import { Block, networks, Transaction } from 'liquidjs-lib';
+import wretch from 'wretch';
+import fetch from 'node-fetch';
 wretch().polyfills({ fetch });
 
 const network =
@@ -13,7 +13,7 @@ const network =
     config.liquid.network === "mainnet" ? "liquid" : config.liquid.network
   ];
 
-const { computeConversionFee } = require('./conversionFee.js');
+import { computeConversionFee } from './conversionFee.js';
 
 const getAccount = async (params, transaction) => {
   let account = await db.Account.findOne({
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index c6512a89..e5112468 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -1,7 +1,7 @@
 const btc = config.liquid.btcasset;
 const lcad = config.liquid.cadasset;
-const { Transaction } = require("liquidjs-lib");
-const { computeConversionFee, conversionFeeReceiver } = require('./conversionFee.js');
+import { Transaction } from 'liquidjs-lib';
+import { computeConversionFee, conversionFeeReceiver } from './conversionFee.js';
 
 sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
   try {
@@ -231,7 +231,7 @@ sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
   }
 };
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { user } = req;
 
   try {
diff --git a/routes/liquid/taxi.js b/routes/liquid/taxi.js
index 13429eb8..5bc3c8b7 100644
--- a/routes/liquid/taxi.js
+++ b/routes/liquid/taxi.js
@@ -1,15 +1,8 @@
-const {
-  address: Address,
-  Psbt,
-  payments,
-  networks
-} = require("liquidjs-lib");
-
-const { ECPairFactory} = require('ecpair');
-const tinysecp = require('tiny-secp256k1');
-
-const wretch = require("wretch");
-const fetch = require("node-fetch");
+import { address as Address, Psbt, payments, networks } from 'liquidjs-lib';
+import { ECPairFactory } from 'ecpair';
+import tinysecp from 'tiny-secp256k1';
+import wretch from 'wretch';
+import fetch from 'node-fetch';
 
 wretch().polyfills({ fetch });
 
@@ -23,7 +16,7 @@ const network = prod ? networks.liquid : networks.regtest;
 const ECPair = ECPairFactory(tinysecp);
 const key = ECPair.fromPrivateKey(Buffer.from(config.taxi, "hex"));
 
-module.exports = ah(async (req, res) => {
+export default ah(async (req, res) => {
   let { user } = req;
   let { psbt } = req.body;
 
diff --git a/routes/lnurl.js b/routes/lnurl.js
index 9cb44817..9ced0466 100644
--- a/routes/lnurl.js
+++ b/routes/lnurl.js
@@ -1,9 +1,9 @@
-const axios = require("axios");
-const lnurl = require("lnurl");
-const jwt = require("jsonwebtoken");
-const qs = require("query-string");
-const persist = require("../lib/persist");
-const bolt11 = require("bolt11");
+import axios from 'axios';
+import lnurl from 'lnurl';
+import jwt from 'jsonwebtoken';
+import qs from 'query-string';
+import persist from '../lib/persist';
+import bolt11 from 'bolt11';
 
 logins = persist("data/logins.json");
 recipients = persist("data/recipients.json");
@@ -12,7 +12,7 @@ withdrawals = persist("data/withdrawals.json");
 
 lnurlServer = lnurl.createServer(config.lnurl);
 
-let { computeConversionFee, conversionFeeReceiver } = require('./lightning/conversionFee.js');
+import { computeConversionFee, conversionFeeReceiver } from './lightning/conversionFee.js';
 
 var optionalAuth = function(req, res, next) {
   passport.authenticate("jwt", { session: false }, function(err, user, info) {
diff --git a/routes/payments.js b/routes/payments.js
index 3bcc271d..a9ad7d82 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -1,7 +1,7 @@
-const fs = require("fs");
-const BitcoinCore = require("@asoltys/bitcoin-core");
-const { join } = require("path");
-const { Op } = require("sequelize");
+import fs from 'fs';
+import BitcoinCore from '@asoltys/bitcoin-core';
+import { join } from 'path';
+import { Op } from 'sequelize';
 
 app.post("/send", auth, require("./send"));
 app.post(
diff --git a/routes/referrals.js b/routes/referrals.js
index 185b0928..82bbb3d4 100644
--- a/routes/referrals.js
+++ b/routes/referrals.js
@@ -1,7 +1,7 @@
-var express = require('express');
+import express from 'express';
 var router = express.Router();
 
-const { v4: uuidv4 } = require('uuid');
+import { v4 as uuidv4 } from 'uuid';
 
 router.get('/', function(req, res, next) {
   res.send('list of referrals...');
@@ -272,22 +272,22 @@ router.get(
  * 
  * @apiDescription returns boolean indicating if user is referred or not
  */
- router.get(
-  "/isReferred/:user_id",
-  ah(async (req, res) => {
-    const { user_id } = req.params;
+router.get(
+ "/isReferred/:user_id",
+ ah(async (req, res) => {
+   const { user_id } = req.params;
 
-    var referred = await knex('referrals')
-      .select('referrals.id')
-      .where('user_id', 'like', user_id)
-      .where('status', 'like', 'used')
-    
-    if (referred && referred.length) {
-      res.send({referred: true})
-    } else {
-      res.send({referred: false})
-    }
-  })
- );
+   var referred = await knex('referrals')
+     .select('referrals.id')
+     .where('user_id', 'like', user_id)
+     .where('status', 'like', 'used')
+   
+   if (referred && referred.length) {
+     res.send({referred: true})
+   } else {
+     res.send({referred: false})
+   }
+ })
+);
 
-module.exports = router;
+export default router;
diff --git a/routes/send.js b/routes/send.js
index 7c6728a1..c6de3acb 100644
--- a/routes/send.js
+++ b/routes/send.js
@@ -1,7 +1,7 @@
-const axios = require("axios");
-const { v4: uuidv4 } = require("uuid");
+import axios from 'axios';
+import { v4 as uuidv4 } from 'uuid';
 
-module.exports = ah(async (req, res, next) => {
+export default ah(async (req, res, next) => {
   let {
     amount,
     address,
diff --git a/routes/swaps.js b/routes/swaps.js
index 9438ee86..e51dc4f0 100644
--- a/routes/swaps.js
+++ b/routes/swaps.js
@@ -1,9 +1,9 @@
-const axios = require("axios");
-const crypto = require("crypto");
-const fs = require("fs");
-const getAccount = require("../lib/account");
-const { Op, col } = require("sequelize");
-const { v4: uuidv4 } = require("uuid");
+import axios from 'axios';
+import crypto from 'crypto';
+import fs from 'fs';
+import getAccount from '../lib/account';
+import { Op, col } from 'sequelize';
+import { v4 as uuidv4 } from 'uuid';
 
 const shallow = a => {
   let b = {};
diff --git a/routes/users.js b/routes/users.js
index 7a5e1cd5..f92c9045 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -1,17 +1,17 @@
-const axios = require("axios");
-const bcrypt = require("bcrypt");
-const jwt = require("jsonwebtoken");
-const authenticator = require("otplib").authenticator;
-const getAccount = require("../lib/account");
-const Sequelize = require("sequelize");
-const bitcoin = require("bitcoinjs-lib");
-const liquid = require("liquidjs-lib");
-const { fromBase58, fromPrivateKey } = require("bip32");
-const { Mutex } = require("async-mutex");
-const bip32 = require("bip32");
+import axios from 'axios';
+import bcrypt from 'bcrypt';
+import jwt from 'jsonwebtoken';
+import { authenticator } from 'otplib';
+import getAccount from '../lib/account.js';
+import Sequelize from 'sequelize';
+import bitcoin from 'bitcoinjs-lib';
+import liquid from 'liquidjs-lib';
+import { fromBase58, fromPrivateKey } from 'bip32';
+import { Mutex } from 'async-mutex';
+import bip32 from 'bip32';
 
 const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {});
-require("../lib/whitelist");
+import '../lib/whitelist.js';
 
 const twofa = ah((req, res, next) => {
   let {