From 99a74dd4d7a0f18ffe91ee9013943eee9290803c Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Fri, 29 Apr 2022 11:25:56 -0500
Subject: [PATCH] Refresh current fee receiver list whenever a fee tx is
 validated.

---
 .../java/bisq/core/provider/mempool/MempoolService.java   | 8 +++-----
 .../main/java/bisq/core/provider/mempool/TxValidator.java | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/bisq/core/provider/mempool/MempoolService.java b/core/src/main/java/bisq/core/provider/mempool/MempoolService.java
index 6f62d31b53..02e079eba5 100644
--- a/core/src/main/java/bisq/core/provider/mempool/MempoolService.java
+++ b/core/src/main/java/bisq/core/provider/mempool/MempoolService.java
@@ -59,7 +59,6 @@ public class MempoolService {
     private final FilterManager filterManager;
     private final DaoFacade daoFacade;
     private final DaoStateService daoStateService;
-    private final List<String> btcFeeReceivers = new ArrayList<>();
     @Getter
     private int outstandingRequests = 0;
 
@@ -79,7 +78,6 @@ public class MempoolService {
     }
 
     public void onAllServicesInitialized() {
-        btcFeeReceivers.addAll(getAllBtcFeeReceivers());
     }
 
     public boolean canRequestBeMade() {
@@ -158,7 +156,7 @@ public class MempoolService {
             public void onSuccess(@Nullable String jsonTxt) {
                 UserThread.execute(() -> {
                     outstandingRequests--;
-                    resultHandler.accept(txValidator.parseJsonValidateMakerFeeTx(jsonTxt, btcFeeReceivers));
+                    resultHandler.accept(txValidator.parseJsonValidateMakerFeeTx(jsonTxt, getAllBtcFeeReceivers()));
                 });
             }
 
@@ -188,7 +186,7 @@ public class MempoolService {
             public void onSuccess(@Nullable String jsonTxt) {
                 UserThread.execute(() -> {
                     outstandingRequests--;
-                    resultHandler.accept(txValidator.parseJsonValidateTakerFeeTx(jsonTxt, btcFeeReceivers));
+                    resultHandler.accept(txValidator.parseJsonValidateTakerFeeTx(jsonTxt, getAllBtcFeeReceivers()));
                 });
             }
 
@@ -252,7 +250,7 @@ public class MempoolService {
             }
         });
         btcFeeReceivers.addAll(daoFacade.getAllDonationAddresses());
-        log.info("Known BTC fee receivers: {}", btcFeeReceivers.toString());
+        log.debug("Known BTC fee receivers: {}", btcFeeReceivers.toString());
 
         return btcFeeReceivers;
     }
diff --git a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java b/core/src/main/java/bisq/core/provider/mempool/TxValidator.java
index 6e60cd813d..9d899834a8 100644
--- a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java
+++ b/core/src/main/java/bisq/core/provider/mempool/TxValidator.java
@@ -180,6 +180,7 @@ public class TxValidator {
                 String error = "fee address: " + jsonFeeAddress.getAsString() + " was not a known BTC fee receiver";
                 errorList.add(error);
                 log.info(error);
+                log.info("Known BTC fee receivers: {}", btcFeeReceivers.toString());
             }
         } catch (JsonSyntaxException e) {
             errorList.add(e.toString());