Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
de19765
Get target_blob_count, max_blob_count from Engine Api
yerke26 Sep 30, 2024
eca6690
fix HeaderDecoder, restore Eip4844 changes, Add Eip7742
yerke26 Oct 1, 2024
7ac90df
Merge branch 'master' into feature/eip-7742
yerke26 Oct 1, 2024
9be8a53
fix HeaderDecoder
yerke26 Oct 1, 2024
c592412
move new params from ExecutionPayload to ExecutionPayloadV4
yerke26 Oct 1, 2024
f6ae01c
revert minor changes
yerke26 Oct 1, 2024
f803097
added new params to PayloadAttributes
yerke26 Oct 1, 2024
7043124
fix tests
yerke26 Oct 1, 2024
fef9cb2
fix whitespaces
yerke26 Oct 1, 2024
cc02ce5
add tests
yerke26 Oct 2, 2024
206d514
Merge branch 'master' into feature/eip-7742
yerke26 Oct 2, 2024
9fbb9c1
add missing fields
yerke26 Oct 4, 2024
8ada4e2
fix PayloadAttributes
yerke26 Oct 7, 2024
3ae0fed
add engine_forkchoiceUpdatedV4 to EngineRpcModule.Prague
yerke26 Oct 7, 2024
372868a
change to engine_forkchoiceUpdatedV4
yerke26 Oct 7, 2024
0bd75c6
Merge branch 'master' into feature/eip-7742
yerke26 Oct 7, 2024
4b5fbfc
add new fields to EngineModuleTests.V4
yerke26 Oct 7, 2024
5078b76
added new engine_forkchoiceUpdatedV4 to EngineRpcCapabilitiesProvider
yerke26 Oct 7, 2024
a92cdde
fix test cases
yerke26 Oct 8, 2024
c032480
Merge branch 'master' into feature/eip-7742
yerke26 Oct 8, 2024
4ab5fda
fix whitespace
yerke26 Oct 8, 2024
0ba2006
fix EngineRpcCapabilitiesProvider, revert ChainSpecBasedSpecProviderT…
yerke26 Oct 8, 2024
911d232
remove unnecessary comment
yerke26 Oct 8, 2024
f806f22
remove comments
yerke26 Oct 8, 2024
8dc3d6a
Merge branch 'master' into feature/eip-7742
yerke26 Oct 15, 2024
a993d59
Merge branch 'master' into feature/eip-7742
yerke26 Oct 30, 2024
ba1a3de
Merge branch 'master' into feature/eip-7742
yerke26 Nov 4, 2024
87e721a
add eip7742 logic to TryCalculateFeePerBlobGas
yerke26 Nov 4, 2024
e52fc98
remove MaxBlobCount, pass Spec to BlobGasCalculator
yerke26 Nov 4, 2024
49424d9
Merge branch 'master' into feature/eip-7742
yerke26 Nov 4, 2024
2162240
resolve merge conflicts
yerke26 Nov 4, 2024
9d4ec74
add MaxBlobCount in PayloadAttributes, refactoring, resolve comments
yerke26 Nov 5, 2024
d8e088c
fix tests
yerke26 Nov 5, 2024
793d085
Merge branch 'master' into feature/eip-7742
yerke26 Nov 5, 2024
a4fd1ef
fix Evm tool
yerke26 Nov 5, 2024
d022c4f
fix Evm tool
yerke26 Nov 5, 2024
47437f2
Merge branch 'master' into feature/eip-7742
yerke26 Nov 25, 2024
020ceef
resolve merge conflicts
yerke26 Nov 25, 2024
5699ad4
fix some tests
yerke26 Nov 26, 2024
81fb376
Merge branch 'master' into feature/eip-7742
yerke26 Nov 26, 2024
332322d
fix tests
yerke26 Nov 27, 2024
91822aa
fix AuraTests
yerke26 Nov 28, 2024
b4790dd
fix tests
yerke26 Nov 28, 2024
36464ad
fix JsonRpcTests
yerke26 Nov 28, 2024
459ebb7
fix TraceRpcModuleTests
yerke26 Nov 28, 2024
71963b7
fix tests
yerke26 Nov 28, 2024
94a1e4d
fix tests
yerke26 Dec 2, 2024
35d29c5
fix whitespaces
yerke26 Dec 2, 2024
5fab184
Merge branch 'master' into feature/eip-7742
yerke26 Dec 3, 2024
f00d86a
Update src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs
yerke26 Dec 3, 2024
1b9b367
Merge remote-tracking branch 'origin/feature/eip-7742' into feature/e…
yerke26 Dec 4, 2024
f13d22f
Merge branch 'master' into feature/eip-7742
yerke26 Dec 4, 2024
9718087
refactoring of BlockExecutionContext, move blobFee calculation to Vir…
yerke26 Dec 8, 2024
7a70d04
refactoring
yerke26 Dec 8, 2024
1d0dcc1
fix compilation erros
yerke26 Dec 8, 2024
aba9f7c
fix tests
yerke26 Dec 8, 2024
36f635d
fix tests, refactoring
yerke26 Dec 8, 2024
34ec30c
change to const
yerke26 Dec 8, 2024
8657a8c
fix TxPoolTxSource
yerke26 Dec 8, 2024
bb63085
fix
yerke26 Dec 8, 2024
4a83375
revert blobGasCalculator changes
yerke26 Dec 9, 2024
aa8cc8b
fix evm build
yerke26 Dec 9, 2024
e876201
revert BlobGasCalculatorTests
yerke26 Dec 9, 2024
1d05358
revert BlockExecutionContext
yerke26 Dec 9, 2024
c60067c
revert BlockHeader implicit conversion
yerke26 Dec 9, 2024
ce81cbe
revert remaining implicit conversion of header
yerke26 Dec 9, 2024
77c82a6
remove unnecessary import
yerke26 Dec 9, 2024
b465739
Update src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs
yerke26 Dec 9, 2024
41703ec
Update src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs
yerke26 Dec 9, 2024
fc1832b
Update src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs
yerke26 Dec 9, 2024
a6c75cc
resolve comments
yerke26 Dec 10, 2024
981f9ee
fix
yerke26 Dec 10, 2024
4339472
fix
yerke26 Dec 10, 2024
c2abd4c
Fix TransactionProcessorFeeTests: add eip enabled/disabled tests
yerke26 Dec 10, 2024
d1b14e9
add MaxBlobCount to BlockHeader
yerke26 Dec 10, 2024
2eb9fee
Update src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs
yerke26 Dec 10, 2024
82f6f4b
Revert "add MaxBlobCount to BlockHeader"
yerke26 Dec 11, 2024
0303cfd
Merge remote-tracking branch 'origin/feature/eip-7742' into feature/e…
yerke26 Dec 11, 2024
f63e7ef
fix tests with TargetBlobCount = 1
yerke26 Dec 11, 2024
13b65bd
fix tests
yerke26 Dec 11, 2024
6475265
Update src/Nethermind/Nethermind.JsonRpc/Modules/Eth/FeeHistory/FeeHi…
yerke26 Dec 11, 2024
dfe634e
fix whitespaces
yerke26 Dec 11, 2024
e231959
Merge branch 'master' into feature/eip-7742
yerke26 Dec 19, 2024
5c6dc2c
resolve merge conflicts
yerke26 Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ public static string InvalidTxInBlock(int i) =>
public const string HeaderGasUsedMismatch =
"HeaderGasUsedMismatch: Gas used in header does not match calculated.";

//Block's blob gas used in header is above the limit.
public static readonly string BlobGasUsedAboveBlockLimit =
$"BlockBlobGasExceeded: A block cannot have more than {Eip4844Constants.MaxBlobGasPerBlock} blob gas.";

//Block's excess blob gas in header is incorrect.
public const string IncorrectExcessBlobGas =
"HeaderExcessBlobGasMismatch: Excess blob gas in header does not match calculated.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ public static string InvalidTxChainId(ulong expected, ulong? actual) =>
public const string BlobTxMissingBlobVersionedHashes =
"BlobTxMissingBlobVersionedHashes: Must be set.";

public static readonly string BlobTxGasLimitExceeded =
$"BlobTxGasLimitExceeded: Transaction exceeded {Eip4844Constants.MaxBlobGasPerTransaction}.";

public const string BlobTxMissingBlobs =
"BlobTxMissingBlobs: Blob transaction must have blobs.";

Expand Down
15 changes: 2 additions & 13 deletions src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public IEnumerable<Transaction> GetTransactions(BlockHeader parent, long gasLimi

int checkedTransactions = 0;
int selectedTransactions = 0;
using ArrayPoolList<Transaction> selectedBlobTxs = new(_eip4844Config.GetMaxBlobsPerBlock());
using ArrayPoolList<Transaction> selectedBlobTxs = new((int) parent.MaxBlobCount);

SelectBlobTransactions(blobTransactions, parent, spec, selectedBlobTxs);

Expand Down Expand Up @@ -128,20 +128,9 @@ private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, B

foreach (Transaction blobTx in blobTransactions)
{
if (blobGasCounter >= _eip4844Config.MaxBlobGasPerBlock)
{
if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, no more blob space. Block already have {blobGasCounter} blob gas which is max value allowed.");
break;
}

checkedBlobTransactions++;

ulong txBlobGas = (ulong)(blobTx.BlobVersionedHashes?.Length ?? 0) * _eip4844Config.GasPerBlob;
if (txBlobGas > _eip4844Config.MaxBlobGasPerBlock - blobGasCounter)
{
if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, not enough blob space.");
continue;
}

if (blobGasPrice.IsZero && !TryUpdateBlobGasPrice(blobTx, parent, spec, out blobGasPrice))
{
Expand Down Expand Up @@ -188,7 +177,7 @@ private bool TryGetFullBlobTx(Transaction blobTx, [NotNullWhen(true)] out Transa

private bool TryUpdateBlobGasPrice(Transaction lightBlobTx, BlockHeader parent, IReleaseSpec spec, out UInt256 blobGasPrice)
{
ulong? excessDataGas = BlobGasCalculator.CalculateExcessBlobGas(parent, spec);
ulong? excessDataGas = BlobGasCalculator.CalculateExcessBlobGas(parent, spec, parent);
if (excessDataGas is null)
{
if (_logger.IsTrace) _logger.Trace($"Declining {lightBlobTx.ToShortString()}, the specification is not configured to handle shard blob transactions.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,6 @@ private bool ValidateEip4844Fields(Block block, IReleaseSpec spec, out string? e

ulong blobGasUsed = BlobGasCalculator.CalculateBlobGas(blobsInBlock);

if (blobGasUsed > Eip4844Constants.MaxBlobGasPerBlock)
{
error = BlockErrorMessages.BlobGasUsedAboveBlockLimit;
if (_logger.IsDebug) _logger.Debug($"{Invalid(block)} {error}.");
return false;
}

if (blobGasUsed != block.Header.BlobGasUsed)
{
error = BlockErrorMessages.HeaderBlobGasMismatch;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private bool ValidateBlobGasFields(BlockHeader header, BlockHeader parentHeader,
return false;
}

ulong? expectedExcessBlobGas = BlobGasCalculator.CalculateExcessBlobGas(parentHeader, spec);
ulong? expectedExcessBlobGas = BlobGasCalculator.CalculateExcessBlobGas(parentHeader, spec, header);
if (header.ExcessBlobGas != expectedExcessBlobGas)
{
if (_logger.IsWarn) _logger.Warn($"ExcessBlobGas field is incorrect: {header.ExcessBlobGas}, should be {expectedExcessBlobGas}.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@ public ValidationResult IsWellFormed(Transaction transaction, IReleaseSpec relea
private ValidationResult ValidateBlobFields(Transaction transaction)
{
int blobCount = transaction.BlobVersionedHashes!.Length;
ulong totalDataGas = BlobGasCalculator.CalculateBlobGas(blobCount);
return totalDataGas > Eip4844Constants.MaxBlobGasPerTransaction ? TxErrorMessages.BlobTxGasLimitExceeded
: blobCount < Eip4844Constants.MinBlobsPerTransaction ? TxErrorMessages.BlobTxMissingBlobs
return blobCount < Eip4844Constants.MinBlobsPerTransaction ? TxErrorMessages.BlobTxMissingBlobs
: ValidateBlobVersionedHashes();

ValidationResult ValidateBlobVersionedHashes()
Expand Down
2 changes: 2 additions & 0 deletions src/Nethermind/Nethermind.Core/BlockHeader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public BlockHeader(

public string SealEngineType { get; set; } = Core.SealEngineType.Ethash;
public bool IsPostMerge { get; set; }
public ulong TargetBlobCount { get; set; }
public ulong MaxBlobCount { get; set; }

public string ToString(string indent)
{
Expand Down
30 changes: 1 addition & 29 deletions src/Nethermind/Nethermind.Core/Eip4844Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,6 @@ public class Eip4844Constants
/// <remarks>Defaults to 131072.</remarks>
public const ulong GasPerBlob = 131072;

/// <summary>
/// Gets the <c>MAX_BLOB_GAS_PER_BLOCK</c> parameter.
/// </summary>
/// <remarks>Defaults to 786432.</remarks>
public static ulong MaxBlobGasPerBlock { get; private set; } = 786432;

/// <summary>
/// Gets the <c>MAX_BLOB_GAS_PER_BLOCK</c> parameter.
/// </summary>
/// <remarks>The same as <see cref="MaxBlobGasPerBlock"/>.</remarks>
public static ulong MaxBlobGasPerTransaction => MaxBlobGasPerBlock;

/// <summary>
/// Gets the <c>TARGET_BLOB_GAS_PER_BLOCK</c> parameter.
/// </summary>
/// <remarks>Defaults to 393216.</remarks>
public static ulong TargetBlobGasPerBlock { get; private set; } = MaxBlobGasPerBlock / 2;

/// <summary>
/// Gets the <c>BLOB_GASPRICE_UPDATE_FRACTION</c> parameter.
/// </summary>
Expand All @@ -52,22 +34,12 @@ public class Eip4844Constants
// The parameter mutators are kept separate deliberately to ensure no accidental value changes.
public static void OverrideIfAny(
UInt256? blobGasPriceUpdateFraction = null,
ulong? maxBlobGasPerBlock = null,
UInt256? minBlobGasPrice = null,
ulong? targetBlobGasPerBlock = null)
UInt256? minBlobGasPrice = null)
{
if (blobGasPriceUpdateFraction.HasValue)
BlobGasPriceUpdateFraction = blobGasPriceUpdateFraction.Value;

if (maxBlobGasPerBlock.HasValue)
MaxBlobGasPerBlock = maxBlobGasPerBlock.Value;

if (minBlobGasPrice.HasValue)
MinBlobGasPrice = minBlobGasPrice.Value;

if (targetBlobGasPerBlock.HasValue)
TargetBlobGasPerBlock = targetBlobGasPerBlock.Value;
}

public static int GetMaxBlobsPerBlock() => (int)(MaxBlobGasPerBlock / GasPerBlob);
}
4 changes: 0 additions & 4 deletions src/Nethermind/Nethermind.Core/IEip4844Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@ namespace Nethermind.Core;
/// </summary>
public interface IEip4844Config
{
ulong MaxBlobGasPerBlock { get; }
ulong GasPerBlob { get; }
int GetMaxBlobsPerBlock();
}

public class ConstantEip4844Config : IEip4844Config
{
public ulong MaxBlobGasPerBlock => Eip4844Constants.MaxBlobGasPerBlock;
public ulong GasPerBlob => Eip4844Constants.GasPerBlob;
public int GetMaxBlobsPerBlock() => Eip4844Constants.GetMaxBlobsPerBlock();

static ConstantEip4844Config() => Instance = new ConstantEip4844Config();
private ConstantEip4844Config() { }
Expand Down
6 changes: 3 additions & 3 deletions src/Nethermind/Nethermind.Evm/BlobGasCalculator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static bool FakeExponentialOverflow(UInt256 factor, UInt256 num, UInt256 denomin
return !FakeExponentialOverflow(Eip4844Constants.MinBlobGasPrice, excessBlobGas, Eip4844Constants.BlobGasPriceUpdateFraction, out blobGasPricePerUnit);
}

public static ulong? CalculateExcessBlobGas(BlockHeader? parentBlockHeader, IReleaseSpec releaseSpec)
public static ulong? CalculateExcessBlobGas(BlockHeader? parentBlockHeader, IReleaseSpec releaseSpec, BlockHeader header)
{
if (!releaseSpec.IsEip4844Enabled)
{
Expand All @@ -102,8 +102,8 @@ static bool FakeExponentialOverflow(UInt256 factor, UInt256 num, UInt256 denomin

ulong excessBlobGas = parentBlockHeader.ExcessBlobGas ?? 0;
excessBlobGas += parentBlockHeader.BlobGasUsed ?? 0;
return excessBlobGas < Eip4844Constants.TargetBlobGasPerBlock
return excessBlobGas < header.TargetBlobCount * Eip4844Constants.GasPerBlob
? 0
: (excessBlobGas - Eip4844Constants.TargetBlobGasPerBlock);
: (excessBlobGas - header.TargetBlobCount * Eip4844Constants.GasPerBlob);
}
}
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Facade/BlockchainBridge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ private TransactionResult CallAndRestore(
{
callHeader.BlobGasUsed = BlobGasCalculator.CalculateBlobGas(transaction);
callHeader.ExcessBlobGas = treatBlockHeaderAsParentBlock
? BlobGasCalculator.CalculateExcessBlobGas(blockHeader, releaseSpec)
? BlobGasCalculator.CalculateExcessBlobGas(blockHeader, releaseSpec, blockHeader)
: blockHeader.ExcessBlobGas;
}
callHeader.MixHash = blockHeader.MixHash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,16 @@ private BlockHeader GetCallHeader(BlockStateCall<TransactionWithSourceDetails> b
MixHash = parent.MixHash,
IsPostMerge = parent.Difficulty == 0,
};
result.MaxBlobCount = parent.MaxBlobCount;
result.TargetBlobCount = parent.TargetBlobCount;
result.Timestamp = parent.Timestamp + 1;
result.BaseFeePerGas = block.BlockOverrides is { BaseFeePerGas: not null }
? block.BlockOverrides.BaseFeePerGas.Value
: !payloadValidation
? 0
: BaseFeeCalculator.Calculate(parent, spec);

result.ExcessBlobGas = spec.IsEip4844Enabled ? BlobGasCalculator.CalculateExcessBlobGas(parent, spec) : (ulong?)0;
result.ExcessBlobGas = spec.IsEip4844Enabled ? BlobGasCalculator.CalculateExcessBlobGas(parent, spec, result) : (ulong?)0;

return result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ BlockFeeHistorySearchInfo BlockFeeHistorySearchInfoFromBlock(Block b)
BaseFeeCalculator.Calculate(b.Header, _specProvider.GetSpecFor1559(b.Number + 1)),
blobGas == UInt256.MaxValue ? 0 : blobGas,
b.GasUsed / (double)b.GasLimit,
(b.BlobGasUsed ?? 0) / (double)Eip4844Constants.MaxBlobGasPerBlock,
(b.BlobGasUsed ?? 0) / (double)block.Header.MaxBlobCount * Eip4844Constants.GasPerBlob, // TODO: which value should be used here?
b.ParentHash,
b.GasUsed,
b.Transactions.Length,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected virtual void AmendHeader(BlockHeader blockHeader, BlockHeader parent)
if (spec.IsEip4844Enabled)
{
blockHeader.BlobGasUsed = 0;
blockHeader.ExcessBlobGas = BlobGasCalculator.CalculateExcessBlobGas(parent, spec);
blockHeader.ExcessBlobGas = BlobGasCalculator.CalculateExcessBlobGas(parent, spec, blockHeader);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ public byte[][] Transactions
[JsonIgnore]
public Hash256? ParentBeaconBlockRoot { get; set; }

public ulong TargetBlobCount { get; set; }

public ulong MaxBlobCount { get; set; }

public static ExecutionPayload Create(Block block) => Create<ExecutionPayload>(block);

protected static TExecutionPayload Create<TExecutionPayload>(Block block) where TExecutionPayload : ExecutionPayload, new()
Expand All @@ -131,6 +135,8 @@ public byte[][] Transactions
Timestamp = block.Timestamp,
BaseFeePerGas = block.BaseFeePerGas,
Withdrawals = block.Withdrawals,
TargetBlobCount = block.Header.TargetBlobCount,
MaxBlobCount = block.Header.MaxBlobCount,
};
executionPayload.SetTransactions(block.Transactions);
return executionPayload;
Expand Down Expand Up @@ -170,6 +176,8 @@ public virtual bool TryGetBlock([NotNullWhen(true)] out Block? block, UInt256? t
TotalDifficulty = totalDifficulty,
TxRoot = TxTrie.CalculateRoot(transactions),
WithdrawalsRoot = Withdrawals is null ? null : new WithdrawalTrie(Withdrawals).RootHash,
TargetBlobCount = TargetBlobCount,
MaxBlobCount = MaxBlobCount
};

block = new(header, transactions, Array.Empty<BlockHeader>(), Withdrawals);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,7 @@ private static void VerifyGnosisCancunSpecifics()
Assert.Multiple(() =>
{
Assert.That(Eip4844Constants.BlobGasPriceUpdateFraction, Is.EqualTo((UInt256)1112826));
Assert.That(Eip4844Constants.MaxBlobGasPerBlock, Is.EqualTo(262144));
Assert.That(Eip4844Constants.MinBlobGasPrice, Is.EqualTo(1.GWei()));
Assert.That(Eip4844Constants.TargetBlobGasPerBlock, Is.EqualTo(131072));
});
}

Expand Down Expand Up @@ -430,9 +428,7 @@ private static void CompareSpecs(IReleaseSpec expectedSpec, IReleaseSpec actualS

// Skip EIP-4844 parameter validation
.Where(p => p.Name != nameof(Eip4844Constants.BlobGasPriceUpdateFraction))
.Where(p => p.Name != nameof(Eip4844Constants.MaxBlobGasPerBlock))
.Where(p => p.Name != nameof(Eip4844Constants.MinBlobGasPrice))
.Where(p => p.Name != nameof(Eip4844Constants.TargetBlobGasPerBlock))

// handle gnosis specific exceptions
.Where(p => !isGnosis || p.Name != nameof(IReleaseSpec.MaxCodeSize))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ bool GetForInnerPathExistence(KeyValuePair<string, JsonElement> o) =>

Eip4844Constants.OverrideIfAny(
chainSpec.Parameters.Eip4844BlobGasPriceUpdateFraction,
chainSpec.Parameters.Eip4844MaxBlobGasPerBlock,
chainSpec.Parameters.Eip4844MinBlobGasPrice,
chainSpec.Parameters.Eip4844TargetBlobGasPerBlock);
chainSpec.Parameters.Eip4844MinBlobGasPrice);
}

private static void ValidateParams(ChainSpecParamsJson parameters)
Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.TxPool/TxPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private void ReAddReorganisedTransactions(Block? previousBlock)
private void RemoveProcessedTransactions(Block block)
{
Transaction[] blockTransactions = block.Transactions;
using ArrayPoolList<Transaction> blobTxsToSave = new(Eip4844Constants.GetMaxBlobsPerBlock());
using ArrayPoolList<Transaction> blobTxsToSave = new((int) block.Header.MaxBlobCount); // TODO: MaxBlobCount is used only here?
long discoveredForPendingTxs = 0;
long discoveredForHashCache = 0;
long eip1559Txs = 0;
Expand Down
Loading