tx creation support

drongo

@@ -1 +1 @@
-Subproject commit 3ee7cd11eb31da06d79132f0023e6da7e534906d
+Subproject commit ccf7de9f625c4cc73efc6948b3e699a7786da276

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

@@ -4,12 +4,13 @@ import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.*;
 
-import java.util.Collection;
+import java.util.Map;
 
 public class TransactionDiagram extends GridPane {
     public TransactionDiagram() {
@@ -23,25 +24,34 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
-    public void update(Wallet wallet, Collection<BlockTransactionHashIndex> inputs, Address toAddress, WalletNode changeNode, long fee) {
-        Pane inputsPane = getInputsLabels(inputs);
+    public void update(WalletTransaction walletTx) {
+        if(walletTx == null) {
+            getChildren().clear();
+        } else {
+            update(walletTx.getWallet(), walletTx.getSelectedUtxos(), walletTx.getRecipientAddress(), walletTx.getChangeNode(), walletTx.getFee());
+        }
+    }
+
+    public void update(Wallet wallet, Map<BlockTransactionHashIndex, WalletNode> selectedUtxos, Address toAddress, WalletNode changeNode, long fee) {
+        Pane inputsPane = getInputsLabels(selectedUtxos);
         GridPane.setConstraints(inputsPane, 0, 0);
 
         Pane txPane = getTransactionPane();
-        GridPane.setConstraints(inputsPane, 2, 0);
+        GridPane.setConstraints(txPane, 2, 0);
 
         Pane outputsPane = getOutputsLabels(wallet, toAddress, changeNode, fee);
-        GridPane.setConstraints(inputsPane, 4, 0);
+        GridPane.setConstraints(outputsPane, 4, 0);
 
         getChildren().clear();
         getChildren().addAll(inputsPane, txPane, outputsPane);
     }
 
-    private Pane getInputsLabels(Collection<BlockTransactionHashIndex> inputs) {
+    private Pane getInputsLabels(Map<BlockTransactionHashIndex, WalletNode> selectedUtxos) {
         VBox inputsBox = new VBox();
+        inputsBox.minHeightProperty().bind(minHeightProperty());
         inputsBox.setAlignment(Pos.CENTER_RIGHT);
         inputsBox.getChildren().add(createSpacer());
-        for(BlockTransactionHashIndex input : inputs) {
+        for(BlockTransactionHashIndex input : selectedUtxos.keySet()) {
             String desc = input.getLabel() != null && !input.getLabel().isEmpty() ? input.getLabel() : input.getHashAsString().substring(0, 8) + "...:" + input.getIndex();
             Label label = new Label(desc);
             inputsBox.getChildren().add(label);

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

@@ -3,18 +3,18 @@ package com.sparrowwallet.sparrow.wallet;
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
-import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppController;
 import com.sparrowwallet.sparrow.BitcoinUnit;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.control.CopyableLabel;
-import com.sparrowwallet.sparrow.control.CopyableTextField;
-import com.sparrowwallet.sparrow.control.FeeRatesChart;
-import com.sparrowwallet.sparrow.control.TextFieldValidator;
+import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.FeeRatesUpdatedEvent;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -27,11 +27,16 @@ import org.controlsfx.validation.Validator;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 
 import java.net.URL;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.stream.Collectors;
 
 public class SendController extends WalletFormController implements Initializable {
     public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
 
+    public static final double FALLBACK_FEE_RATE = 20000d / 1000;
+
     @FXML
     private CopyableTextField address;
 
@@ -60,15 +65,15 @@ public class SendController extends WalletFormController implements Initializabl
     private FeeRatesChart feeRatesChart;
 
     @FXML
-    private Button clear;
+    private TransactionDiagram transactionDiagram;
 
     @FXML
-    private Button select;
+    private Button clear;
 
     @FXML
     private Button create;
 
-    private ObservableList<BlockTransactionHashIndex> inputs;
+    private final ObjectProperty<WalletTransaction> walletTransactionProperty = new SimpleObjectProperty<>(null);
 
     private final BooleanProperty insufficientInputsProperty = new SimpleBooleanProperty(false);
 
@@ -144,19 +149,16 @@ public class SendController extends WalletFormController implements Initializabl
             updateTransaction();
         });
 
-        select.managedProperty().bind(select.visibleProperty());
-        create.managedProperty().bind(create.visibleProperty());
-        if(inputs == null || inputs.isEmpty()) {
-            create.setVisible(false);
-        } else {
-            select.setVisible(false);
-        }
+        walletTransactionProperty.addListener((observable, oldValue, newValue) -> {
+            transactionDiagram.update(newValue);
+            create.setDisable(false);
+        });
     }
 
     private void addValidation() {
         ValidationSupport validationSupport = new ValidationSupport();
         validationSupport.registerValidator(address, Validator.combine(
-                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid Address", !isValidAddress())
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid Address", !newValue.isEmpty() && !isValidAddress())
         ));
         validationSupport.registerValidator(amount, Validator.combine(
                 (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Insufficient Inputs", insufficientInputsProperty.get())
@@ -167,32 +169,22 @@ public class SendController extends WalletFormController implements Initializabl
 
     private void updateTransaction() {
         try {
-            Address address = getAddress();
-            Long amount = getAmount();
-            if(amount != null) {
-                Collection<BlockTransactionHashIndex> selectedInputs = selectInputs(amount);
-
-                Transaction transaction = new Transaction();
+            Address recipientAddress = getAddress();
+            Long recipientAmount = getAmount();
+            if(recipientAmount != null) {
+                Wallet wallet = getWalletForm().getWallet();
+                WalletTransaction walletTransaction = wallet.createWalletTransaction(getUtxoSelectors(), recipientAddress, recipientAmount, getFeeRate());
+                walletTransactionProperty.setValue(walletTransaction);
+                insufficientInputsProperty.set(false);
+                return;
             }
         } catch (InvalidAddressException e) {
             //ignore
-        } catch (InvalidTransactionException.InsufficientInputsException e) {
+        } catch (InsufficientFundsException e) {
             insufficientInputsProperty.set(true);
         }
-    }
-
-    private Collection<BlockTransactionHashIndex> selectInputs(Long targetValue) throws InvalidTransactionException.InsufficientInputsException {
-        Set<BlockTransactionHashIndex> utxos = getWalletForm().getWallet().getWalletUtxos().keySet();
-
-        for(UtxoSelector utxoSelector : getUtxoSelectors()) {
-            Collection<BlockTransactionHashIndex> selectedInputs = utxoSelector.select(targetValue, utxos);
-            long total = selectedInputs.stream().mapToLong(BlockTransactionHashIndex::getValue).sum();
-            if(total > targetValue) {
-                return selectedInputs;
-            }
-        }
 
-        throw new InvalidTransactionException.InsufficientInputsException("Not enough inputs for output value " + targetValue);
+        walletTransactionProperty.setValue(null);
     }
 
     private List<UtxoSelector> getUtxoSelectors() {
@@ -225,8 +217,8 @@ public class SendController extends WalletFormController implements Initializabl
     }
 
     private Long getFee() {
-        BitcoinUnit bitcoinUnit = amountUnit.getSelectionModel().getSelectedItem();
-        if(amount.getText() != null && !amount.getText().isEmpty()) {
+        BitcoinUnit bitcoinUnit = feeAmountUnit.getSelectionModel().getSelectedItem();
+        if(fee.getText() != null && !fee.getText().isEmpty()) {
             Double fieldValue = Double.parseDouble(amount.getText());
             return bitcoinUnit.getSatsValue(fieldValue);
         }
@@ -246,7 +238,16 @@ public class SendController extends WalletFormController implements Initializabl
     }
 
     private Map<Integer, Double> getTargetBlocksFeeRates() {
-        return AppController.getTargetBlockFeeRates();
+        Map<Integer, Double> retrievedFeeRates = AppController.getTargetBlockFeeRates();
+        if(retrievedFeeRates == null) {
+            retrievedFeeRates = TARGET_BLOCKS_RANGE.stream().collect(Collectors.toMap(java.util.function.Function.identity(), v -> FALLBACK_FEE_RATE));
+        }
+
+        return  retrievedFeeRates;
+    }
+
+    private Double getFeeRate() {
+        return getTargetBlocksFeeRates().get(getTargetBlocks());
     }
 
     private void setFeeRate(Double feeRateAmt) {
@@ -257,6 +258,18 @@ public class SendController extends WalletFormController implements Initializabl
 
     }
 
+    public void clear(ActionEvent event) {
+        address.setText("");
+        label.setText("");
+        amount.setText("");
+        fee.setText("");
+        walletTransactionProperty.setValue(null);
+    }
+
+    public void createTransaction(ActionEvent event) {
+
+    }
+
     @Subscribe
     public void feeRatesUpdated(FeeRatesUpdatedEvent event) {
         feeRatesChart.update(event.getTargetBlockFeeRates());

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

@@ -31,3 +31,7 @@
 #feeRateField .input-container {
     -fx-alignment: center-left;
 }
+
+#transactionDiagram {
+    -fx-min-height: 230px;
+}

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

@@ -14,11 +14,12 @@
 <?import javafx.geometry.Insets?>
 <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
 <?import javafx.collections.FXCollections?>
-<?import com.sparrowwallet.drongo.policy.PolicyType?>
 <?import com.sparrowwallet.sparrow.BitcoinUnit?>
 <?import com.sparrowwallet.sparrow.control.FeeRatesChart?>
 <?import javafx.scene.chart.CategoryAxis?>
 <?import javafx.scene.chart.NumberAxis?>
+<?import com.sparrowwallet.sparrow.control.TransactionDiagram?>
+
 <BorderPane stylesheets="@send.css, @wallet.css, @../script.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.SendController">
     <center>
         <GridPane styleClass="send-form" hgap="10.0" vgap="10.0">
@@ -87,6 +88,9 @@
                     </yAxis>
                 </FeeRatesChart>
             </AnchorPane>
+            <StackPane GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.columnSpan="3">
+                <TransactionDiagram fx:id="transactionDiagram" />
+            </StackPane>
         </GridPane>
     </center>
     <bottom>
@@ -96,9 +100,8 @@
             </padding>
             <HBox AnchorPane.rightAnchor="10">
                 <Button fx:id="clear" text="Clear" cancelButton="true" onAction="#clear" />
-                <Region HBox.hgrow="ALWAYS" />
-                <Button fx:id="select" text="Select UTXOs" defaultButton="true" onAction="#selectUtxos" />
-                <Button fx:id="create" text="Create Transaction" defaultButton="true" onAction="#createTransaction" />
+                <Region HBox.hgrow="ALWAYS" style="-fx-min-width: 20px" />
+                <Button fx:id="create" text="Create Transaction" defaultButton="true" disable="true" onAction="#createTransaction" />
             </HBox>
         </AnchorPane>
     </bottom>