Merge pull request GingerPrivacy#5 from drkgry/incorrectrequest_fix

Incorrect requested amount fix
luzius1089 · Aug 9, 2024 · 2630fe7 · 2630fe7
2 parents e29f87a + df814f5
commit 2630fe7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/WalletWasabi/Legal/Assets/LegalDocumentsGingerWallet.txt b/WalletWasabi/Legal/Assets/LegalDocumentsGingerWallet.txt
@@ -1,4 +1,4 @@
-Last Updated: May 28, 2024
+Last Updated: Aug 09, 2024
 
 
 Version Number: 5
@@ -160,6 +160,10 @@ Ginger Wallet does not store, send, or receive Bitcoins. Bitcoins exist only by
 
     The CoinJoin fee, charged by the Service Provider is 0.3% per new UTXO, except if:
 
+     -The used client for the CoinJoin is a Wasabi Wallet with version 2.0.8.1 or lower OR a Ginger Wallet
+
+     AND ANY FROM BELOW:
+
      -The UTXO comes directly from a Ginger Wallet CoinJoin transaction used InvisibleBit LLC’s coordinator.
 
      -The UTXO comes directly from a Wasabi Wallet 2.x CoinJoin transaction used zkSNACKs’ coordinator till Jun 1, 2024.

diff --git a/WalletWasabi/Nostr/NostrExtensions.cs b/WalletWasabi/Nostr/NostrExtensions.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Net;
 using System.Net.WebSockets;
 using System.Threading;
@@ -14,7 +14,7 @@ namespace WalletWasabi.Nostr;
 public record NostrCoordinator(string Description, string Name, Uri Uri, Network Network)
 {
 	private static NostrCoordinator Ginger = new(
-		Description: "Official Coordinator | FREE Remix, FREE under 0.01 BTC, FREE for Wasabi mixed coins | Secure Coinjoin - Illicit actors are not allowed to participate! | gingerwallet.io",
+		Description: "Official Coordinator | FREE Remix, FREE under 0.01 BTC till Wasabi Wallet v2.0.8.1 and for Ginger Wallet | Secure Coinjoin - Illicit actors are not allowed to participate! | gingerwallet.io",
 		Name: "Ginger Coordinator",
 		Uri: new Uri(Constants.BackendUri),
 		Network: Network.Main);
@@ -28,12 +28,12 @@ public static NostrCoordinator GetCoordinator(Network network)
 
 		if (network == Network.TestNet)
 		{
-			return Ginger with {Uri = new Uri(Constants.TestnetBackendUri), Network = Network.TestNet};
+			return Ginger with { Uri = new Uri(Constants.TestnetBackendUri), Network = Network.TestNet };
 		}
 
 		if (network == Network.RegTest)
 		{
-			return Ginger with {Uri = new Uri("http://localhost:37127/"), Network = Network.RegTest};
+			return Ginger with { Uri = new Uri("http://localhost:37127/"), Network = Network.RegTest };
 		}
 
 		throw new NotSupportedNetworkException(network);
@@ -56,7 +56,6 @@ public static INostrClient Create(Uri[] relays, EndPoint? torEndpoint = null)
 				? new WebProxy($"socks5://{endpoint2.Host}:{endpoint2.Port}")
 				: null;
 		return Create(relays, webProxy);
-
 	}
 
 	public static INostrClient Create(Uri[] relays, WebProxy? proxy = null)
@@ -89,6 +88,7 @@ public static async Task PublishAsync(
 
 		await client.ConnectAndWaitUntilConnected(cancellationToken).ConfigureAwait(false);
 		await client.SendEventsAndWaitUntilReceived(evts, cancellationToken).ConfigureAwait(false);
+		await client.Disconnect().ConfigureAwait(false);
 	}
 
 	public static async Task<NostrEvent> CreateCoordinatorDiscoveryEventAsync(

diff --git a/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs b/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs
@@ -191,15 +191,32 @@ private async Task<ConnectionConfirmationResponse> ConfirmConnectionCoreAsync(Co
 				throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.AliceAlreadyConfirmedConnection, $"Round ({request.RoundId}): Alice ({request.AliceId}) already confirmed connection.");
 			}
 
-			if (realVsizeCredentialRequests.Delta != alice.CalculateRemainingVsizeCredentials(round.Parameters.MaxVsizeAllocationPerAlice))
+			var vsizeAllowance = alice.CalculateRemainingVsizeCredentials(round.Parameters.MaxVsizeAllocationPerAlice);
+			if (realVsizeCredentialRequests.Delta != vsizeAllowance)
 			{
-				throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.IncorrectRequestedVsizeCredentials, $"Round ({request.RoundId}): Incorrect requested vsize credentials.");
+				if (realVsizeCredentialRequests.Delta < vsizeAllowance)
+				{
+					round.LogInfo($"Alice {alice.Id} asked for less vsize than allowed ({vsizeAllowance}): {realVsizeCredentialRequests.Delta}");
+				}
+				else
+				{
+					round.LogInfo($"Alice {alice.Id} asked for more vsize than allowed ({vsizeAllowance}): {realVsizeCredentialRequests.Delta}");
+					throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.IncorrectRequestedVsizeCredentials, $"Round ({request.RoundId}): Incorrect requested vsize credentials.");
+				}
 			}
 
 			var remaining = alice.CalculateRemainingAmountCredentials(round.Parameters.MiningFeeRate, round.Parameters.CoordinationFeeRate);
 			if (realAmountCredentialRequests.Delta != remaining)
 			{
-				throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.IncorrectRequestedAmountCredentials, $"Round ({request.RoundId}): Incorrect requested amount credentials.");
+				if (realAmountCredentialRequests.Delta < remaining)
+				{
+					round.LogInfo($"Alice {alice.Id} asked for less amount than allowed ({remaining.Satoshi}): {realAmountCredentialRequests.Delta}, diff {remaining.Satoshi - realAmountCredentialRequests.Delta}");
+				}
+				else
+				{
+					round.LogInfo($"Alice {alice.Id} asked for more amount than allowed ({remaining.Satoshi}): {realAmountCredentialRequests.Delta}");
+					throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.IncorrectRequestedAmountCredentials, $"Round ({request.RoundId}): Incorrect requested amount credentials.");
+				}
 			}
 		}