Fix shared transaction overhead mess (WalletWasabi#13312)

Kukks · Aug 7, 2024 · 1e51ede · 1e51ede
1 parent 642d175
commit 1e51ede
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/WalletWasabi.Tests/Helpers/ArenaBuilder.cs b/WalletWasabi.Tests/Helpers/ArenaBuilder.cs
@@ -2,10 +2,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using WalletWasabi.BitcoinCore.Rpc;
+using WalletWasabi.Helpers;
 using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Backend.DoSPrevention;
 using WalletWasabi.WabiSabi.Backend.Rounds;
-using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 
 namespace WalletWasabi.Tests.Helpers;
 
@@ -83,5 +83,5 @@ public ArenaBuilder With(RoundParameterFactory roundParameterFactory)
 	public static ArenaBuilder From(WabiSabiConfig cfg, IRPCClient mockRpc, Prison prison) => new() { Config = cfg, Rpc = mockRpc, Prison = prison };
 
 	private static RoundParameterFactory CreateRoundParameterFactory(WabiSabiConfig cfg, Network network) =>
-		WabiSabiFactory.CreateRoundParametersFactory(cfg, network, maxVsizeAllocationPerAlice: 11 + 31 + MultipartyTransactionParameters.SharedOverhead);
+		WabiSabiFactory.CreateRoundParametersFactory(cfg, network, Constants.P2wpkhInputVirtualSize + Constants.P2wpkhOutputVirtualSize);
 }
diff --git a/WalletWasabi.Tests/Helpers/WabiSabiFactory.cs b/WalletWasabi.Tests/Helpers/WabiSabiFactory.cs
@@ -83,7 +83,8 @@ public static Round CreateRound(RoundParameters parameters) =>
 	public static Round CreateRound(WabiSabiConfig cfg) =>
 		CreateRound(CreateRoundParameters(cfg) with
 		{
-			MaxVsizeAllocationPerAlice = 11 + 31 + MultipartyTransactionParameters.SharedOverhead
+			MaxVsizeAllocationPerAlice =
+				Constants.P2wpkhInputVirtualSize + Constants.P2wpkhOutputVirtualSize // enough vsize for one input and one output
 		});
 
 	public static MockRpcClient CreatePreconfiguredRpcClient(params Coin[] coins)

diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs
@@ -105,19 +105,21 @@ public async Task RoundNotFoundAsync()
 	[Fact]
 	public async Task ScriptNotAllowedAsync()
 	{
+		using Key key = new();
+		var outputScript = key.PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.Main).ScriptPubKey;
+
 		WabiSabiConfig cfg = new();
 		RoundParameters parameters = WabiSabiFactory.CreateRoundParameters(cfg)
 			with
-		{ MaxVsizeAllocationPerAlice = 11 + 34 + MultipartyTransactionParameters.SharedOverhead };
+		{ MaxVsizeAllocationPerAlice = Constants.P2wpkhInputVirtualSize + outputScript.EstimateOutputVsize() };
 		var round = WabiSabiFactory.CreateRound(parameters);
 
 		using Arena arena = await ArenaBuilder.From(cfg).CreateAndStartAsync(round);
-		using Key key = new();
 
 		round.SetPhase(Phase.OutputRegistration);
 		round.Alices.Add(WabiSabiFactory.CreateAlice(Money.Coins(1), round));
 
-		var req = WabiSabiFactory.CreateOutputRegistrationRequest(round, key.PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.Main).ScriptPubKey);
+		var req = WabiSabiFactory.CreateOutputRegistrationRequest(round, outputScript);
 		var ex = await Assert.ThrowsAsync<WabiSabiProtocolException>(async () => await arena.RegisterOutputAsync(req, CancellationToken.None));
 		Assert.Equal(WabiSabiProtocolErrorCode.ScriptNotAllowed, ex.ErrorCode);
 
@@ -127,17 +129,17 @@ public async Task ScriptNotAllowedAsync()
 	[Fact]
 	public async Task NonStandardOutputAsync()
 	{
+		var sha256Bounty = Script.FromHex("aa20000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f87");
 		WabiSabiConfig cfg = new();
 		RoundParameters parameters = WabiSabiFactory.CreateRoundParameters(cfg)
 			with
-		{ MaxVsizeAllocationPerAlice = 11 + 31 + MultipartyTransactionParameters.SharedOverhead + 13 };
+		{ MaxVsizeAllocationPerAlice =  Constants.P2wpkhInputVirtualSize + sha256Bounty.EstimateOutputVsize() };
 		var round = WabiSabiFactory.CreateRound(parameters);
 		using Arena arena = await ArenaBuilder.From(cfg).CreateAndStartAsync(round);
 
 		round.SetPhase(Phase.OutputRegistration);
 		round.Alices.Add(WabiSabiFactory.CreateAlice(Money.Coins(1), round));
 
-		var sha256Bounty = Script.FromHex("aa20000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f87");
 		var req = WabiSabiFactory.CreateOutputRegistrationRequest(round, sha256Bounty);
 		var ex = await Assert.ThrowsAsync<WabiSabiProtocolException>(async () => await arena.RegisterOutputAsync(req, CancellationToken.None));
 

diff --git a/WalletWasabi/Helpers/VirtualSizeHelpers.cs b/WalletWasabi/Helpers/VirtualSizeHelpers.cs
@@ -7,7 +7,7 @@ public static class VirtualSizeHelpers
 	public const int VirtualByteInWeightUnits = 4;
 
 	public static int WeightUnitsToVirtualSize(int weightUnits) =>
-		(weightUnits / VirtualByteInWeightUnits) + ((weightUnits % VirtualByteInWeightUnits) == 0 ? 0 : 1); // ceiling(VirtualSize / VirtualByteInWeightUnits)
+		(weightUnits + VirtualByteInWeightUnits - 1) / VirtualByteInWeightUnits;
 
 	public static int VirtualSize(int nonSegwitBytes, int segwitBytes) =>
 		WeightUnitsToVirtualSize(WeightUnits(nonSegwitBytes, segwitBytes));

diff --git a/WalletWasabi/WabiSabi/Models/MultipartyTransaction/MultipartyTransactionParameters.cs b/WalletWasabi/WabiSabi/Models/MultipartyTransaction/MultipartyTransactionParameters.cs
@@ -21,7 +21,7 @@ private static int SharedOverheadFn(long minInputCount, long minOutputCount)
 			1 + // marker
 			1;  // flag
 
-		return VirtualSizeHelpers.WeightUnits(nonSegwitData, segwitData);
+		return VirtualSizeHelpers.VirtualSize(nonSegwitData, segwitData);
 	}
 
 	private static int VarIntLength(long value) =>