Merge branch 'BlueWallet:master' into master

BlueWallet · Nov 5, 2021 · 9563cb9 · 9563cb9
2 parents ac2061c + aca47a2
commit 9563cb9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,10 +27,10 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "express": "^4.17.1",
-    "express-rate-limit": "^5.3.0",
+    "express-rate-limit": "^5.4.1",
     "frisbee": "^3.1.4",
     "helmet": "^4.6.0",
-    "ioredis": "^4.27.8",
+    "ioredis": "^4.27.10",
     "jayson": "^3.6.4",
     "morgan": "^1.10.0",
     "mustache": "^4.1.0",

diff --git a/scripts/process-locked-payments.js b/scripts/process-locked-payments.js
@@ -3,10 +3,15 @@
  * sentout payments from LND. If locked payment is in there we moe locked payment to array of real payments for the user
  * (it is effectively spent coins by user), if not - we attempt to pay it again (if it is not too old).
  */
-import { User, Lock, Paym } from '../class/';
+import { User, Paym } from '../class/';
 const config = require('../config');
 
-const fs = require('fs');
+/****** START SET FEES FROM CONFIG AT STARTUP ******/
+/** GLOBALS */
+global.forwardFee = config.forwardReserveFee || 0.01;
+global.internalFee = config.intraHubFee || 0.003;
+/****** END SET FEES FROM CONFIG AT STARTUP ******/
+
 var Redis = require('ioredis');
 var redis = new Redis(config.redis);
 
@@ -20,8 +25,8 @@ let lightning = require('../lightning');
   console.log('fetching listPayments...');
   let tempPaym = new Paym(redis, bitcoinclient, lightning);
   let listPayments = await tempPaym.listPayments();
+  // DEBUG let listPayments = JSON.parse(fs.readFileSync('listpayments.txt').toString('ascii'));
   console.log('done', 'got', listPayments['payments'].length, 'payments');
-  fs.writeFileSync('listPayments.json', JSON.stringify(listPayments['payments'], null, 2));
 
   for (let key of keys) {
     const userid = key.replace('locked_payments_for_', '');
@@ -30,16 +35,33 @@ let lightning = require('../lightning');
     let user = new User(redis, bitcoinclient, lightning);
     user._userid = userid;
     let lockedPayments = await user.getLockedPayments();
-    // lockedPayments = [{pay_req : 'lnbc2m1pwgd4tdpp5vjz80mm8murdkskrnre6w4kphzy3d6gap5jyffr93u02ruaj0wtsdq2xgcrqvpsxqcqzysk34zva4h9ce9jdf08nfdm2sh2ek4y4hjse8ww9jputneltjl24krkv50sene4jh0wpull6ujgrg632u2qt3lkva74vpkqr5e5tuuljspasqfhx'}];
+    // DEBUG let lockedPayments = [{ pay_req : 'lnbc108130n1pshdaeupp58kw9djt9vcdx26wkdxl07tgncdmxz2w7s9hzul45tf8gfplme94sdqqcqzzgxqrrssrzjqw8c7yfutqqy3kz8662fxutjvef7q2ujsxtt45csu0k688lkzu3ld93gutl3k6wauyqqqqryqqqqthqqpysp5jcmk82hypuud0lhpf66dg3w5ta6aumc4w9g9sxljazglq9wkwstq9qypqsqnw8hwwauvzrala3g4yrkgazk2l2fh582j9ytz7le46gmsgglvmrknx842ej9z4c63en5866l8tpevm8cwul8g94kf2nepppn256unucp43jnsw',   amount: 10813, timestamp: 1635186606 }];
 
     for (let lockedPayment of lockedPayments) {
       let daysPassed = (+new Date() / 1000 - lockedPayment.timestamp) / 3600 / 24;
       console.log('processing lockedPayment=', lockedPayment, daysPassed, 'days passed');
 
       let payment = new Paym(redis, bitcoinclient, lightning);
       payment.setInvoice(lockedPayment.pay_req);
+
+      // first things first:
+      // trying to lookup this stuck payment in an array of delivered payments
+      let isPaid = false;
+      for (let sentPayment of listPayments['payments']) {
+        if ((await payment.getPaymentHash()) == sentPayment.payment_hash) {
+          console.log('found this payment in listPayments array, so it is paid successfully');
+          let sendResult = payment.processSendPaymentResponse({ payment_error: 'already paid' } /* hacky */); // adds fees
+          console.log('saving paid invoice:', sendResult);
+          await user.savePaidLndInvoice(sendResult);
+          await user.unlockFunds(lockedPayment.pay_req);
+          isPaid = true;
+          console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!', await payment.getPaymentHash(), sentPayment.payment_hash);
+          break;
+        }
+      }
+      // could not find...
+
       if (daysPassed > 1 / 24 && daysPassed <= 1) {
-        // if (!await payment.isExpired()) {
         let sendResult;
         console.log('attempting to pay to route');
         try {
@@ -68,22 +90,7 @@ let lightning = require('../lightning');
         console.log('-----------------------------------------------------------------------------------');
         await User._sleep(0);
       } else if (daysPassed > 1) {
-        // trying to lookup this stuck payment in an array of delivered payments
-        let isPaid = false;
-        for (let sentPayment of listPayments['payments']) {
-          if ((await payment.getPaymentHash()) == sentPayment.payment_hash) {
-            console.log('found this payment in listPayments array, so it is paid successfully');
-            let sendResult = payment.processSendPaymentResponse({ payment_error: 'already paid' } /* hacky */); // adds fees
-            console.log('saving paid invoice:', sendResult);
-            await user.savePaidLndInvoice(sendResult);
-            await user.unlockFunds(lockedPayment.pay_req);
-            isPaid = true;
-            console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!', await payment.getPaymentHash(), sentPayment.payment_hash);
-            process.exit();
-            break;
-          }
-        }
-
+        // could not find in listpayments array; too late to retry
         if (!isPaid) {
           console.log('very old payment, evict the lock');
           await user.unlockFunds(lockedPayment.pay_req);