amount from pay request should take precedence if provided

3 files changed, 8 insertions, 2 deletions

diff --git a/lib/send.js b/lib/send.js
index 37cbdfdb..98fa4d2c 100644
--- a/lib/send.js
+++ b/lib/send.js
@@ -1,9 +1,10 @@
 const bolt11 = require("bolt11");
+const { Op } = require("sequelize");
 
 send = async (amount, memo, hash, user) => {
   let payreq = bolt11.decode(hash);
 
-  if (!amount) amount = payreq.satoshis;
+  if (!amount || payreq.satoshis > amount) amount = payreq.satoshis;
 
   if (seen.includes(hash)) {
     l.warn("attempted to pay a paid invoice", user.username);
@@ -17,7 +18,10 @@ send = async (amount, memo, hash, user) => {
       where: {
         user_id: user.id,
         asset: config.liquid.btcasset,
-        pubkey: null
+        pubkey: null,
+        balance: {
+          [Op.gte]: amount
+        },
       },
       lock: transaction.LOCK.UPDATE,
       transaction
diff --git a/routes/liquid/send.js b/routes/liquid/send.js
index 04b90814..01b1a41d 100644
--- a/routes/liquid/send.js
+++ b/routes/liquid/send.js
@@ -81,6 +81,7 @@ module.exports = ah(async (req, res) => {
               pubkey: null
             },
             lock: transaction.LOCK.UPDATE,
+            order: [['balance', 'DESC']],
             transaction
           });
 
diff --git a/watcher.sh b/watcher.sh
index 74451bf6..b900a50c 100755
--- a/watcher.sh
+++ b/watcher.sh
@@ -12,6 +12,7 @@ do
   if "$low"; then 
     echo "Balance below threshold, shutting down"
     yarn pm2 stop 0 > /dev/null
+    cd /root/mailgun && node index.js
     exit
   fi
   sleep 10