From d4a1441d650933541de22ae23da476033c8124c2 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 15 May 2025 12:42:53 +0200 Subject: [PATCH] more recent blocks tweaks --- .../sparrow/{event => control}/BlockCube.java | 9 +++++---- .../sparrow/{event => control}/RecentBlocksView.java | 2 +- .../sparrow/net/BatchedElectrumServerRpc.java | 4 ++-- .../resources/com/sparrowwallet/sparrow/wallet/send.fxml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) rename src/main/java/com/sparrowwallet/sparrow/{event => control}/BlockCube.java (97%) rename src/main/java/com/sparrowwallet/sparrow/{event => control}/RecentBlocksView.java (99%) diff --git a/src/main/java/com/sparrowwallet/sparrow/event/BlockCube.java b/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java similarity index 97% rename from src/main/java/com/sparrowwallet/sparrow/event/BlockCube.java rename to src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java index b583e402..2cc3a2aa 100644 --- a/src/main/java/com/sparrowwallet/sparrow/event/BlockCube.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java @@ -1,4 +1,4 @@ -package com.sparrowwallet.sparrow.event; +package com.sparrowwallet.sparrow.control; import com.sparrowwallet.drongo.Network; import com.sparrowwallet.drongo.protocol.Transaction; @@ -26,7 +26,7 @@ public class BlockCube extends Group { public static final double CUBE_SIZE = 60; private final IntegerProperty weightProperty = new SimpleIntegerProperty(0); - private final DoubleProperty medianFeeProperty = new SimpleDoubleProperty(0); + private final DoubleProperty medianFeeProperty = new SimpleDoubleProperty(-1.0d); private final IntegerProperty heightProperty = new SimpleIntegerProperty(0); private final IntegerProperty txCountProperty = new SimpleIntegerProperty(0); private final LongProperty timestampProperty = new SimpleLongProperty(System.currentTimeMillis()); @@ -56,7 +56,8 @@ public class BlockCube extends Group { this.medianFeeProperty.addListener((_, _, newValue) -> { medianFeeText.setText("~" + Math.round(Math.max(newValue.doubleValue(), 1.0d))); unitsText.setText(" s/vb"); - medianFeeTextFlow.setTranslateX((CUBE_SIZE - (medianFeeText.getLayoutBounds().getWidth() + unitsText.getLayoutBounds().getWidth())) / 2); + double unitsWidth = TextUtils.computeTextWidth(unitsText.getFont(), unitsText.getText(), 0.0d); + medianFeeTextFlow.setTranslateX((CUBE_SIZE - (medianFeeText.getLayoutBounds().getWidth() + unitsWidth)) / 2); }); this.txCountProperty.addListener((_, _, newValue) -> { txCountText.setText(newValue.intValue() == 0 ? "" : newValue + " txes"); @@ -324,7 +325,7 @@ public class BlockCube extends Group { } public static BlockCube fromBlockSummary(BlockSummary blockSummary) { - return new BlockCube(blockSummary.getWeight().orElse(0), blockSummary.getMedianFee().orElse(0.0d), blockSummary.getHeight(), + return new BlockCube(blockSummary.getWeight().orElse(0), blockSummary.getMedianFee().orElse(1.0d), blockSummary.getHeight(), blockSummary.getTransactionCount().orElse(0), blockSummary.getTimestamp().getTime(), true); } } \ No newline at end of file diff --git a/src/main/java/com/sparrowwallet/sparrow/event/RecentBlocksView.java b/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java similarity index 99% rename from src/main/java/com/sparrowwallet/sparrow/event/RecentBlocksView.java rename to src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java index c2c26dd4..250025f0 100644 --- a/src/main/java/com/sparrowwallet/sparrow/event/RecentBlocksView.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java @@ -1,4 +1,4 @@ -package com.sparrowwallet.sparrow.event; +package com.sparrowwallet.sparrow.control; import com.sparrowwallet.sparrow.BlockSummary; import io.reactivex.Observable; diff --git a/src/main/java/com/sparrowwallet/sparrow/net/BatchedElectrumServerRpc.java b/src/main/java/com/sparrowwallet/sparrow/net/BatchedElectrumServerRpc.java index 63e92a3d..8f98911a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/net/BatchedElectrumServerRpc.java +++ b/src/main/java/com/sparrowwallet/sparrow/net/BatchedElectrumServerRpc.java @@ -161,12 +161,12 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc { try { return batchRequest.execute(); } catch(JsonRpcBatchException e) { - log.warn("Failed to unsubscribe from script hashes: " + e.getErrors().keySet(), e); + log.info("Failed to unsubscribe from script hashes: " + e.getErrors().keySet(), e); Map unsubscribedScriptHashes = scriptHashes.stream().collect(Collectors.toMap(s -> s, _ -> true)); unsubscribedScriptHashes.keySet().removeIf(scriptHash -> e.getErrors().containsKey(scriptHash)); return unsubscribedScriptHashes; } catch(Exception e) { - log.warn("Failed to unsubscribe from script hashes: " + scriptHashes, e); + log.info("Failed to unsubscribe from script hashes: " + scriptHashes, e); return Collections.emptyMap(); } } diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml index cf9bf633..df592be1 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.fxml @@ -26,7 +26,7 @@ - +