Override txs to make them nullable

NethermindEth · Oct 24, 2024 · d1ef1a5 · d1ef1a5
1 parent 08582f6
commit d1ef1a5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/Nethermind/Nethermind.Merge.Plugin/Data/ExecutionPayload.cs b/src/Nethermind/Nethermind.Merge.Plugin/Data/ExecutionPayload.cs
@@ -189,7 +189,7 @@ public virtual bool TryGetBlock([NotNullWhen(true)] out Block? block, UInt256? t
         }
     }
 
-    private Transaction[]? _transactions = null;
+    protected Transaction[]? _transactions = null;
 
     /// <summary>
     /// Decodes and returns an array of <see cref="Transaction"/> from <see cref="Transactions"/>.

diff --git a/src/Nethermind/Nethermind.Taiko/BlockInvalidTxExecutor.cs b/src/Nethermind/Nethermind.Taiko/BlockInvalidTxExecutor.cs
@@ -70,7 +70,7 @@ public TxReceipt[] ProcessTransactions(Block block, ProcessingOptions processing
             TransactionProcessed?.Invoke(this, new TxProcessedEventArgs(i, tx, receiptsTracer.LastReceipt));
             correctTransactions.Add(tx);
         }
-        
+
         block.TrySetTransactions([.. correctTransactions]);
         return [.. receiptsTracer.TxReceipts];
     }

diff --git a/src/Nethermind/Nethermind.Taiko/TaikoExecutionPayload.cs b/src/Nethermind/Nethermind.Taiko/TaikoExecutionPayload.cs
@@ -15,6 +15,18 @@ public class TaikoExecutionPayload : ExecutionPayload
     public Hash256? WithdrawalsHash { get; set; } = null;
     public Hash256? TxHash { get; set; } = null;
 
+
+    private byte[][]? _encodedTransactions;
+    public new byte[][]? Transactions
+    {
+        get { return _encodedTransactions; }
+        set
+        {
+            _encodedTransactions = value;
+            _transactions = null;
+        }
+    }
+
     protected override int GetExecutionPayloadVersion() => this switch
     {
         { BlobGasUsed: not null } or { ExcessBlobGas: not null } or { ParentBeaconBlockRoot: not null } => 3,

diff --git a/src/Nethermind/Nethermind.Taiko/TaikoPayloadPreparationService.cs b/src/Nethermind/Nethermind.Taiko/TaikoPayloadPreparationService.cs
@@ -32,7 +32,7 @@ public class TaikoPayloadPreparationService(
 
     private readonly ConcurrentDictionary<string, IBlockProductionContext> _payloadStorage = new();
 
-    public string StartPreparingPayload(BlockHeader parentHeader, PayloadAttributes payloadAttributes)
+    public string? StartPreparingPayload(BlockHeader parentHeader, PayloadAttributes payloadAttributes)
     {
         TaikoPayloadAttributes attrs = (payloadAttributes as TaikoPayloadAttributes)
             ?? throw new InvalidOperationException("Payload attributes have incorrect type. Expected TaikoPayloadAttributes.");