Should correctly broadcast light transactions (#9448)

* Should correctly broadcast light transactions

* Add all combinations to tests

* Make GetProofVersion polimorphic and nullable

* make it better

* fix MempoolBlobTxProofVersionValidator

* Return null on missing wrapper

* fix

Author: LukaszRozmej

src/Nethermind/Nethermind.Consensus/Validators/TxValidator.cs

@@ -307,13 +307,12 @@ private MempoolBlobTxProofVersionValidator() { }
 
     public ValidationResult IsWellFormed(Transaction transaction, IReleaseSpec releaseSpec)
     {
-        return transaction switch
-        {
-            LightTransaction lightTx => ValidateProofVersion(lightTx.ProofVersion, releaseSpec),
-            { Type: TxType.Blob, NetworkWrapper: ShardBlobNetworkWrapper wrapper } => ValidateProofVersion(wrapper.Version, releaseSpec),
-            { Type: TxType.Blob, NetworkWrapper: not null } => TxErrorMessages.InvalidTransactionForm,
-            _ => ValidationResult.Success,
-        };
+        if (!transaction.SupportsBlobs) return ValidationResult.Success;
+
+        ProofVersion? version = transaction.GetProofVersion();
+        return version is null
+            ? transaction.NetworkWrapper is not null ? TxErrorMessages.InvalidTransactionForm : ValidationResult.Success
+            : ValidateProofVersion(version.Value, releaseSpec);
 
         static ValidationResult ValidateProofVersion(ProofVersion txProofVersion, IReleaseSpec spec) =>
             txProofVersion != spec.BlobProofVersion ? TxErrorMessages.InvalidProofVersion : ValidationResult.Success;

src/Nethermind/Nethermind.Core/Transaction.cs

@@ -332,12 +332,17 @@ public void CopyTo(Transaction tx)
             tx._size = _size;
             tx.AuthorizationList = AuthorizationList;
         }
+
+        public virtual ProofVersion? GetProofVersion() =>
+            SupportsBlobs && this is { NetworkWrapper: ShardBlobNetworkWrapper { Version: var version } }
+                ? version
+                : null;
     }
 
     /// <summary>
     /// Transaction that is generated by the node to be included in future block. After included in the block can be handled as regular <see cref="Transaction"/>.
     /// </summary>
-    public sealed class GeneratedTransaction : Transaction { }
+    public sealed class GeneratedTransaction : Transaction;
 
     /// <summary>
     /// System transaction that is to be executed by the node without including in the block.
@@ -350,9 +355,7 @@ public sealed class SystemTransaction : Transaction
     /// <summary>
     /// System call like transaction that is to be executed by the node without including in the block.
     /// </summary>
-    public sealed class SystemCall : Transaction
-    {
-    }
+    public sealed class SystemCall : Transaction;
 
     /// <summary>
     /// Used inside Transaction::GetSize to calculate encoded transaction size

src/Nethermind/Nethermind.TxPool.Test/TxBroadcasterTests.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using FastEnumUtility;
 using FluentAssertions;
 using Nethermind.Blockchain;
 using Nethermind.Consensus;
@@ -729,6 +730,38 @@ public void calculation_of_baseFeeThreshold_should_handle_overflow_correctly([Va
                 : baseFeeThreshold);
     }
 
+    [Test]
+    public void can_correctly_broadcast_light_transactions_without_wrappers([Values] ProofVersion proofVersion, [Values] bool versionMatches)
+    {
+        // Arrange
+        IChainHeadInfoProvider mockChainHeadInfoProvider = Substitute.For<IChainHeadInfoProvider>();
+        mockChainHeadInfoProvider.CurrentProofVersion.Returns(proofVersion);
+        IReleaseSpec spec = Substitute.For<IReleaseSpec>();
+        spec.BlobProofVersion.Returns(versionMatches ? proofVersion : GetInvalidVersion(proofVersion));
+
+        SpecDrivenTxGossipPolicy gossipPolicy = new(mockChainHeadInfoProvider);
+
+        Transaction blobTransaction = Build.A.Transaction
+            .WithShardBlobTxTypeAndFields(spec: spec)
+            .SignedAndResolved(_ethereumEcdsa, TestItem.PrivateKeyA)
+            .TestObject;
+
+        LightTransaction lightTransaction = new(blobTransaction);
+
+        // Act
+        bool result = gossipPolicy.ShouldGossipTransaction(lightTransaction);
+
+        // Assert
+        result.Should().Be(versionMatches, "LightTransaction from blob transaction should be gossiped when proof version matches.");
+
+        // Gets (version + 1) % (version + 1) - so next version round robin
+        ProofVersion GetInvalidVersion(ProofVersion version)
+        {
+            byte mod = (byte)(FastEnum.GetMaxValue<ProofVersion>() + 1);
+            return (ProofVersion)((byte)(version + 1) % mod);
+        }
+    }
+
     private (IList<Transaction> expectedTxs, IList<Hash256> expectedHashes) GetTxsAndHashesExpectedToBroadcast(Transaction[] transactions, int expectedCountTotal)
     {
         List<Transaction> expectedTxs = new();

src/Nethermind/Nethermind.TxPool/LightTransaction.cs

@@ -28,7 +28,7 @@ public LightTransaction(Transaction fullTx)
         GasBottleneck = fullTx.GasBottleneck;
         Timestamp = fullTx.Timestamp;
         PoolIndex = fullTx.PoolIndex;
-        ProofVersion = (fullTx.NetworkWrapper as ShardBlobNetworkWrapper)?.Version ?? default;
+        ProofVersion = fullTx.GetProofVersion();
         _size = fullTx.GetLength();
     }
 
@@ -63,5 +63,7 @@ public LightTransaction(
         _size = size;
     }
 
-    public ProofVersion ProofVersion { get; set; }
+    public ProofVersion? ProofVersion { get; set; }
+
+    public override ProofVersion? GetProofVersion() => ProofVersion;
 }

src/Nethermind/Nethermind.TxPool/SpecDrivenTxGossipPolicy.cs

@@ -10,5 +10,5 @@ public class SpecDrivenTxGossipPolicy(IChainHeadInfoProvider chainHeadInfoProvid
     private IChainHeadInfoProvider ChainHeadInfoProvider { get; } = chainHeadInfoProvider;
 
     public bool ShouldGossipTransaction(Transaction tx) =>
-        !tx.SupportsBlobs || (tx.NetworkWrapper as ShardBlobNetworkWrapper)?.Version == ChainHeadInfoProvider.CurrentProofVersion;
+        !tx.SupportsBlobs || tx.GetProofVersion() == ChainHeadInfoProvider.CurrentProofVersion;
 }

src/Nethermind/Nethermind.TxPool/TransactionExtensions.cs

@@ -93,12 +93,5 @@ internal static bool IsOverflowInTxCostAndValue(this Transaction tx, out UInt256
             => IsOverflowWhenAddingTxCostToCumulative(tx, UInt256.Zero, out txCost);
 
         public static bool IsInMempoolForm(this Transaction tx) => tx.NetworkWrapper is not null;
-
-        public static ProofVersion GetProofVersion(this Transaction mempoolTx) => mempoolTx switch
-        {
-            LightTransaction lt => lt.ProofVersion,
-            { NetworkWrapper: ShardBlobNetworkWrapper { Version: ProofVersion v } } => v,
-            _ => ProofVersion.V0,
-        };
     }
 }