Add fee feedback

WalletWasabi · Dec 20, 2018 · fa9aaee · fa9aaee
2 parents 922be4c + bc239be
commit fa9aaee
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 13 deletions.
diff --git a/WalletWasabi.Gui/Controls/WalletExplorer/SendTabView.xaml b/WalletWasabi.Gui/Controls/WalletExplorer/SendTabView.xaml
@@ -89,10 +89,10 @@
                   </DrawingPresenter>
                 </Grid>
               </StackPanel>
-              <StackPanel Orientation="Horizontal" Spacing="4">
-                <TextBlock Text="Confirmation Expected In:" />
-                <TextBlock Foreground="YellowGreen" Text="{Binding ConfirmationExpectedText}" Width="80" />
-                <TextBlock Foreground="{DynamicResource ThemeBorderHighBrush}" Text="{Binding FeeText}" />
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="4">
+                <TextBlock Text="Confirmation Expected In:" VerticalAlignment="Center"/>
+                <TextBlock Foreground="YellowGreen" Text="{Binding ConfirmationExpectedText}" Width="80" VerticalAlignment="Center" />
+                <Button Content="{Binding FeeText}" Command="{Binding FeeRateCommand}" Padding="0" Background="{DynamicResource EditorBackgroundBrush}" BorderBrush="{DynamicResource EditorBackgroundBrush}" VerticalAlignment="Top" />
               </StackPanel>
             </StackPanel>
           </StackPanel>

diff --git a/WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs b/WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
@@ -18,6 +18,7 @@
 using WalletWasabi.Gui.Tabs.WalletManager;
 using WalletWasabi.Backend.Models.Responses;
 using System.ComponentModel;
+using WalletWasabi.Gui.Models;
 
 namespace WalletWasabi.Gui.Controls.WalletExplorer
 {
@@ -49,6 +50,7 @@ public class SendTabViewModel : WalletActionViewModel
 		private int _caretIndex;
 		private ObservableCollection<SuggestionViewModel> _suggestions;
 		private bool IgnoreAmountChanges { get; set; }
+		private FeeDisplayFormat FeeDisplayFormat { get; set; }
 
 		public SendTabViewModel(WalletViewModel walletViewModel)
 			: base("Send", walletViewModel)
@@ -189,10 +191,9 @@ public SendTabViewModel(WalletViewModel walletViewModel)
 			(this).WhenAny(x => x.IsMax, x => x.Amount, x => x.Address, x => x.IsBusy,
 				(isMax, amount, address, busy) => ((isMax.Value || !string.IsNullOrWhiteSpace(amount.Value)) && !string.IsNullOrWhiteSpace(Address) && !IsBusy)));
 
-			MaxCommand = ReactiveCommand.Create(() =>
-			{
-				SetMax();
-			});
+			MaxCommand = ReactiveCommand.Create(SetMax);
+
+			FeeRateCommand = ReactiveCommand.Create(ChangeFeeRateDisplay);
 
 			this.WhenAnyValue(x => x.IsBusy).Subscribe(busy =>
 			{
@@ -243,6 +244,16 @@ private void CoinList_SelectionChanged(object sender, CoinViewModel e)
 			SetFeesAndTexts();
 		}
 
+		private void ChangeFeeRateDisplay()
+		{
+			var nextval = (from FeeDisplayFormat val in Enum.GetValues(typeof(FeeDisplayFormat))
+						   where val > FeeDisplayFormat
+						   orderby val
+						   select val).DefaultIfEmpty().First();
+			FeeDisplayFormat = nextval;
+			SetFeesAndTexts();
+		}
+
 		private void SetFeesAndTexts()
 		{
 			AllFeeEstimate allFeeEstimate = Global.Synchronizer?.AllFeeEstimate;
@@ -291,8 +302,27 @@ private void SetFeesAndTexts()
 
 			if (allFeeEstimate != null)
 			{
-				//FeeText = $"(~ {SatoshiPerByteFeeRate.Satoshi} sat/byte)";
-				FeeText = $"(~ {BtcFee.ToString(false, false)} BTC)";
+				switch (FeeDisplayFormat)
+				{
+					case FeeDisplayFormat.SatoshiPerByte:
+						FeeText = $"(~ {SatoshiPerByteFeeRate.Satoshi} sat/byte)";
+						break;
+
+					case FeeDisplayFormat.USD:
+						FeeText = $"(~ ${UsdFee.ToString("0.##")})";
+						break;
+
+					case FeeDisplayFormat.BTC:
+						FeeText = $"(~ {BtcFee.ToString(false, false)} BTC)";
+						break;
+
+					case FeeDisplayFormat.Percentage:
+						FeeText = $"(~ {FeePercentage.ToString("0.#")} %)";
+						break;
+
+					default:
+						throw new NotSupportedException("This is impossible.");
+				}
 			}
 		}
 
@@ -331,6 +361,28 @@ private void SetFees(AllFeeEstimate allFeeEstimate, int feeTarget)
 			}
 
 			BtcFee = Money.Satoshis(vsize * SatoshiPerByteFeeRate);
+
+			if (IsMax)
+			{
+				long all = selectedCoins.Sum(x => x.Amount);
+				if (all != 0)
+				{
+					FeePercentage = 100 * (decimal)BtcFee.Satoshi / all;
+				}
+			}
+			else
+			{
+				if (Money.TryParse(Amount, out Money amount) && amount.Satoshi != 0)
+				{
+					FeePercentage = 100 * (decimal)BtcFee.Satoshi / amount.Satoshi;
+				}
+			}
+
+			decimal exchangeRate = Global.Synchronizer.UsdExchangeRate;
+			if (exchangeRate != 0)
+			{
+				UsdFee = BtcFee.ToUsd(exchangeRate);
+			}
 		}
 
 		private void Synchronizer_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -643,5 +695,7 @@ public string SuccessMessage
 		public ReactiveCommand BuildTransactionCommand { get; }
 
 		public ReactiveCommand MaxCommand { get; }
+
+		public ReactiveCommand FeeRateCommand { get; }
 	}
 }
diff --git a/WalletWasabi.Gui/Models/FeeDisplayFormat.cs b/WalletWasabi.Gui/Models/FeeDisplayFormat.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WalletWasabi.Gui.Models
+{
+	public enum FeeDisplayFormat
+	{
+		USD,
+		BTC,
+		SatoshiPerByte,
+		Percentage
+	};
+}
diff --git a/WalletWasabi/Extensions/NBitcoinExtensions.cs b/WalletWasabi/Extensions/NBitcoinExtensions.cs
@@ -94,5 +94,10 @@ public static Money Percentange(this Money me, decimal perc)
 		{
 			return Money.Satoshis((me.Satoshi / 100m) * perc);
 		}
+
+		public static decimal ToUsd(this Money me, decimal btcExchangeRate)
+		{
+			return me.ToDecimal(MoneyUnit.BTC) * btcExchangeRate;
+		}
 	}
 }
diff --git a/WalletWasabi/Helpers/NBitcoinHelpers.cs b/WalletWasabi/Helpers/NBitcoinHelpers.cs
@@ -55,5 +55,13 @@ public static Money TakeAReasonableFee(Money outputValue)
 
 			return remaining;
 		}
+
+		public static int CalculateVsizeAssumeSegwit(int inNum, int outNum)
+		{
+			var origTxSize = inNum * Constants.P2pkhInputSizeInBytes + outNum * Constants.OutputSizeInBytes + 10;
+			var newTxSize = inNum * Constants.P2wpkhInputSizeInBytes + outNum * Constants.OutputSizeInBytes + 10; // BEWARE: This assumes segwit only inputs!
+			var vSize = (int)Math.Ceiling(((3 * newTxSize) + origTxSize) / 4m);
+			return vSize;
+		}
 	}
 }
diff --git a/WalletWasabi/Services/WalletService.cs b/WalletWasabi/Services/WalletService.cs
@@ -821,9 +821,7 @@ public BuildTransactionResult BuildTransaction(string password,
 			// https://bitcoincore.org/en/segwit_wallet_dev/#transaction-fee-estimation
 			// https://bitcoin.stackexchange.com/a/46379/26859
 			int outNum = spendAll ? toSend.Length : toSend.Length + 1; // number of addresses to send + 1 for change
-			var origTxSize = inNum * Constants.P2pkhInputSizeInBytes + outNum * Constants.OutputSizeInBytes + 10;
-			var newTxSize = inNum * Constants.P2wpkhInputSizeInBytes + outNum * Constants.OutputSizeInBytes + 10; // BEWARE: This assumes segwit only inputs!
-			var vSize = (int)Math.Ceiling(((3 * newTxSize) + origTxSize) / 4m);
+			int vSize = NBitcoinHelpers.CalculateVsizeAssumeSegwit(inNum, outNum);
 			Logger.LogInfo<WalletService>($"Estimated tx size: {vSize} vbytes.");
 			Money fee = feePerBytes * vSize;
 			Logger.LogInfo<WalletService>($"Fee: {fee.Satoshi} Satoshi.");