spend utxo improvements

drongo

@@ -1 +1 @@
-Subproject commit e8bb733ea8a6e476982e5ea78c288105d0bd8644
+Subproject commit 0fbce035a3083f1cd5dc9f168b0cd4365a75ce40

src/main/java/com/sparrowwallet/sparrow/control/CoinLabel.java

@@ -58,7 +58,7 @@ public class CoinLabel extends CopyableLabel {
         setTooltip(tooltip);
         setContextMenu(contextMenu);
 
-        String satsValue = String.format(Locale.ENGLISH, "%,d",value) + " sats";
+        String satsValue = String.format(Locale.ENGLISH, "%,d", value) + " sats";
         String btcValue = BTC_FORMAT.format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
 
         BitcoinUnit unit = bitcoinUnit;

src/main/java/com/sparrowwallet/sparrow/control/DateCell.java

@@ -34,7 +34,7 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
             if(entry instanceof UtxoEntry) {
                 UtxoEntry utxoEntry = (UtxoEntry)entry;
                 if(utxoEntry.getHashIndex().getHeight() <= 0) {
-                    setText("Unconfirmed");
+                    setText("Unconfirmed " + (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)"));
                 } else {
                     String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                     setText(date);

src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java

@@ -225,9 +225,11 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
     public static void applyRowStyles(TreeTableCell<?, ?> cell, Entry entry) {
         cell.getStyleClass().remove("transaction-row");
         cell.getStyleClass().remove("node-row");
+        cell.getStyleClass().remove("utxo-row");
         cell.getStyleClass().remove("address-cell");
         cell.getStyleClass().remove("hashindex-row");
         cell.getStyleClass().remove("spent");
+        cell.getStyleClass().remove("unspendable");
 
         if(entry != null) {
             if(entry instanceof TransactionEntry) {
@@ -245,6 +247,10 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 cell.getStyleClass().add("node-row");
             } else if(entry instanceof UtxoEntry) {
                 cell.getStyleClass().add("utxo-row");
+                UtxoEntry utxoEntry = (UtxoEntry)entry;
+                if(!utxoEntry.isSpendable()) {
+                    cell.getStyleClass().add("unspendable");
+                }
             } else if(entry instanceof HashIndexEntry) {
                 cell.getStyleClass().add("hashindex-row");
                 HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;

src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java

@@ -1,19 +1,24 @@
 package com.sparrowwallet.sparrow.wallet;
 
 import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.control.CoinLabel;
 import com.sparrowwallet.sparrow.control.UtxosChart;
 import com.sparrowwallet.sparrow.control.UtxosTreeTable;
-import com.sparrowwallet.sparrow.event.BitcoinUnitChangedEvent;
+import com.sparrowwallet.sparrow.event.*;
-import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent;
+import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
+import javafx.application.Platform;
-import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
 import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
 
 import java.net.URL;
 import java.util.List;
+import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
@@ -22,6 +27,9 @@ public class UtxosController extends WalletFormController implements Initializab
     @FXML
     private UtxosTreeTable utxosTable;
 
+    @FXML
+    private Button sendSelected;
+
     @FXML
     private UtxosChart utxosChart;
 
@@ -34,13 +42,53 @@ public class UtxosController extends WalletFormController implements Initializab
     public void initializeView() {
         utxosTable.initialize(getWalletForm().getWalletUtxosEntry());
         utxosChart.initialize(getWalletForm().getWalletUtxosEntry());
+        sendSelected.setDisable(true);
 
         utxosTable.getSelectionModel().getSelectedIndices().addListener((ListChangeListener<Integer>) c -> {
             List<Entry> selectedEntries = utxosTable.getSelectionModel().getSelectedCells().stream().map(tp -> tp.getTreeItem().getValue()).collect(Collectors.toList());
             utxosChart.select(selectedEntries);
+            updateSendSelected(Config.get().getBitcoinUnit());
         });
     }
 
+    private void updateSendSelected(BitcoinUnit unit) {
+        List<Entry> selectedEntries = utxosTable.getSelectionModel().getSelectedCells().stream().map(tp -> tp.getTreeItem().getValue())
+                .filter(entry -> ((HashIndexEntry)entry).isSpendable())
+                .collect(Collectors.toList());
+
+        sendSelected.setDisable(selectedEntries.isEmpty());
+        long selectedTotal = selectedEntries.stream().mapToLong(Entry::getValue).sum();
+        if(selectedTotal > 0) {
+            if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
+                unit = (selectedTotal >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS);
+            }
+
+            if(unit.equals(BitcoinUnit.BTC)) {
+                sendSelected.setText("Send Selected (" + CoinLabel.getBTCFormat().format((double)selectedTotal / Transaction.SATOSHIS_PER_BITCOIN) + " BTC)");
+            } else {
+                sendSelected.setText("Send Selected (" + String.format(Locale.ENGLISH, "%,d", selectedTotal) + " sats)");
+            }
+        } else {
+            sendSelected.setText("Send Selected");
+        }
+    }
+
+    public void sendSelected(ActionEvent event) {
+        List<HashIndexEntry> utxoEntries = utxosTable.getSelectionModel().getSelectedCells().stream()
+                .map(tp -> tp.getTreeItem().getValue())
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.isSpendable())
+                .collect(Collectors.toList());
+
+        EventManager.get().post(new SendActionEvent(utxoEntries));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(utxoEntries)));
+    }
+
+    public void clear(ActionEvent event) {
+        utxosTable.getSelectionModel().clearSelection();
+    }
+
     @Subscribe
     public void walletNodesChanged(WalletNodesChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {
@@ -75,5 +123,6 @@ public class UtxosController extends WalletFormController implements Initializab
     public void bitcoinUnitChanged(BitcoinUnitChangedEvent event) {
         utxosTable.setBitcoinUnit(getWalletForm().getWallet(), event.getBitcoinUnit());
         utxosChart.setBitcoinUnit(getWalletForm().getWallet(), event.getBitcoinUnit());
+        updateSendSelected(event.getBitcoinUnit());
     }
 }

src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css

@@ -4,6 +4,10 @@
     -fx-padding: 10 0 10 0;
 }
 
+.utxos-buttons-box {
+    -fx-padding: 15 0 0 0;
+}
+
 .chart-bar {
     -fx-bar-fill: rgba(105, 108, 119, 0.6);
 }

src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.fxml

@@ -12,36 +12,51 @@
 <?import javafx.scene.chart.CategoryAxis?>
 <?import javafx.scene.chart.NumberAxis?>
 <?import com.sparrowwallet.sparrow.control.UtxosChart?>
+<?import org.controlsfx.glyphfont.Glyph?>
 
-<GridPane hgap="10.0" vgap="10.0" stylesheets="@utxos.css, @wallet.css, @../general.css" styleClass="wallet-pane" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.wallet.UtxosController">
+<BorderPane stylesheets="@utxos.css, @wallet.css, @../general.css" styleClass="wallet-pane" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.wallet.UtxosController">
     <padding>
         <Insets left="25.0" right="25.0" top="15.0" bottom="25.0" />
     </padding>
-    <columnConstraints>
+    <center>
-        <ColumnConstraints percentWidth="100.0" />
+        <GridPane hgap="10.0" vgap="10.0">
-    </columnConstraints>
+            <columnConstraints>
-    <rowConstraints>
+                <ColumnConstraints percentWidth="100.0" />
-        <RowConstraints percentHeight="50" />
+            </columnConstraints>
-        <RowConstraints percentHeight="50" />
+            <rowConstraints>
-    </rowConstraints>
+                <RowConstraints percentHeight="60" />
-    <BorderPane GridPane.columnIndex="0" GridPane.rowIndex="0">
+                <RowConstraints percentHeight="40" />
-        <top>
+            </rowConstraints>
-            <Label styleClass="utxos-treetable-label" text="Unspent Transaction Outputs"/>
+            <BorderPane GridPane.columnIndex="0" GridPane.rowIndex="0">
-        </top>
+                <top>
-        <center>
+                    <Label styleClass="utxos-treetable-label" text="Unspent Transaction Outputs"/>
-            <UtxosTreeTable fx:id="utxosTable" />
+                </top>
-        </center>
+                <center>
-    </BorderPane>
+                    <UtxosTreeTable fx:id="utxosTable" />
-    <BorderPane GridPane.columnIndex="0" GridPane.rowIndex="1">
+                </center>
-        <center>
+                <bottom>
-            <UtxosChart fx:id="utxosChart" legendVisible="false" verticalGridLinesVisible="false" animated="false">
+                    <HBox styleClass="utxos-buttons-box" spacing="20" alignment="BOTTOM_RIGHT">
-                <xAxis>
+                        <Button text="Clear" onAction="#clear"/>
-                    <CategoryAxis side="BOTTOM" animated="false" />
+                        <Button fx:id="sendSelected" text="Send Selected" graphicTextGap="5" onAction="#sendSelected">
-                </xAxis>
+                            <graphic>
-                <yAxis>
+                                <Glyph fontFamily="FontAwesome" icon="SEND" fontSize="12" />
-                    <NumberAxis side="LEFT" />
+                            </graphic>
-                </yAxis>
+                        </Button>
-            </UtxosChart>
+                    </HBox>
-        </center>
+                </bottom>
-    </BorderPane>
+            </BorderPane>
-</GridPane>
+            <BorderPane GridPane.columnIndex="0" GridPane.rowIndex="1">
+                <center>
+                    <UtxosChart fx:id="utxosChart" legendVisible="false" verticalGridLinesVisible="false" animated="false">
+                        <xAxis>
+                            <CategoryAxis side="BOTTOM" animated="false" />
+                        </xAxis>
+                        <yAxis>
+                            <NumberAxis side="LEFT" />
+                        </yAxis>
+                    </UtxosChart>
+                </center>
+            </BorderPane>
+        </GridPane>
+    </center>
+</BorderPane>

src/main/resources/com/sparrowwallet/sparrow/wallet/wallet.css

@@ -45,6 +45,18 @@
     -fx-text-fill: #696c77;
 }
 
+.utxo-row.unspendable {
+    -fx-text-fill: #a0a1a7;
+}
+
+.tree-table-row-cell:selected .utxo-row.unspendable {
+    -fx-text-fill: #696c77;
+}
+
+.tree-table-view:focused:row-selection .tree-table-row-cell:selected .utxo-row.unspendable {
+    -fx-text-fill: derive(white, -15%);
+}
+
 .tree-table-row-cell:selected .hashindex-row, .tree-table-row-cell:selected .transaction-row {
     -fx-text-fill: white;
 }