create psbt from real transaction
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
@@ -196,23 +196,6 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
IsBusy = true;
- if (IsWatchOnly)
- {
- // Generate the PSBT
-
- IoC.Get<IShell>().AddOrSelectDocument(() => new TransactionBuilderViewModel(null));
-
- var txviewer = IoC.Get<IShell>().Documents.OfType<TransactionBuilderViewModel>().FirstOrDefault();
- if (txviewer is null)
- throw new InvalidOperationException("Just added ViewModel and it is missing.");
-
- // Generate Test PSBT.
- PSBT psbt = PSBT.Parse("70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f0000008000000080010000800001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f00000080000000800200008000220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000", Network.Main);
- txviewer.UpdatePsbt(psbt);
-
- return;
- }
-
MainWindowViewModel.Instance.StatusBar.SetStatusAndDoUpdateActions("Building transaction...");
Password = Guard.Correct(Password);
@@ -317,6 +300,23 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
signedTransaction = signedPsbt.ExtractSmartTransaction(result.Transaction.Height);
}
+ if (IsWatchOnly)
+ {
+ // Generate the PSBT
+
+ IoC.Get<IShell>().AddOrSelectDocument(() => new TransactionBuilderViewModel(null));
+
+ var txviewer = IoC.Get<IShell>().Documents.OfType<TransactionBuilderViewModel>().FirstOrDefault();
+ if (txviewer is null)
+ throw new InvalidOperationException("Just added ViewModel and it is missing.");
+
+ // Generate Test PSBT.
+ // PSBT psbt = PSBT.Parse("70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f0000008000000080010000800001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f00000080000000800200008000220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008000", Network.Main);
+ txviewer.UpdatePsbt(result.Psbt, result.Transaction);
+
+ return;
+ }
+
MainWindowViewModel.Instance.StatusBar.SetStatusAndDoUpdateActions("Broadcasting transaction...");
await Task.Run(async () => await Global.WalletService.SendTransactionAsync(signedTransaction));

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBuilderView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBuilderView.xaml
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" LastChildFill="True">
- <TextBlock DockPanel.Dock="Top" Text="PSBT Json string" FontWeight="Bold" />
+ <TextBlock DockPanel.Dock="Top" Text="PSBT Json" FontWeight="Bold" />
<controls:MultiTextBox Text="{Binding PsbtJsonText}" IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" />
</DockPanel>
<DockPanel Grid.Row="1" LastChildFill="True">
- <TextBlock DockPanel.Dock="Top" Text="PSBT Hex string" FontWeight="Bold" />
- <controls:MultiTextBox Text="{Binding PsbtHexText}" IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" />
+ <TextBlock DockPanel.Dock="Top" Text="Transaction Hex" FontWeight="Bold" />
+ <controls:MultiTextBox Text="{Binding TransactionHexText}" IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" />
</DockPanel>
<DockPanel Grid.Row="2" LastChildFill="True">
- <TextBlock DockPanel.Dock="Top" Text="PSBT Base64 string" FontWeight="Bold" />
+ <TextBlock DockPanel.Dock="Top" Text="PSBT Base64 String" FontWeight="Bold" />
<controls:MultiTextBox Text="{Binding PsbtBase64Text}" IsReadOnly="True" TextWrapping="Wrap" AcceptsReturn="True" />
</DockPanel>
</Grid>

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBuilderViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionBuilderViewModel.cs
@@ -6,6 +6,7 @@ using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Threading.Tasks;
+using WalletWasabi.Models;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
@@ -25,7 +26,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
set => this.RaiseAndSetIfChanged(ref _psbtJsonText, value);
}
- public string PsbtHexText
+ public string TransactionHexText
{
get => _psbtHexText;
set => this.RaiseAndSetIfChanged(ref _psbtHexText, value);
@@ -78,12 +79,12 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
return base.OnClose();
}
- public void UpdatePsbt(PSBT psbt)
+ public void UpdatePsbt(PSBT psbt, SmartTransaction transaction)
{
try
{
PsbtJsonText = psbt.ToString();
- PsbtHexText = psbt.ToHex();
+ TransactionHexText = transaction.Transaction.ToHex();
PsbtBase64Text = psbt.ToBase64();
}
catch (Exception ex)

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
@@ -40,7 +40,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
new TransactionBroadcasterViewModel(this),
};
- if (!walletService.KeyManager.IsWatchOnly)
+ //if (!walletService.KeyManager.IsWatchOnly)
{
Actions.Insert(0, new SendTabViewModel(this));
}

create psbt from real transaction