sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use whirlpool premix priority slider to change mixfeetarget, display warning if chosen fee rate is much lower than normal priority

Browse source
This commit is contained in:
Craig Raw 2023-03-21 09:34:19 +02:00
parent 3bc7c7473a
commit 98b33e184e
4 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/terminal/wallet/MixPoolDialog.java
View file

@ -197,6 +197,7 @@ public class MixPoolDialog extends WalletDialog {
tx0Previews = null;
whirlpool.setScode(mixConfig.getScode());
whirlpool.setTx0FeeTarget(tx0FeeTarget);
whirlpool.setMixFeeTarget(tx0FeeTarget);
Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, utxoEntries);
tx0PreviewsService.setOnRunning(workerStateEvent -> {

13
src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java
View file

@ -55,6 +55,9 @@ public class WhirlpoolController {
@FXML
private CopyableLabel premixFeeRate;
@FXML
private Label lowPremixFeeRate;
@FXML
private ComboBox<Pool> pool;
@ -139,9 +142,12 @@ public class WhirlpoolController {
tx0Previews = null;
tx0PreviewProperty.set(null);
Tx0FeeTarget tx0FeeTarget = FEE_TARGETS.get(newValue.intValue());
premixFeeRate.setText(SparrowMinerFeeSupplier.getFee(Integer.parseInt(tx0FeeTarget.getFeeTarget().getValue())) + " sats/vB");
premixFeeRate.setText(getFeeRate(tx0FeeTarget) + " sats/vB");
lowPremixFeeRate.setVisible(tx0FeeTarget == Tx0FeeTarget.MIN && getFeeRate(tx0FeeTarget) * 2 < getFeeRate(Tx0FeeTarget.BLOCKS_4));
});
premixPriority.setValue(1);
lowPremixFeeRate.managedProperty().bind(lowPremixFeeRate.visibleProperty());
lowPremixFeeRate.setVisible(false);
if(mixConfig.getScode() != null) {
step1.setVisible(false);
@ -218,6 +224,10 @@ public class WhirlpoolController {
});
}
private int getFeeRate(Tx0FeeTarget tx0FeeTarget) {
return SparrowMinerFeeSupplier.getFee(Integer.parseInt(tx0FeeTarget.getFeeTarget().getValue()));
}
public boolean next() {
if(step1.isVisible()) {
step1.setVisible(false);
@ -318,6 +328,7 @@ public class WhirlpoolController {
tx0Previews = null;
whirlpool.setScode(mixConfig.getScode());
whirlpool.setTx0FeeTarget(FEE_TARGETS.get(premixPriority.valueProperty().intValue()));
whirlpool.setMixFeeTarget(FEE_TARGETS.get(premixPriority.valueProperty().intValue()));
Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, utxoEntries);
tx0PreviewsService.setOnRunning(workerStateEvent -> {

6
src/main/resources/com/sparrowwallet/sparrow/whirlpool/whirlpool.css
View file

@ -43,4 +43,8 @@
.field-control {
-fx-pref-width: 180px;
}
}
.low-fee-warning {
-fx-text-fill: rgb(238, 210, 2);
}

11
src/main/resources/com/sparrowwallet/sparrow/whirlpool/whirlpool.fxml
View file

@ -107,6 +107,17 @@
</padding>
<Label text="Premix Fee Rate:" styleClass="field-label" />
<CopyableLabel fx:id="premixFeeRate" />
<Label fx:id="lowPremixFeeRate">
<graphic>
<Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="EXCLAMATION_TRIANGLE" styleClass="low-fee-warning"/>
</graphic>
<padding>
<Insets left="12" />
</padding>
<tooltip>
<Tooltip text="A low fee rate may delay the first mix."/>
</tooltip>
</Label>
</HBox>
</VBox>
<VBox fx:id="step4" spacing="15">