Sdk merge basedonbackport

.gitattributes

@@ -2,6 +2,7 @@
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
 * text=auto
+**/osx64/Tor/tor text eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

WalletWasabi.Documentation/Guides/DeterministicBuildGuide.md

@@ -1,68 +1,91 @@
-> Reproducible [or deterministic] builds are a set of software development practices that create an independently-verifiable path from source to binary code.- https://reproducible-builds.org/
+# Guide for deterministic builds
 
-This guide describes how to reproduce Wasabi's builds. If you got stuck with these instructions, take a look at how to build Wasabi from source code: https://github.com/zkSNACKs/WalletWasabi#build-from-source-code
+The term *deterministic builds* is [defined](https://reproducible-builds.org/) as follows:
 
-# 1. Assert Correct Environment
+> Reproducible [or deterministic] builds are a set of software development practices that create an independently-verifiable path from source to binary code.
 
-In order to reproduce Wasabi's builds you need Git, Windows 10 and the version of .NET Core SDK that was the most recent in the time of building the release.
+This guide describes how to reproduce Wasabi's builds. If you get stuck with these instructions, take a look at [how to build Wasabi from source code](https://docs.wasabiwallet.io/using-wasabi/BuildSource.html).
 
-# 2. Reproduce Builds
+**Warning:** Reproducible builds were introduced in [1.1.3 release](https://github.com/zkSNACKs/WalletWasabi/releases/tag/v1.1.3), you cannot use these instructions for older versions!
+
+## 1. Assert correct environment
+
+In order to reproduce Wasabi's builds, you need [git](https://git-scm.com/) package, Windows 10, and the version of [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core) that was used by the Wasabi team to produce the release. The latest version of .NET Core SDK is always used, unless specified otherwise in the release notes of Wasabi Wallet.
+
+## 2. Reproduce builds
+
+You can see the list of Wasabi releases here: https://github.com/zkSNACKs/WalletWasabi/releases. Please note that each release has a git tag assigned, which is useful in the following instructions:
 
 ```sh
-git clone https://github.com/zkSNACKs/WalletWasabi.git
-git checkout {hash of the release} # This works from 1.1.3 release, https://github.com/zkSNACKs/WalletWasabi/releases
-cd WalletWasabi/WalletWasabi.Packager/
-dotnet clean
-dotnet restore --locked-mode
+# The following command downloads only a single git branch. However, you can clone the whole repository, which is bigger.
+git clone --depth 1 --branch <git-branch-or-tag> https://github.com/zkSNACKs/WalletWasabi.git # where `<git-branch-or-tag>` may be, for example, `v1.1.11.1`.
+cd WalletWasabi/WalletWasabi.Packager
+dotnet nuget locals all --clear
+dotnet restore
 dotnet build
 dotnet run -- --onlybinaries
 ```
 
-This will build our binaries for Windows, OSX and Linux from source code and open them in a file explorer for you.
+The previous commands produce Wasabi's binaries for Windows, macOS and Linux. Also, for your convenience, a new file explorer window will navigate you to the binaries location - i.e. `WalletWasabi\\WalletWasabi.Gui\\bin\\dist`.
 
 ![](https://i.imgur.com/8XAQzz4.png)
 
-# 3. Verify Builds
+## 3. Verify builds
 
-You can compare our binaries with the downloads we have on the website: https://wasabiwallet.io/
-In order to end-to-end verify all the downloaded packages you need a Windows, a Linux, and an OSX machine.
+Now, we will attempt to verify the binaries you have just compiled with the officially distributed binaries on https://wasabiwallet.io website. Please download those packages from the website, you should see the following files in your File Explorer:
 
 ![](https://i.imgur.com/aI9Kx0c.png)
 
-## Windows
+### Windows
 
-After you installed Wasabi from the `.msi`, it will be in `C:\Program Files\WasabiWallet` folder. You can compare it with your build:
-
-```sh
-git diff --no-index win7-x64 "C:\Program Files\WasabiWallet"
-```
+* Install Wasabi using `Wasabi-<version>.msi` file. It will install to `C:\Program Files\WasabiWallet` directory.
+* Start `cmd` or Powershell and navigate to the `dist` directory.
+* Execute the following command:
+  ```sh
+  git diff --no-index "win7-x64" "C:\Program Files\WasabiWallet"
+  ```
+* Make sure that there is **NO** difference reported by the command.
 
-## Linux && OSX
+### Linux & macOS
 
-You can use the Windows Subsystem for Linux to verify all the packages in one go. At the time of writing this guide we provide a `.tar.gz` and a `.deb` package for Linux and .dmg for OSX.  
+You can use the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/) to verify all the packages in one go. At the time of writing this guide we provide `.tar.gz` and `.deb` packages for Linux and `.dmg` package for macOS.  
 Install the `.deb` package and extract the `tar.gz` and `.dmg` packages, then compare them with your build.
 
-After installing WSL, just type `wsl` in explorer where your downloaded and built packages are located.
+After [installing WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10), just type `wsl` in File Explorer where your downloaded and built packages are located.
 
 ![](https://i.imgur.com/yRUjxvG.png)
 
-### .deb
+#### .deb
 
 ```sh
 sudo dpkg -i Wasabi-1.1.6.deb
 git diff --no-index linux-x64/ /usr/local/bin/wasabiwallet/
 ```
 
-### .tar.gz
+#### .tar.gz
 
 ```sh
 tar -pxzf Wasabi-1.1.6.tar.gz
 git diff --no-index linux-x64/ Wasabi-1.1.6
 ```
 
-### .dmg
+*There could be warnings regarding SOS_README.md that it differs in line endings. That is a text file and it has no effect on the running software.*
+
+#### .dmg
+
+According to Apple documentation, the signature that is used to ensure the integrity of the software is added into the binary itself - so it will manipulate the content of the files.
+
+> If the code is universal, the object code for each slice (architecture) is signed separately. This signature is stored within the binary file itself.
+
+[Source](https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/AboutCS/AboutCS.html#//apple_ref/doc/uid/TP40005929-CH3-SW3)
+
+According to this, it is impossible to have both deterministic build and code signature on macOS. macOS Gatekeeper won't let you run software without it. Thus, Wasabi only applies code signature, but no deterministic build for macOS. 
+
+There is an issue [here](https://github.com/zkSNACKs/WalletWasabi/issues/4110) for further discussion. 
+
+With the following method you can check the differences by yourself:
 
-You will need to install `7z` (or something else) to extract the `.dmg`: `sudo apt install p7zip-full`
+You will need to install `7z` (or something else) to extract the `.dmg`. You can do that using `sudo apt install p7zip-full` command.
 
 ```sh
 7z x Wasabi-1.1.6.dmg -oWasabiOsx

WalletWasabi.Gui/Controls/StatusBar.xaml

@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
              xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
@@ -69,9 +69,9 @@
             <TextBlock Text="{Binding Peers, StringFormat=Peers: \{0\}}" Foreground="{Binding Peers, ConverterParameter=Peers, Converter={StaticResource StatusColorConverter}}" />
           </StackPanel>
         </Panel>
-        <StackPanel Orientation="Horizontal" Spacing="0">
-          <TextBlock Text="Price: " />
-          <TextBlock Text="{Binding BtcPrice}" />
+        <StackPanel IsVisible="{Binding IsExchangeRateAvailable}" Orientation="Horizontal" Spacing="0">
+          <TextBlock Text="BTC/USD: " />
+          <TextBlock Text="{Binding ExchangeRate}" />
         </StackPanel>
       </StackPanel>
 

WalletWasabi.Gui/Controls/WalletExplorer/CoinInfoTabView.xaml

@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
              xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
@@ -7,44 +7,46 @@
              x:Class="WalletWasabi.Gui.Controls.WalletExplorer.CoinInfoTabView">
   <controls:GroupBox BorderThickness="0" Classes="docTabContainer">
     <controls:GroupBox Title="Coin Details" TextBlock.FontSize="16" Padding="30" Margin="0 10 0 0">
-      <StackPanel DataContext="{Binding Coin}">
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Amount:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AmountBtc}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Transaction Id:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Output Index:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding OutputIndex}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Address:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Address}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Confirmations:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Confirmations}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Anonymity Set:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AnonymitySet}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Key Path:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Public Key:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" />
-        </Grid>
-        <Grid ColumnDefinitions="150, *">
-          <TextBlock Classes="monospaceFont" Text="Known By:" />
-          <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Clusters}" />
-        </Grid>
-      </StackPanel>
+      <ScrollViewer HorizontalScrollBarVisibility="Auto">
+        <StackPanel DataContext="{Binding Coin}">
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Amount:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AmountBtc}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Transaction Id:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding TransactionId}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Output Index:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding OutputIndex}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Address:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Address}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Confirmations:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Confirmations}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Anonymity Set:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding AnonymitySet}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Key Path:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding KeyPath}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Public Key:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding PubKey}" />
+          </Grid>
+          <Grid ColumnDefinitions="150, *">
+            <TextBlock Classes="monospaceFont" Text="Cluster:" />
+            <controls:ExtendedTextBox Grid.Column="1" Classes="selectableTextBlock monospaceFont Transparent" Text="{Binding Cluster}" />
+          </Grid>
+        </StackPanel>
+      </ScrollViewer>
     </controls:GroupBox>
   </controls:GroupBox>
 </UserControl>