rename constants and files
MODIFY
WalletWasabi.Backend/Controllers/SoftwareController.cs
WalletWasabi.Backend/Controllers/SoftwareController.cs
@@ -15,7 +15,7 @@ public class SoftwareController : ControllerBase
{
ClientVersion = Constants.ClientVersion.ToString(3),
BackendMajorVersion = Constants.BackendMajorVersion,
- LegalDocumentsVersion = Constants.OldLegalDocumentsVersion.ToString()
+ LegalDocumentsVersion = Constants.Ww1LegalDocumentsVersion.ToString()
};
/// <summary>

MODIFY
WalletWasabi.Backend/Controllers/WasabiController.cs
WalletWasabi.Backend/Controllers/WasabiController.cs
@@ -26,13 +26,13 @@ public class WasabiController : ControllerBase
// If the document id is null, then the request comes from WW1.0 client.
if (id is null)
{
- filePath = LegalDocuments.EmbeddedFilePath;
+ filePath = LegalDocuments.EmbeddedFilePathForWw1;
}
else
{
- if (Version.TryParse(id, out var requestedVersion) && requestedVersion == Constants.WW2LegalDocumentsVersion)
+ if (Version.TryParse(id, out var requestedVersion) && requestedVersion == Constants.Ww2LegalDocumentsVersion)
{
- filePath = LegalDocuments.EmbeddedFilePathForWW2;
+ filePath = LegalDocuments.EmbeddedFilePathForWw2;
}
else
{

MODIFY
WalletWasabi/Helpers/Constants.cs
WalletWasabi/Helpers/Constants.cs
@@ -61,8 +61,8 @@ public static class Constants
public static readonly Version HwiVersion = new("2.0.2");
public static readonly Version BitcoinCoreVersion = new("21.2");
- public static readonly Version OldLegalDocumentsVersion = new(2, 0);
- public static readonly Version WW2LegalDocumentsVersion = new(2, 0, 1);
+ public static readonly Version Ww1LegalDocumentsVersion = new(2, 0);
+ public static readonly Version Ww2LegalDocumentsVersion = new(2, 0, 1);
// Defined in hours. Do not modify these values or the order!
public static readonly int[] CoinJoinFeeRateMedianTimeFrames = new[] { 24, 168, 720 };

RENAME
WalletWasabi/Legal/Assets/LegalDocuments.txt
WalletWasabi/Legal/Assets/LegalDocumentsWw1.txt
RENAME
WalletWasabi/Legal/Assets/LegalDocuments2.txt
WalletWasabi/Legal/Assets/LegalDocumentsWw2.txt
MODIFY
WalletWasabi/Legal/LegalDocuments.cs
WalletWasabi/Legal/LegalDocuments.cs
@@ -9,8 +9,8 @@ namespace WalletWasabi.Legal;
public class LegalDocuments
{
- public static readonly string EmbeddedFilePath = Path.Combine(EnvironmentHelpers.GetFullBaseDirectory(), "Legal", "Assets", "LegalDocuments.txt");
- public static readonly string EmbeddedFilePathForWW2 = Path.Combine(EnvironmentHelpers.GetFullBaseDirectory(), "Legal", "Assets", "LegalDocuments2.txt");
+ public static readonly string EmbeddedFilePathForWw1 = Path.Combine(EnvironmentHelpers.GetFullBaseDirectory(), "Legal", "Assets", "LegalDocumentsWw1.txt");
+ public static readonly string EmbeddedFilePathForWw2 = Path.Combine(EnvironmentHelpers.GetFullBaseDirectory(), "Legal", "Assets", "LegalDocumentsWw2.txt");
public LegalDocuments(Version version, string content)
{

MODIFY
WalletWasabi/WalletWasabi.csproj
WalletWasabi/WalletWasabi.csproj
</ItemGroup>
<ItemGroup>
- <None Update="Legal\Assets\LegalDocuments.txt">
+ <None Update="Legal\Assets\LegalDocumentsWw1.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Update="Legal\Assets\LegalDocuments2.txt">
+ <None Update="Legal\Assets\LegalDocumentsWw2.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Microservices\Binaries\win64\Tor\**\*">

MODIFY
WalletWasabi/WebClients/Wasabi/WasabiClient.cs
WalletWasabi/WebClients/Wasabi/WasabiClient.cs
@@ -262,7 +262,7 @@ public class WasabiClient
{
using HttpResponseMessage response = await HttpClient.SendAsync(
HttpMethod.Get,
- $"/api/v{ApiVersion}/wasabi/legaldocuments?id={Helpers.Constants.WW2LegalDocumentsVersion}",
+ $"/api/v{ApiVersion}/wasabi/legaldocuments?id={Helpers.Constants.Ww2LegalDocumentsVersion}",
cancel: cancel).ConfigureAwait(false);
if (response.StatusCode != HttpStatusCode.OK)

rename constants and files