fix(lnd): ensure fee limit is correctly set

LN-Zap · May 17, 2020 · 762c137 · 762c137
1 parent 88b4bcc
commit 762c137
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/renderer/reducers/payment/reducer.js b/renderer/reducers/payment/reducer.js
@@ -248,6 +248,9 @@ export const payInvoice = ({
             paymentHash: route.paymentHash ? Buffer.from(route.paymentHash, 'hex') : null,
             route: routeToUse,
           })
+          if (result.failure) {
+            throw new Error(result.failure.code)
+          }
         } catch (error) {
           if (error.message === 'unknown service routerrpc.Router') {
             // We don't know for sure that the node has been compiled with the Router service.
@@ -259,11 +262,6 @@ export const payInvoice = ({
             throw error
           }
         }
-        if (result.failure) {
-          const error = new Error(result.failure.code)
-          error.details = data
-          throw error
-        }
       }
 
       // Otherwise, just use sendPayment.
@@ -274,7 +272,11 @@ export const payInvoice = ({
 
     // For older versions use the legacy Lightning.sendPayment method.
     else {
-      data = await routerSendPayment(payload)
+      if (payload.feeLimitSat) {
+        payload.feeLimit = { fixed: payload.feeLimitSat }
+        delete payload.feeLimitSat
+      }
+      await grpc.services.Lightning.sendPayment(payload)
     }
 
     dispatch(paymentSuccessful(data))

diff --git a/renderer/reducers/payment/utils.js b/renderer/reducers/payment/utils.js
@@ -105,7 +105,7 @@ export const prepareKeysendPayload = (pubkey, amt, feeLimit) => {
   return {
     ...getPaymentConfig(),
     dest: Buffer.from(pubkey, 'hex'),
-    feeLimit: feeLimit ? { fixed: feeLimit } : null,
+    feeLimitSat: feeLimit,
     paymentHash: sha256digest(preimage),
     amt,
     finalCltvDelta: DEFAULT_CLTV_DELTA,
@@ -130,7 +130,7 @@ export const prepareBolt11Payload = (payReq, amt, feeLimit) => {
   return {
     ...getPaymentConfig(),
     paymentRequest: invoice.paymentRequest,
-    feeLimit: feeLimit ? { fixed: feeLimit } : null,
+    feeLimitSat: feeLimit,
     amt: millisatoshis ? null : amt,
   }
 }
@@ -149,7 +149,7 @@ export const prepareKeysendProbe = (pubkey, amt, feeLimit) => {
   return {
     ...getPaymentConfig(),
     dest: Buffer.from(pubkey, 'hex'),
-    feeLimit: feeLimit ? { fixed: feeLimit } : null,
+    feeLimitSat: feeLimit,
     amt,
     finalCltvDelta: DEFAULT_CLTV_DELTA,
     paymentHash: sha256digest(preimage),
@@ -173,7 +173,7 @@ export const prepareBolt11Probe = (payReq, feeLimit) => {
   return {
     ...getPaymentConfig(),
     dest: Buffer.from(pubkey, 'hex'),
-    feeLimit: feeLimit ? { fixed: feeLimit } : null,
+    feeLimitSat: feeLimit,
     amtMsat: millisatoshis,
     finalCltvDelta: getTag(invoice, 'min_final_cltv_expiry') || DEFAULT_CLTV_DELTA,
   }

diff --git a/services/grpc/router.methods.js b/services/grpc/router.methods.js
@@ -22,7 +22,7 @@ const defaultProbeOptions = {
 
 const defaultPaymentOptions = {
   timeoutSeconds: PAYMENT_TIMEOUT,
-  feeLimit: PAYMENT_FEE_LIMIT,
+  feeLimitSat: PAYMENT_FEE_LIMIT,
   allowSelfPayment: true,
 }