Add fee config

hsjoberg · Apr 19, 2021 · 920b45e · 920b45e
1 parent 4686c99
commit 920b45e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/config/default.json_TEMPLATE b/config/default.json_TEMPLATE
@@ -5,6 +5,10 @@
   "htlcWaitMs": 50,
   "minimumPaymentMultiplier": 5,
   "maximumPaymentSat": 1000000,
+  "fee": {
+    "maxSat": 40000,
+    "maxSatPerVByte": 200,
+  },
   "backend": "lnd",
   "backendConfig": {
     "lndNode": "127.0.0.1:9735",

diff --git a/config/test.json b/config/test.json
@@ -3,6 +3,11 @@
   "serverHost": "127.0.0.1:8089",
   "backend": "lnd",
   "htlcWaitMs": 10,
+  "fee": {
+    "maxSat": 40000,
+    "maxSatPerVByte": 200,
+    "subsidyFactor": 1
+  },
   "minimumPaymentMultiplier": 5,
   "maximumPaymentSat": 1000000,
   "backendConfig": {

diff --git a/src/services/ondemand-channel/api/register.ts b/src/services/ondemand-channel/api/register.ts
@@ -109,6 +109,7 @@ export default function Register(
       estimateFeeResponse = await estimateFee(lightning, Long.fromValue(maximumPaymentSat), 1);
     } catch (e) {
       // If we don't have enough funds we'll get here
+      reply.code(503);
       const error: IErrorResponse = {
         status: "ERROR",
         reason: "Dunder is temporarily offline.",

diff --git a/src/services/ondemand-channel/api/utils.ts b/src/services/ondemand-channel/api/utils.ts
@@ -3,7 +3,9 @@ import config from "config";
 import { MIN_CHANNEL_SIZE_SAT } from "../../../utils/constants";
 
 export function checkFeeTooHigh(feerateSatPerByte: Long, feeSat: Long) {
-  return feerateSatPerByte.greaterThan(200) || feeSat.greaterThan(40000);
+  const maxSat = config.get<number>("fee.maxSat");
+  const maxSatPerVByte = config.get<number>("fee.maxSatPerVByte");
+  return feerateSatPerByte.greaterThan(maxSatPerVByte) || feeSat.greaterThan(maxSat);
 }
 
 export function getMinimumPaymentSat(feeEstimateSat: Long) {

diff --git a/src/utils/common.ts b/src/utils/common.ts
@@ -81,6 +81,9 @@ export function assertEnvironment() {
   config.get("htlcWaitMs");
   config.get("minimumPaymentMultiplier");
   config.get("maximumPaymentSat");
+  config.get("fee");
+  config.get("fee.maxSat");
+  config.get("fee.maxSatPerVByte");
   config.get("backend");
   config.get("backendConfig.lndNode");
   config.get("backendConfig.grpcServer");