-
Notifications
You must be signed in to change notification settings - Fork 463
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
eip 7840 implementation #7964
base: master
Are you sure you want to change the base?
eip 7840 implementation #7964
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good, but please add tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, as discussed. i dont think we need the EIP7840 enabled. we can just replace the constants with whatever we push in the chainspec for the cancun through the same mechanism
# Conflicts: # src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainParameters.cs
src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpecBasedSpecProvider.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpecLoader.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Blockchain.Test/Validators/TxValidatorTests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Blockchain.Test/Validators/ShardBlobBlockValidatorTests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Blockchain.Test/Validators/TxValidatorTests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Evm.Test/TransactionProcessorEip4844Tests.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.JsonRpc.Test/Modules/Eth/EthRpcModuleTests.FeeHistory.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.JsonRpc.Test/Modules/Eth/EthRpcModuleTests.cs
Outdated
Show resolved
Hide resolved
@@ -20,7 +20,7 @@ public class PooledTxsRequestor(ITxPool txPool, ITxPoolConfig txPoolConfig) : IP | |||
private readonly long _configuredMaxTxSize = txPoolConfig.MaxTxSize ?? long.MaxValue; | |||
|
|||
private readonly long _configuredMaxBlobTxSize = txPoolConfig.MaxBlobTxSize is not null | |||
? txPoolConfig.MaxBlobTxSize.Value + (long)Eip4844Constants.MaxBlobGasPerBlock : long.MaxValue; | |||
? txPoolConfig.MaxBlobTxSize.Value + (long)Eip4844Constants.GasPerBlob * 6 : long.MaxValue; // ToDo Yerken * 6 is incorrect here, quick fix to compile the project |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs to be addressed, but how?
@@ -282,10 +283,10 @@ public async Task SendData( | |||
|
|||
if (defaultMaxFeePerBlobGas is null) | |||
{ | |||
ulong excessBlobsReserve = 2 * Eip4844Constants.TargetBlobGasPerBlock; | |||
ulong excessBlobsReserve = 2 * Cancun.Instance.TargetBlobCount; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we might need to change this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we add spec as command line param to this tool
src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/PooledTxsRequestor.cs
Outdated
Show resolved
Hide resolved
spec.TargetBlobCount = 3; | ||
spec.MaxBlobCount = 6; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they should be zero as written here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, according to the EIP it should be zero
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed back to zero
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MarekM25 did this i think to fix hive tests. For hive, i think we should specifiy them in its chainspec
src/Nethermind/Nethermind.Network/P2P/Subprotocols/Eth/PooledTxsRequestor.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Chains/gnosis.json
Outdated
@@ -97,7 +97,8 @@ | |||
"cancun": { | |||
"target": 1, | |||
"max": 2 | |||
} | |||
}, | |||
"eip7840DefaultBlobCountFraction": 3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we really need this variable?
Closes #9129
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?
Notes on testing
Optional. Remove if not applicable.
Documentation
Requires documentation update
If yes, link the PR to the docs update or the issue with the details labeled
docs
. Remove if not applicable.Requires explanation in Release Notes
If yes, fill in the details here. Remove if not applicable.
Remarks
Optional. Remove if not applicable.