From 8361c2d400145a13d9ba24299ceb7293e69d3d43 Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Thu, 16 Jun 2022 09:17:24 -0500
Subject: Separated Bitcoin and Liquid conversion fee credits

---
 routes/bitcoin/receive.js | 2 +-
 routes/bitcoin/send.js    | 4 ++--
 routes/liquid/receive.js  | 2 +-
 routes/liquid/send.js     | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'routes')

diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js
index 8f5d5842..45dadbbe 100644
--- a/routes/bitcoin/receive.js
+++ b/routes/bitcoin/receive.js
@@ -195,7 +195,7 @@ setInterval(async () => {
             { transaction }
           );
           // get the # of fee credits you would need to pay off this amount of bitcoin
-          await account.increment({ fee_credits: computeConversionFee(total) }, { transaction });
+          await account.increment({ btc_credits: computeConversionFee(total) }, { transaction });
           await account.reload({ transaction });
           await p.save({ transaction });
 
diff --git a/routes/bitcoin/send.js b/routes/bitcoin/send.js
index a566c6f0..884c0db1 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -67,9 +67,9 @@ module.exports = ah(async (req, res) => {
       }
 
       // use user's credits to reduce fee, if available
-      let conversionFeeDeduction = Math.min(account.fee_credits, conversionFee);
+      let conversionFeeDeduction = Math.min(account.btc_credits, conversionFee);
       if (conversionFeeDeduction) {
-        await account.decrement({ fee_credits: conversionFeeDeduction }, { transaction });
+        await account.decrement({ btc_credits: conversionFeeDeduction }, { transaction });
         await account.reload({ transaction });
         conversionFee -= conversionFeeDeduction;
       }
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 5c0ca98e..2bd86805 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -343,7 +343,7 @@ setInterval(async () => {
             { pending: Math.min(p.account.pending, total) },
             { transaction }
           );
-          await p.account.increment({ fee_credits: computeConversionFee(total) }, { transaction });
+          await p.account.increment({ liquid_credits: computeConversionFee(total) }, { transaction });
           await p.account.reload({ transaction });
 
           await p.save({ transaction });
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index 3e8ac946..5cda8ba5 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -131,10 +131,9 @@ sendLiquid = async ({ asset, amount, user, address, memo, tx, limit }) => {
           }
 
           // use user's credits to reduce fee, if available
-          console.log(account.fee_credits);
-          let conversionFeeDeduction = Math.min(account.fee_credits, conversionFee);
+          let conversionFeeDeduction = Math.min(account.liquid_credits, conversionFee);
           if (conversionFeeDeduction) {
-            await account.decrement({ fee_credits: conversionFeeDeduction }, { transaction });
+            await account.decrement({ liquid_credits: conversionFeeDeduction }, { transaction });
             await account.reload({ transaction });
             conversionFee -= conversionFeeDeduction;
           }
-- 
cgit v1.2.3