aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Hopkins <[email protected]>2022-06-16 08:23:41 -0500
committerAdrien Hopkins <[email protected]>2022-06-16 08:23:41 -0500
commita9caa15ac75a6ce2939ffd90a0a2040434095d84 (patch)
treed444bd7cc42cad3a0f8bf5337255e9996b2eafc7
parent33338d09d6cb03f089c1f053c81503c0f8c11dbc (diff)
downloadcoinos-server-a9caa15ac75a6ce2939ffd90a0a2040434095d84.tar.gz
coinos-server-a9caa15ac75a6ce2939ffd90a0a2040434095d84.zip
Fixed imports from previous commit
-rw-r--r--routes/bitcoin/conversionFee.js4
-rw-r--r--routes/bitcoin/receive.js2
-rw-r--r--routes/bitcoin/send.js2
-rw-r--r--routes/liquid/conversionFee.js4
-rw-r--r--routes/liquid/receive.js2
-rw-r--r--routes/liquid/send.js2
6 files changed, 8 insertions, 8 deletions
diff --git a/routes/bitcoin/conversionFee.js b/routes/bitcoin/conversionFee.js
index 8a6bfce6..9df60c2a 100644
--- a/routes/bitcoin/conversionFee.js
+++ b/routes/bitcoin/conversionFee.js
@@ -2,11 +2,11 @@
// This is in a separate file so that the same function can be used by ./send and ./receive
const conversionFeeMultiplier = 0.01;
-export const conversionFeeReceiver = "coinosfees"; // account that receives the fees
+const conversionFeeReceiver = "coinosfees"; // account that receives the fees
/**
* Returns the fee you have to pay for withdrawing 'amount' bitcoin.
*/
-export function computeConversionFee(amount) {
+function computeConversionFee(amount) {
return Math.floor(amount * conversionFeeMultiplier);
}
diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js
index 02deb58f..8f5d5842 100644
--- a/routes/bitcoin/receive.js
+++ b/routes/bitcoin/receive.js
@@ -21,7 +21,7 @@ const network =
const queue = {};
const seen = [];
-import { computeConversionFee } from './conversionFee.js';
+const { computeConversionFee } = require('./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 72d34317..a566c6f0 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -1,5 +1,5 @@
const btc = config.liquid.btcasset;
-import { computeConversionFee, conversionFeeReceiver } from './conversionFee.js';
+let { computeConversionFee, conversionFeeReceiver } = require('./conversionFee.js');
module.exports = ah(async (req, res) => {
let { user } = req;
diff --git a/routes/liquid/conversionFee.js b/routes/liquid/conversionFee.js
index 36ba6f36..d365185b 100644
--- a/routes/liquid/conversionFee.js
+++ b/routes/liquid/conversionFee.js
@@ -2,11 +2,11 @@
// This is in a separate file so that the same function can be used by ./send and ./receive
const conversionFeeMultiplier = 0.01;
-export const conversionFeeReceiver = "coinosfees"; // account that receives the fees
+const conversionFeeReceiver = "coinosfees"; // account that receives the fees
/**
* Returns the fee you have to pay for withdrawing 'amount' L-BTC.
*/
-export function computeConversionFee(amount) {
+function computeConversionFee(amount) {
return Math.floor(amount * conversionFeeMultiplier);
}
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 432619b3..5c0ca98e 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -13,7 +13,7 @@ const network =
config.liquid.network === "mainnet" ? "liquid" : config.liquid.network
];
-import { computeConversionFee } from './conversionFee.js';
+const { computeConversionFee } = require('./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 33bee9ed..3e8ac946 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");
-import { computeConversionFee, conversionFeeReceiver } from './conversionFee.js';
+const { computeConversionFee, conversionFeeReceiver } = require('./conversionFee.js');
sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
try {