Merge pull request #37 from LN-Zap/estimatemode

Ability to set bitcoind fee estimation mode

README.md

@@ -102,6 +102,7 @@ Here are the available configuration options:
 | `bitcoind.username` | The username to use for authenticating with the bitcoind instance | - | `BITCOIND_USERNAME` |
 | `bitcoind.password` | The password to use for authenticating with the bitcoind instance | - | `BITCOIND_PASSWORD` |
 | `bitcoind.confTargets` | The block targets to use for history-based fee estimates | `[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 144, 504, 1008]` | `BITCOIND_CONF_TARGETS` |
+| `bitcoind.estimateMode` | The estimate mode to use for fee estimates (`ECONOMICAL` or `CONSERVATIVE`) | `ECONOMICAL` | `BITCOIND_ESTIMATE_MODE` |
 
 ## Development
 

config/custom-environment-variables.json

@@ -22,7 +22,8 @@
         "baseUrl": "BITCOIND_BASE_URL",
         "username": "BITCOIND_USERNAME",
         "password": "BITCOIND_PASSWORD",
-        "confTargets": "BITCOIND_CONF_TARGETS"
+        "confTargets": "BITCOIND_CONF_TARGETS",
+        "estimateMode": "BITCOIND_ESTIMATE_MODE"
     },
     "cache": {
         "stdTTL": "CACHE_STD_TTL",

config/default.json

@@ -22,7 +22,8 @@
         "baseUrl": null,
         "username": null,
         "password": null,
-        "confTargets": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 144, 504, 1008]
+        "confTargets": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 144, 504, 1008],
+        "estimateMode": "ECONOMICAL"
     },
     "cache": {
         "stdTTL": 15,

src/custom.d.ts

@@ -46,3 +46,6 @@ interface EstimateSmartFeeResponse {
   errors?: [string], // errors encountered during processing (if there are any)
   blocks?: number // block number where estimate was found
 };
+
+// EstimateMode represents the mode for fee estimation.
+type EstimateMode = 'ECONOMICAL' | 'CONSERVATIVE'; // estimate mode can be either 'ECONOMICAL' or 'CONSERVATIVE'

src/server.tsx

@@ -24,6 +24,7 @@ const BITCOIND_BASE_URL = config.get<string>('bitcoind.baseUrl');
 const BITCOIND_USERNAME = config.get<string>('bitcoind.username');
 const BITCOIND_PASSWORD = config.get<number>('bitcoind.password');
 const BITCOIND_CONF_TARGETS = config.get<number[]>('bitcoind.confTargets');
+const BITCOIND_ESTIMATE_MODE = config.get<EstimateMode>('bitcoind.estimateMode');
 
 const LOGLEVEL = config.get<string>('settings.loglevel');
 const TIMEOUT = config.get<number>('settings.timeout');
@@ -252,7 +253,7 @@ async function fetchBitcoindData() : Promise<FeeByBlockTarget | null> {
 
     function batchCall() {
       targets.forEach(function (target) {
-        rpc.estimatesmartfee(target);
+        rpc.estimatesmartfee(target, BITCOIND_ESTIMATE_MODE);
       });
     }