es6 migration

3 files changed, 13 insertions, 15 deletions

diff --git a/routes/liquid/broadcast.js b/routes/liquid/broadcast.js
index 1a44cd2b..5deb846f 100644
--- a/routes/liquid/broadcast.js
+++ b/routes/liquid/broadcast.js
@@ -1,4 +1,4 @@
-import { rates } from "../../lib/store.js";
+import store from "../../lib/store.js";
 export default async (req, res) => {
   try {
     const { user } = req;
@@ -22,7 +22,7 @@ export default async (req, res) => {
             tip: 0,
             account_id: account.id,
             user_id: user.id,
-            rate: rates[user.currency],
+            rate: store.rates[user.currency],
             currency: user.currency,
             confirmed: true,
             received: false,
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 380fe4f4..5f61bc73 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -1,14 +1,13 @@
-import { rates } from "../../lib/store.js";
-import { addresses } from "../../lib/store.js";
+import store from "../../lib/store.js";
 import { sendLiquid } from "./send.js";
 import { notify } from "../../lib/notifications.js";
 import { callWebhook } from "../../lib/webhooks.js";
 import reverse from 'buffer-reverse';
-import zmq from 'zeromq/v5-compat';
+import zmq from 'zeromq/v5-compat.js';
 import { Op } from '@sequelize/core';
 import { fromBase58 } from 'bip32';
 import bitcoin from 'bitcoinjs-lib';
-// import { Block, networks, Transaction } from 'liquidjs-lib';
+import { Block, networks, Transaction } from 'liquidjs-lib';
 
 const network =
   networks[
@@ -51,7 +50,7 @@ const getAccount = async (params, transaction) => {
     params.seed = nc.seed;
   }
 
-  const assets = app.get("assets");
+  const assets = assets;
 
   if (assets[asset]) {
     ({ domain, ticker, precision, name } = assets[asset]);
@@ -117,11 +116,11 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
         const address = o.scriptPubKey.addresses[0];
 
         if (
-          Object.keys(addresses).includes(address) &&
+          Object.keys(store.addresses).includes(address) &&
           !change.includes(address)
         ) {
           await db.transaction(async transaction => {
-            let user = await getUser(addresses[address], transaction);
+            let user = await getUser(store.addresses[address], transaction);
 
             let invoice = await db.Invoice.findOne({
               where: {
@@ -172,7 +171,7 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
             const currency = invoice ? invoice.currency : user.currency;
             const rate = invoice
               ? invoice.rate
-              : rates[user.currency];
+              : store.rates[user.currency];
             const tip = invoice ? invoice.tip : 0;
             const memo = invoice ? invoice.memo : "";
 
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index 674b93f2..5b4db184 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -1,5 +1,4 @@
-import { rates } from "../../lib/store.js";
-import { addresses } from "../../lib/store.js";
+import store from "../../lib/store.js";
 import config from "../../config/index.js";
 const btc = config.liquid.btcasset;
 const lcad = config.liquid.cadasset;
@@ -25,7 +24,7 @@ export const sendLiquid = async ({ asset, amount, user, address, memo, tx, limit
 
     const isChange = async address =>
       (await lq.getAddressInfo(address)).ismine &&
-      !Object.keys(addresses).includes(address);
+      !Object.keys(store.addresses).includes(address);
 
     let totals = {};
     let change = {};
@@ -184,7 +183,7 @@ export const sendLiquid = async ({ asset, amount, user, address, memo, tx, limit
               memo: "Liquid conversion fee",
               account_id: receiverAccount.id,
               user_id: receiverAccount.user_id,
-              rate: rates[receiverAccount.user.currency],
+              rate: store.rates[receiverAccount.user.currency],
               currency: receiverAccount.user.currency,
               confirmed: true,
               received: true,
@@ -202,7 +201,7 @@ export const sendLiquid = async ({ asset, amount, user, address, memo, tx, limit
             fee,
             memo,
             user_id: user.id,
-            rate: rates[user.currency],
+            rate: store.rates[user.currency],
             currency: user.currency,
             address,
             confirmed: true,