Add btc wallet chain height to footer info

bisq-network · Nov 5, 2020 · 9bfdea1 · 9bfdea1
1 parent 0c4ba90
commit 9bfdea1
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java
@@ -22,8 +22,8 @@
 import bisq.core.btc.setup.WalletsSetup;
 import bisq.core.btc.wallet.WalletsManager;
 import bisq.core.locale.Res;
-import bisq.core.provider.fee.FeeService;
 import bisq.core.offer.OpenOfferManager;
+import bisq.core.provider.fee.FeeService;
 import bisq.core.trade.TradeManager;
 import bisq.core.user.Preferences;
 import bisq.core.util.FormattingUtils;
@@ -111,26 +111,30 @@ void init(@Nullable Consumer<String> chainFileLockedExceptionHandler,
 
         ObjectProperty<Throwable> walletServiceException = new SimpleObjectProperty<>();
         btcInfoBinding = EasyBind.combine(walletsSetup.downloadPercentageProperty(),
+                walletsSetup.chainHeightProperty(),
                 feeService.feeUpdateCounterProperty(),
                 walletServiceException,
-                (downloadPercentage, feeUpdate, exception) -> {
+                (downloadPercentage, chainHeight, feeUpdate, exception) -> {
                     String result;
                     if (exception == null) {
                         double percentage = (double) downloadPercentage;
                         long fees = feeService.getTxFeePerByte().longValue();
                         btcSyncProgress.set(percentage);
+                        int bestChainHeight = walletsSetup.getChain() != null ? walletsSetup.getChain().getBestChainHeight() : 0;
+                        String chainHeightAsString = bestChainHeight > 0 ? " (" + bestChainHeight + ")" : "";
                         if (percentage == 1) {
                             String feeRate = Res.get("mainView.footer.btcFeeRate", fees);
                             result = Res.get("mainView.footer.btcInfo",
                                     Res.get("mainView.footer.btcInfo.synchronizedWith"),
-                                    getBtcNetworkAsString() + " / " + feeRate);
+                                    getBtcNetworkAsString() + chainHeightAsString + " / " + feeRate);
                             getBtcSplashSyncIconId().set("image-connection-synced");
 
                             downloadCompleteHandler.run();
                         } else if (percentage > 0.0) {
                             result = Res.get("mainView.footer.btcInfo",
                                     Res.get("mainView.footer.btcInfo.synchronizingWith"),
-                                    getBtcNetworkAsString() + ": " + FormattingUtils.formatToPercentWithSymbol(percentage));
+                                    getBtcNetworkAsString() + ": " + FormattingUtils.formatToPercentWithSymbol(percentage)) +
+                                    chainHeightAsString;
                         } else {
                             result = Res.get("mainView.footer.btcInfo",
                                     Res.get("mainView.footer.btcInfo.connectingTo"),
@@ -259,6 +263,7 @@ void setRejectedTxErrorMessageHandler(Consumer<String> rejectedTxErrorMessageHan
             }
         });
     }
+
     private String getBtcNetworkAsString() {
         String postFix;
         if (config.ignoreLocalBtcNode)