Update src/Nethermind/Nethermind.JsonRpc/Modules/Eth/FeeHistory/FeeHi…

…storyOracle.cs Co-authored-by: Lukasz Rozmej <[email protected]>
NethermindEth · Dec 11, 2024 · 6475265 · 6475265
1 parent 13b65bd
commit 6475265
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/FeeHistory/FeeHistoryOracle.cs b/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/FeeHistory/FeeHistoryOracle.cs
@@ -110,19 +110,10 @@ BlockFeeHistorySearchInfo BlockFeeHistorySearchInfoFromBlock(Block b)
             {
                 BlobGasCalculator.TryCalculateFeePerBlobGas(b.Header, out UInt256 feePerBlobGas);
 
-                double maxBlobGasPerBlock;
-                if (!_specProvider.GetSpec(b.Header).IsEip7742Enabled)
-                {
-                    maxBlobGasPerBlock = Eip4844Constants.GetMaxBlobsPerBlock();
-                }
-                else if (b.Header.TargetBlobCount.HasValue)
-                {
-                    maxBlobGasPerBlock = b.Header.TargetBlobCount.Value * 2;
-                }
-                else
-                {
-                    throw new InvalidBlockException(b, "header is missing TargetBlobCount");
-                }
+                IReleaseSpec spec = _specProvider.GetSpec(b.Header);
+                double maxBlobGasPerBlock = !spec.IsEip7742Enabled 
+                    ? Eip4844Constants.GetMaxBlobsPerBlock()
+                    : b.Header.TargetBlobCount * 2 ?? throw new InvalidBlockException(b, "header is missing TargetBlobCount");
 
                 return new(
                     b.Number,