add mempool fees to the getAllMarketPrices endpoint

bisq-network · Jun 7, 2021 · e901e39 · e901e39
1 parent 806253b
commit e901e39
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java
@@ -121,9 +121,11 @@ public class Config {
     public static final String API_PORT = "apiPort";
     public static final String PREVENT_PERIODIC_SHUTDOWN_AT_SEED_NODE = "preventPeriodicShutdownAtSeedNode";
     public static final String REPUBLISH_MAILBOX_ENTRIES = "republishMailboxEntries";
+    public static final String LEGACY_FEE_DATAMAP = "dataMap";
     public static final String BTC_TX_FEE = "btcTxFee";
     public static final String BTC_MIN_TX_FEE = "btcMinTxFee";
     public static final String BTC_FEES_TS = "bitcoinFeesTs";
+    public static final String BTC_FEE_INFO = "bitcoinFeeInfo";
     public static final String BYPASS_MEMPOOL_VALIDATION = "bypassMempoolValidation";
 
     // Default values for certain options

diff --git a/pricenode/src/main/java/bisq/price/mining/FeeRateService.java b/pricenode/src/main/java/bisq/price/mining/FeeRateService.java
@@ -36,7 +36,7 @@
  * High-level mining {@link FeeRate} operations.
  */
 @Service
-class FeeRateService {
+public class FeeRateService {
 
     private final List<FeeRateProvider> providers;
     protected final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -101,7 +101,7 @@ public Map<String, Object> getFees() {
         // Build response
         return new HashMap<>() {{
             putAll(metadata);
-            put("dataMap", allFeeRates);
+            put(Config.LEGACY_FEE_DATAMAP, allFeeRates);
         }};
     }
 }
diff --git a/pricenode/src/main/java/bisq/price/spot/ExchangeRateController.java b/pricenode/src/main/java/bisq/price/spot/ExchangeRateController.java
@@ -18,6 +18,9 @@
 package bisq.price.spot;
 
 import bisq.price.PriceController;
+import bisq.price.mining.FeeRateService;
+
+import bisq.common.config.Config;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,13 +31,28 @@
 class ExchangeRateController extends PriceController {
 
     private final ExchangeRateService exchangeRateService;
+    private final FeeRateService feeRateService;
 
-    public ExchangeRateController(ExchangeRateService exchangeRateService) {
+    public ExchangeRateController(ExchangeRateService exchangeRateService, FeeRateService feeRateService) {
         this.exchangeRateService = exchangeRateService;
+        this.feeRateService = feeRateService;
     }
 
     @GetMapping(path = "/getAllMarketPrices")
     public Map<String, Object> getAllMarketPrices() {
-        return exchangeRateService.getAllMarketPrices();
+        Map<String, Object> retVal = exchangeRateService.getAllMarketPrices();
+
+        // add the fee info to results
+        feeRateService.getFees().forEach((key, value) -> {
+            retVal.put(translateFieldName(key), value);
+        });
+
+        return retVal;
+    }
+
+    static String translateFieldName(String name) {
+        if (name.equals(Config.LEGACY_FEE_DATAMAP))
+            name = Config.BTC_FEE_INFO;                 // name changed for clarity
+        return name;
     }
 }
diff --git a/pricenode/src/test/java/bisq/price/mining/FeeRateServiceTest.java b/pricenode/src/test/java/bisq/price/mining/FeeRateServiceTest.java
@@ -103,7 +103,7 @@ private void doSanityChecksForRetrievedData(Map<String, Object> retrievedData, l
         // providers), we always expect a non-zero timestamp
         assertNotEquals(0L, retrievedData.get(Config.BTC_FEES_TS));
 
-        Map<String, String> retrievedDataMap = (Map<String, String>) retrievedData.get("dataMap");
+        Map<String, String> retrievedDataMap = (Map<String, String>) retrievedData.get(Config.LEGACY_FEE_DATAMAP);
         assertEquals(2, retrievedDataMap.size());
         assertEquals(expectedFeeRate, retrievedDataMap.get(Config.BTC_TX_FEE));
     }