SecondsPerSlot move to BlocksConfig #4944

smartprogrammer93 · 2022-11-29T12:13:25Z

Resolves #4871

Changes:

SecondsPerSlot moved to BlocksConfig while deprecating it in MergeConfig.
Passed HiveTest

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Documentation Update
Code style update (formatting, renaming)
Refactoring (no functional changes, no api changes)
Build related changes
Other (please describe):

Testing

Requires testing

Yes
No

In case you checked yes, did you write tests??

Yes
No

asdacap · 2022-12-05T12:12:42Z

src/Nethermind/Nethermind.Consensus/Producers/DevBlockProducer.cs

@@ -7,6 +7,7 @@
 using Nethermind.Consensus.Transactions;
 using Nethermind.Core;
 using Nethermind.Core.Specs;
+using Nethermind.Evm;


Whats with these new using(s)?

Had to move IBlocksConfig to EVM project

Do we have to? Maybe we don't have to pass IBlockCofnig everywhere, just the actual SecondsPerBlock? Do we need IBLockConfig at all then?

Isn't the idea of the Configs that they can be accessed where needed?

made more sense to put it inside the config project since it is not related to the EVM so i moved it there.

src/Nethermind/Nethermind.Merge.Plugin/IMergeConfig.cs

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs

asdacap · 2022-12-05T13:55:28Z

src/Nethermind/Nethermind.Config/ConfigExtensions.cs

+        Type type = config.GetType();
+        Type interfaceType = type.GetInterface($"I{type.Name}");
+        PropertyInfo propertyInfo = interfaceType.GetProperty(propertyName);
+        ConfigItemAttribute attribute = propertyInfo.GetCustomAttribute<ConfigItemAttribute>();


Is it not inherited? https://stackoverflow.com/questions/1123563/are-method-attributes-inherited-in-c

It should be, but i tried it, and it did not work.

Don't you need to provide a 2nd parameter true to get inheritance?

https://learn.microsoft.com/en-us/dotnet/api/system.reflection.customattributeextensions.getcustomattribute?view=net-7.0#system-reflection-customattributeextensions-getcustomattribute-1(system-reflection-memberinfo-system-boolean)

@LukaszRozmej i did, it still did not return the attribute. i even went and specified that the attributed is inherited at its definition but still it did not work

src/Nethermind/Nethermind.Config/ConfigExtensions.cs

rubo · 2022-12-12T23:28:28Z

@MarekM25 Any comments on this?

MarekM25 · 2022-12-16T15:50:36Z

src/Nethermind/Nethermind.Config/BlocksConfig.cs


-namespace Nethermind.Consensus
+namespace Nethermind.Config


Why BlocksConfig moved to Nethermind.Config?

Because it is needed in projects that do not reference Consensus

Isn't IBlockConfig sufficient for this?

@LukaszRozmej It is, but i dont see why we would move the interface without moving the implementation class

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs

MarekM25 · 2022-12-16T15:57:31Z

src/Nethermind/Nethermind.Config/ConfigExtensions.cs

+{
+    public static T GetDefaultValue<T>(this IConfig config, string propertyName)
+    {
+        Type type = config.GetType();


…ion_fix' into fix/slotTime_to_be_in_init_config_instead_of_merge

…of_merge

codecov · 2022-12-28T14:16:05Z

Codecov Report

❗ No coverage uploaded for pull request base (fix/forkId_calculation_is_wrong_after_timestamp_activation_fix@25f696a). Click here to learn what that means.
Patch has no changes to coverable lines.

❗ Current head 0f0a443 differs from pull request most recent head dc6dfdd. Consider uploading reports for the commit dc6dfdd to get more accurate results

Additional details and impacted files

@@                                        Coverage Diff                                        @@
##             fix/forkId_calculation_is_wrong_after_timestamp_activation_fix    #4944   +/-   ##
=================================================================================================
  Coverage                                                                  ?   66.75%           
=================================================================================================
  Files                                                                     ?     1967           
  Lines                                                                     ?    70327           
  Branches                                                                  ?    13085           
=================================================================================================
  Hits                                                                      ?    46950           
  Misses                                                                    ?    19407           
  Partials                                                                  ?     3970

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

…of_merge

…after_timestamp_activation_fix' into fix/slotTime_to_be_in_init_config_instead_of_merge

LukaszRozmej · 2022-12-30T18:15:09Z

src/Nethermind/Nethermind.Config/BlocksConfig.cs


-namespace Nethermind.Consensus
+namespace Nethermind.Config


Isn't IBlockConfig sufficient for this?

LukaszRozmej · 2022-12-31T02:28:48Z

src/Nethermind/Nethermind.Config/ConfigExtensions.cs

+        Type type = config.GetType();
+        Type interfaceType = type.GetInterface($"I{type.Name}");
+        PropertyInfo propertyInfo = interfaceType.GetProperty(propertyName);
+        ConfigItemAttribute attribute = propertyInfo.GetCustomAttribute<ConfigItemAttribute>();


Don't you need to provide a 2nd parameter true to get inheritance?

https://learn.microsoft.com/en-us/dotnet/api/system.reflection.customattributeextensions.getcustomattribute?view=net-7.0#system-reflection-customattributeextensions-getcustomattribute-1(system-reflection-memberinfo-system-boolean)

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs

LukaszRozmej · 2022-12-31T02:31:58Z

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs

+                }
+                else if (_mergeConfig.SecondsPerSlot == defaultValue)
+                {
+                    _mergeConfig.SecondsPerSlot = _blocksConfig.SecondsPerSlot;


I find this going both ways somewhat disturbing. MergeConfig.SecondsPerSlot shouldn't be used anymore, right?

That is correct, but i followed the same think we are doing with with MiningConfig and BlockConfig . you can check it here.
https://github.com/NethermindEth/nethermind/blob/master/src/Nethermind/Nethermind.Init/Steps/MigrateConfigs.cs

smartprogrammer93 · 2023-01-01T18:35:02Z

Merging since already added tests and got enough approvals. will adjust in the target branch if any is needed.

* More test fixes * Fix for init and meter * Make withdrawals decoding optional * include 4895 in chainspecParameters * introduce WithdrawalTimestamp * Fix `PayloadAttributes` handling when null * Fix withdrawals length calculation * Refactor and add checks for withdrawals for RPC methods of v1 * Add engine_getPayloadV2 * Format whitespaces * Refactor and remove redundant "V1" * started adding Enginge V2 tests - V2_processing_block_should_serialize_valid_responses * formatting * formatting * Implement withdrawal root validation * working on tests and fixes * fix block for processing * BlockValidator WithdrawalRoot * Fix withdrawal trie proof validation * add WithdrawalApplier * Remove redundant withdrawals hash check * Remove withdrawal check for null * Add withdrawals test chain spec * Reformat whitespaces * add withdrawalApplier to blockchainProcessor * add withdrawals to ExecutionPayload * test fixes * fix EVM.test * fix EthereumTests * fix Benchmarks.sln * Revise withdrawals representation according to the spec and refactor * Rename `IWithdrawalApplier` to `IWithdrawalProcessor` * Add tests for withdrawal encoding/decoding * Rename `Recipient` to `Address` * Reformat whitespaces * Revise withdrawals length calculation in block encoding * HasBody? * Remove redundant withdrawals hash check * fix withdrawals_test chainspec && added IReleaseSpec.WithdrawalsEnabled * Fixes * fix GenesisLoader * fix extra-data * Refactor withdrawal validation by implementing `IWithdrawalValidator` * Fix failing tests * Reformat whitespaces * fix withdrawalsTimestamp * temporary change validation * null handling? * Applying Marek's suggestion. Not sure about this one * Fix Ethereum tests * Fix test cases * Fix benchmark build * Fix payload attributes validation * Remove "V1" from `IForkchoiceUpdatedHandler` name * Update tests * hack AuRa tests for now * fix more tests * fix more tests * fix build * + fix one more tests * fix Synchronization tests * Update tests to 0aa59689101f64cab8fa1526d9cf6e647ddba946 * fixed withdrawal chainspec * withdrawals block validator tests * Implement Engine API tests * Reformat code * fix chainspec? * Fix withdrawals decoding * fix chainspec timestamp * Add and fix Engine API tests * Revise block decoder tests * Revise file headers * Revise file headers * Add missing file headers * fix AuRa test * adjusting comments * load genesis tests * Lukasz suggestions * formating * Fix build * withdrawals_hivetests.json + cosmetic * Add more unit tests * spacing * Try on fixing timestamp activation with same value as genesis timestamp * Fix gnosis and chiado ForkId Calculations * fix tests * Cleanup and more tests * Janky but working solution to very rare edge case? * Fix flakiness of caused by Parallelizable * adding engine tests * working on more tests * add loop in test * Can_apply_withdrawals_correctly test * more test cases * Update withdrawals hive tests configuration * Refactor and fix some null reference warnings * Expose withdrawals to JSON-RPC modules * Fix broken tests * Revise `ForkchoiceUpdatedHandler` string output * fix Can_apply_withdrawals_correctly * fix whitespaces * fix whitespaces * more whitespaces fixes * work on Withdrawals_transition test cases * adjust CustomSpecProvider * Introduce IEip1995Spec * small changes in tests * Fix license * add comments * Apply Marek Suggestion * Adjust Lic to Rubo * Marek Suggestions * Fix * fix withdrawals in ChainLevelHelper * fix hive sync tests * fix? * Revise withdrawals root hash encoding/decoding and its tests * fix PayloadAttributes ToString * add more temp logs to investigate hive tests * more logs * revert not needed logs * fix test * ignore incorrect tests * Fix tests broken by withdrawals decoding revision * Revise file headers * Final appraoch, removed GetSpec complexity * Forgotten changes * SecondsPerSlot to BlocksConfig * Minor + config changes * Typo fix * remove empty line * Move BlocksConfig to Nethermind.Config project * Benchmark build fix * Rename `ExecutionPayloadV1` to `ExecutionPayloadV2` * Revise withdrawals check * Refactor tests * Optimize withdrawals root hash decoding in block header * Implements ForkId tests that are ub EIP-6122 * Spacing * Fix build * Fix ForkId Test case * Removing 3675 and using MergeForkId Transition * Final test fix * Fix tests * Rename `ExecutionPayloadV2` to `ExecutionPayload` * add one more line in Nlog (temp) * Revert NLog for jsonRpc * fix missing body? * adjust TxPool logs * Add more test cases for `BlockBodiesMessageSerializer` * Add tests for `BlockHeader.HasBody` * Revise `null` handling for `BlockHeader.HasBody` * fix BlockBody empty * cosmetic * fix CI * Revise tests * Update null checks with pattern matching * Refactor block body initialization and add tests * Revise whitespaces * cosmetic * ForkId calculation polish (#5068) * Refactor - mainly ChainSpecBasedSpecProvider * fixes * Better warning message * Simplify sanity check * one more simplification * Revise Clique block production according to withdrawals rules * Add withdrawals to `eth_getBlockByNumber` tests * SecondsPerSlot move to BlocksConfig (#4944) Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: lukasz.rozmej <lukasz.rozmej@gmail.com> Resolves #4871 * fix build * removed duplicated NSubstitute * Add missing file headers * resolved some review comments * more review comments * more review related changes * fix Benchmarks build * Refactor tests * refactor tests - review comment * cosmetic * Revise suggested block validation messages * Refactor patricia tries * fix InvalidBlockInterceptor for Withdrawals * fix whitespaces * fix tests Co-authored-by: smartprogrammer <smartprogrammer@windowslive.com> Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Ahmad Bitar <33181301+smartprogrammer93@users.noreply.github.com>

* Add engine_getPayloadV2 * Format whitespaces * Refactor and remove redundant "V1" * started adding Enginge V2 tests - V2_processing_block_should_serialize_valid_responses * formatting * formatting * Implement withdrawal root validation * working on tests and fixes * fix block for processing * BlockValidator WithdrawalRoot * Fix withdrawal trie proof validation * add WithdrawalApplier * Remove redundant withdrawals hash check * Remove withdrawal check for null * Add withdrawals test chain spec * Reformat whitespaces * add withdrawalApplier to blockchainProcessor * add withdrawals to ExecutionPayload * test fixes * fix EVM.test * fix EthereumTests * fix Benchmarks.sln * Revise withdrawals representation according to the spec and refactor * Rename `IWithdrawalApplier` to `IWithdrawalProcessor` * Add tests for withdrawal encoding/decoding * Rename `Recipient` to `Address` * Reformat whitespaces * Revise withdrawals length calculation in block encoding * HasBody? * Remove redundant withdrawals hash check * fix withdrawals_test chainspec && added IReleaseSpec.WithdrawalsEnabled * Fixes * fix GenesisLoader * fix extra-data * Refactor withdrawal validation by implementing `IWithdrawalValidator` * Fix failing tests * Reformat whitespaces * fix withdrawalsTimestamp * temporary change validation * null handling? * Applying Marek's suggestion. Not sure about this one * Fix Ethereum tests * Fix test cases * Fix benchmark build * Fix payload attributes validation * Remove "V1" from `IForkchoiceUpdatedHandler` name * Update tests * hack AuRa tests for now * fix more tests * fix more tests * fix build * + fix one more tests * fix Synchronization tests * Update tests to 0aa59689101f64cab8fa1526d9cf6e647ddba946 * fixed withdrawal chainspec * withdrawals block validator tests * Implement Engine API tests * Reformat code * fix chainspec? * Fix withdrawals decoding * fix chainspec timestamp * Add and fix Engine API tests * Revise block decoder tests * Revise file headers * Revise file headers * Add missing file headers * fix AuRa test * adjusting comments * load genesis tests * Lukasz suggestions * formating * Fix build * withdrawals_hivetests.json + cosmetic * Add more unit tests * spacing * Try on fixing timestamp activation with same value as genesis timestamp * Fix gnosis and chiado ForkId Calculations * fix tests * Cleanup and more tests * Janky but working solution to very rare edge case? * Fix flakiness of caused by Parallelizable * Correct usage of chain ID and network ID * adding engine tests * working on more tests * add loop in test * Can_apply_withdrawals_correctly test * more test cases * Update withdrawals hive tests configuration * Refactor and fix some null reference warnings * Expose withdrawals to JSON-RPC modules * Fix broken tests * Revise `ForkchoiceUpdatedHandler` string output * fix Can_apply_withdrawals_correctly * fix whitespaces * fix whitespaces * more whitespaces fixes * add more tests * Fix chainId loading from spec * Rename for clarity * work on Withdrawals_transition test cases * adjust CustomSpecProvider * Introduce IEip1995Spec * Make test NetworkId vs ChainId different Changing ChainId to another number breaks a lot of test, that are based to hashes and RLP. Let at least test if the values differ * small changes in tests * Fix license * add comments * Apply Marek Suggestion * Adjust Lic to Rubo * Marek Suggestions * Fix * fix withdrawals in ChainLevelHelper * Fix chainid for account abstraction; add and improve tests; fix a tutorial link * Fix naming in other projects, whitespaces * Fix more renaming * fix hive sync tests * fix? * Revise withdrawals root hash encoding/decoding and its tests * fix PayloadAttributes ToString * add more temp logs to investigate hive tests * more logs * revert not needed logs * fix test * ignore incorrect tests * Fix tests broken by withdrawals decoding revision * Revise file headers * Final appraoch, removed GetSpec complexity * Forgotten changes * SecondsPerSlot to BlocksConfig * Minor + config changes * Typo fix * remove empty line * Move BlocksConfig to Nethermind.Config project * Benchmark build fix * Rename `ExecutionPayloadV1` to `ExecutionPayloadV2` * Revise withdrawals check * Refactor tests * Optimize withdrawals root hash decoding in block header * Implements ForkId tests that are ub EIP-6122 * Spacing * Fix build * Fix ForkId Test case * Removing 3675 and using MergeForkId Transition * Final test fix * Fix tests * Rename `ExecutionPayloadV2` to `ExecutionPayload` * add one more line in Nlog (temp) * Revert NLog for jsonRpc * fix missing body? * adjust TxPool logs * Add more test cases for `BlockBodiesMessageSerializer` * Add tests for `BlockHeader.HasBody` * Revise `null` handling for `BlockHeader.HasBody` * fix BlockBody empty * cosmetic * fix CI * Revise tests * Update null checks with pattern matching * Refactor block body initialization and add tests * Revise whitespaces * cosmetic * ForkId calculation polish (#5068) * Refactor - mainly ChainSpecBasedSpecProvider * fixes * Better warning message * Simplify sanity check * one more simplification * Revise Clique block production according to withdrawals rules * Add withdrawals to `eth_getBlockByNumber` tests * SecondsPerSlot move to BlocksConfig (#4944) Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: lukasz.rozmej <lukasz.rozmej@gmail.com> Resolves #4871 * fix build * removed duplicated NSubstitute * Fix network id in node info * Rollback spec change * Rename NetworkId class to BlockchainIds; more renaming and usage of TestBlockChainIds * Improve a test * Fix chainid/networkid usage * Refactors * Improve CustomSpecProvider ctor * Use test provider * ethstats fix * whitespace * Fix Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: smartprogrammer <smartprogrammer@windowslive.com> Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Ahmad Bitar <33181301+smartprogrammer93@users.noreply.github.com>

…4867) * add WithdrawalApplier * Remove redundant withdrawals hash check * Remove withdrawal check for null * Add withdrawals test chain spec * Reformat whitespaces * add withdrawalApplier to blockchainProcessor * add withdrawals to ExecutionPayload * test fixes * fix EVM.test * fix EthereumTests * fix Benchmarks.sln * Revise withdrawals representation according to the spec and refactor * Rename `IWithdrawalApplier` to `IWithdrawalProcessor` * Add tests for withdrawal encoding/decoding * Rename `Recipient` to `Address` * Reformat whitespaces * Revise withdrawals length calculation in block encoding * HasBody? * Remove redundant withdrawals hash check * fix withdrawals_test chainspec && added IReleaseSpec.WithdrawalsEnabled * Fixes * fix GenesisLoader * fix extra-data * Refactor withdrawal validation by implementing `IWithdrawalValidator` * Fix failing tests * Reformat whitespaces * fix withdrawalsTimestamp * temporary change validation * null handling? * Applying Marek's suggestion. Not sure about this one * Fix Ethereum tests * Fix test cases * Fix benchmark build * Fix payload attributes validation * Remove "V1" from `IForkchoiceUpdatedHandler` name * Update tests * hack AuRa tests for now * fix more tests * fix more tests * fix build * + fix one more tests * fix Synchronization tests * Update tests to 0aa59689101f64cab8fa1526d9cf6e647ddba946 * fixed withdrawal chainspec * withdrawals block validator tests * Implement Engine API tests * Reformat code * fix chainspec? * Fix withdrawals decoding * fix chainspec timestamp * Add and fix Engine API tests * Revise block decoder tests * Revise file headers * Revise file headers * Add missing file headers * fix AuRa test * adjusting comments * load genesis tests * Lukasz suggestions * formating * Fix build * withdrawals_hivetests.json + cosmetic * Add more unit tests * spacing * Try on fixing timestamp activation with same value as genesis timestamp * Fix gnosis and chiado ForkId Calculations * fix tests * Cleanup and more tests * Janky but working solution to very rare edge case? * Fix flakiness of caused by Parallelizable * Correct usage of chain ID and network ID * adding engine tests * working on more tests * add loop in test * Can_apply_withdrawals_correctly test * more test cases * Update withdrawals hive tests configuration * Refactor and fix some null reference warnings * Expose withdrawals to JSON-RPC modules * Fix broken tests * Revise `ForkchoiceUpdatedHandler` string output * fix Can_apply_withdrawals_correctly * fix whitespaces * fix whitespaces * more whitespaces fixes * add more tests * Fix chainId loading from spec * Rename for clarity * work on Withdrawals_transition test cases * adjust CustomSpecProvider * Introduce IEip1995Spec * Make test NetworkId vs ChainId different Changing ChainId to another number breaks a lot of test, that are based to hashes and RLP. Let at least test if the values differ * small changes in tests * Fix license * add comments * Apply Marek Suggestion * Adjust Lic to Rubo * Marek Suggestions * Fix * fix withdrawals in ChainLevelHelper * Fix chainid for account abstraction; add and improve tests; fix a tutorial link * Fix naming in other projects, whitespaces * Fix more renaming * fix hive sync tests * fix? * Revise withdrawals root hash encoding/decoding and its tests * fix PayloadAttributes ToString * add more temp logs to investigate hive tests * more logs * revert not needed logs * fix test * ignore incorrect tests * Fix tests broken by withdrawals decoding revision * Revise file headers * Final appraoch, removed GetSpec complexity * Forgotten changes * SecondsPerSlot to BlocksConfig * Minor + config changes * Typo fix * remove empty line * Move BlocksConfig to Nethermind.Config project * Benchmark build fix * Rename `ExecutionPayloadV1` to `ExecutionPayloadV2` * Revise withdrawals check * Refactor tests * Optimize withdrawals root hash decoding in block header * Add fields, spec, header encoding * Implements ForkId tests that are ub EIP-6122 * Spacing * Fix build * Fix ForkId Test case * Removing 3675 and using MergeForkId Transition * Final test fix * Fix tests * Rename `ExecutionPayloadV2` to `ExecutionPayload` * add one more line in Nlog (temp) * Revert NLog for jsonRpc * fix missing body? * adjust TxPool logs * Add more test cases for `BlockBodiesMessageSerializer` * Add tests for `BlockHeader.HasBody` * Revise `null` handling for `BlockHeader.HasBody` * fix BlockBody empty * cosmetic * fix CI * Revise tests * Update null checks with pattern matching * Refactor block body initialization and add tests * Revise whitespaces * cosmetic * ForkId calculation polish (#5068) * Refactor - mainly ChainSpecBasedSpecProvider * fixes * Better warning message * Simplify sanity check * one more simplification * Revise Clique block production according to withdrawals rules * Add withdrawals to `eth_getBlockByNumber` tests * SecondsPerSlot move to BlocksConfig (#4944) Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: lukasz.rozmej <lukasz.rozmej@gmail.com> Resolves #4871 * fix build * removed duplicated NSubstitute * Fix network id in node info * Rollback spec change * Rename NetworkId class to BlockchainIds; more renaming and usage of TestBlockChainIds * Improve a test * Fix chainid/networkid usage * Refactors * Improve CustomSpecProvider ctor * Use test provider * ethstats fix * whitespace * Fix * Fix header encoding: loading from genesis * Remove fork, simplify codfe, fix merge conflicts * Improve tests, fix spaces * Fix whitespaces * Fix tests * Fix space * Fix Rlp for headers Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> Co-authored-by: smartprogrammer <smartprogrammer@windowslive.com> Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Ahmad Bitar <33181301+smartprogrammer93@users.noreply.github.com>

* Reformat whitespaces * add withdrawalApplier to blockchainProcessor * add withdrawals to ExecutionPayload * test fixes * fix EVM.test * fix EthereumTests * fix Benchmarks.sln * Revise withdrawals representation according to the spec and refactor * Rename `IWithdrawalApplier` to `IWithdrawalProcessor` * Add tests for withdrawal encoding/decoding * Rename `Recipient` to `Address` * Reformat whitespaces * Revise withdrawals length calculation in block encoding * HasBody? * Remove redundant withdrawals hash check * fix withdrawals_test chainspec && added IReleaseSpec.WithdrawalsEnabled * Fixes * fix GenesisLoader * fix extra-data * Refactor withdrawal validation by implementing `IWithdrawalValidator` * Fix failing tests * Reformat whitespaces * fix withdrawalsTimestamp * temporary change validation * null handling? * Applying Marek's suggestion. Not sure about this one * Fix Ethereum tests * Fix test cases * Fix benchmark build * Fix payload attributes validation * Remove "V1" from `IForkchoiceUpdatedHandler` name * Update tests * hack AuRa tests for now * fix more tests * fix more tests * fix build * + fix one more tests * fix Synchronization tests * Update tests to 0aa59689101f64cab8fa1526d9cf6e647ddba946 * fixed withdrawal chainspec * withdrawals block validator tests * Implement Engine API tests * Reformat code * fix chainspec? * Fix withdrawals decoding * fix chainspec timestamp * Add and fix Engine API tests * Revise block decoder tests * Revise file headers * Revise file headers * Add missing file headers * fix AuRa test * adjusting comments * load genesis tests * Lukasz suggestions * formating * Fix build * withdrawals_hivetests.json + cosmetic * Add more unit tests * spacing * Try on fixing timestamp activation with same value as genesis timestamp * Fix gnosis and chiado ForkId Calculations * fix tests * Cleanup and more tests * Janky but working solution to very rare edge case? * Fix flakiness of caused by Parallelizable * Correct usage of chain ID and network ID * adding engine tests * working on more tests * add loop in test * Can_apply_withdrawals_correctly test * more test cases * Update withdrawals hive tests configuration * Refactor and fix some null reference warnings * Expose withdrawals to JSON-RPC modules * Fix broken tests * Revise `ForkchoiceUpdatedHandler` string output * fix Can_apply_withdrawals_correctly * fix whitespaces * fix whitespaces * more whitespaces fixes * add more tests * Fix chainId loading from spec * Rename for clarity * work on Withdrawals_transition test cases * adjust CustomSpecProvider * Introduce IEip1995Spec * Make test NetworkId vs ChainId different Changing ChainId to another number breaks a lot of test, that are based to hashes and RLP. Let at least test if the values differ * small changes in tests * Fix license * add comments * Apply Marek Suggestion * Adjust Lic to Rubo * Marek Suggestions * Fix * fix withdrawals in ChainLevelHelper * Fix chainid for account abstraction; add and improve tests; fix a tutorial link * Fix naming in other projects, whitespaces * Fix more renaming * fix hive sync tests * fix? * Revise withdrawals root hash encoding/decoding and its tests * fix PayloadAttributes ToString * add more temp logs to investigate hive tests * more logs * revert not needed logs * fix test * ignore incorrect tests * Fix tests broken by withdrawals decoding revision * Revise file headers * Final appraoch, removed GetSpec complexity * Forgotten changes * SecondsPerSlot to BlocksConfig * Minor + config changes * Typo fix * remove empty line * Move BlocksConfig to Nethermind.Config project * Benchmark build fix * Rename `ExecutionPayloadV1` to `ExecutionPayloadV2` * Revise withdrawals check * Refactor tests * Optimize withdrawals root hash decoding in block header * Add fields, spec, header encoding * Implements ForkId tests that are ub EIP-6122 * Spacing * Fix build * Fix ForkId Test case * Removing 3675 and using MergeForkId Transition * Final test fix * Fix tests * Rename `ExecutionPayloadV2` to `ExecutionPayload` * add one more line in Nlog (temp) * Revert NLog for jsonRpc * fix missing body? * adjust TxPool logs * Add more test cases for `BlockBodiesMessageSerializer` * Add tests for `BlockHeader.HasBody` * Revise `null` handling for `BlockHeader.HasBody` * fix BlockBody empty * cosmetic * fix CI * Revise tests * Update null checks with pattern matching * Refactor block body initialization and add tests * Revise whitespaces * cosmetic * ForkId calculation polish (#5068) * Refactor - mainly ChainSpecBasedSpecProvider * fixes * Better warning message * Simplify sanity check * one more simplification * Revise Clique block production according to withdrawals rules * Add withdrawals to `eth_getBlockByNumber` tests * SecondsPerSlot move to BlocksConfig (#4944) Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: lukasz.rozmej <lukasz.rozmej@gmail.com> Resolves #4871 * fix build * removed duplicated NSubstitute * Fix network id in node info * Rollback spec change * Rename NetworkId class to BlockchainIds; more renaming and usage of TestBlockChainIds * Improve a test * Fix chainid/networkid usage * Refactors * Improve CustomSpecProvider ctor * Use test provider * ethstats fix * whitespace * Fix * Fix header encoding: loading from genesis * Remove fork, simplify codfe, fix merge conflicts * Improve tests, fix spaces * Fix whitespaces * Fix tests * Fix space * Fix Rlp for headers * Add DATAHASH opcode * LogFinder should be initialized befre UserOperationPools * Fix postmerge * Add no blobs for benchmarks, let's add it with DATAHASH benchmarks Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> Co-authored-by: MarekM25 <marekm2504@gmail.com> Co-authored-by: smartprogrammer <smartprogrammer@windowslive.com> Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Ahmad Bitar <33181301+smartprogrammer93@users.noreply.github.com>

smartprogrammer93 force-pushed the fix/slotTime_to_be_in_init_config_instead_of_merge branch 2 times, most recently from d8214bd to 6c965ea Compare November 29, 2022 15:55

smartprogrammer93 marked this pull request as ready for review November 29, 2022 15:57

asdacap reviewed Dec 5, 2022

View reviewed changes

src/Nethermind/Nethermind.Merge.Plugin/IMergeConfig.cs Outdated Show resolved Hide resolved

asdacap reviewed Dec 5, 2022

View reviewed changes

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs Outdated Show resolved Hide resolved

asdacap reviewed Dec 5, 2022

View reviewed changes

smartprogrammer93 requested a review from MarekM25 December 6, 2022 15:18

rubo requested changes Dec 7, 2022

View reviewed changes

src/Nethermind/Nethermind.Config/ConfigExtensions.cs Outdated Show resolved Hide resolved

smartprogrammer93 added 4 commits December 8, 2022 01:07

SecondsPerSlot to BlocksConfig

3bac96d

Minor + config changes

78a9912

Typo fix

1a454ba

remove empty line

ebc1808

smartprogrammer93 force-pushed the fix/slotTime_to_be_in_init_config_instead_of_merge branch from ba215bc to ebc1808 Compare December 7, 2022 22:09

smartprogrammer93 requested a review from rubo December 7, 2022 22:11

smartprogrammer93 added 2 commits December 8, 2022 01:19

Move BlocksConfig to Nethermind.Config project

1c41c4b

Benchmark build fix

4c86a4f

smartprogrammer93 mentioned this pull request Dec 8, 2022

Shanghai/Cancun tracking issue #4583

Closed

smartprogrammer93 requested review from asdacap and LukaszRozmej December 9, 2022 13:49

rubo approved these changes Dec 12, 2022

View reviewed changes

MarekM25 reviewed Dec 16, 2022

View reviewed changes

src/Nethermind/Nethermind.Merge.Plugin/MergePlugin.cs Outdated Show resolved Hide resolved

MarekM25 reviewed Dec 16, 2022

View reviewed changes

smartprogrammer93 and others added 3 commits December 28, 2022 08:56

Merge Tracking Branch

cb2469d

Merge branch 'fix/forkId_calculation_is_wrong_after_timestamp_activat…

1bc58d6

…ion_fix' into fix/slotTime_to_be_in_init_config_instead_of_merge

Merge branch 'master' into fix/slotTime_to_be_in_init_config_instead_…

5a0577e

…of_merge

Merge branch 'master' into fix/slotTime_to_be_in_init_config_instead_…

31ffc99

…of_merge

Merge remote-tracking branch 'origin/fix/forkId_calculation_is_wrong_…

988f931

…after_timestamp_activation_fix' into fix/slotTime_to_be_in_init_config_instead_of_merge

LukaszRozmej approved these changes Dec 31, 2022

View reviewed changes

Add tests for getDefaultValue and MigrateSecondsPerSlot

dc6dfdd

smartprogrammer93 merged commit f0d2f6a into fix/forkId_calculation_is_wrong_after_timestamp_activation_fix Jan 1, 2023

smartprogrammer93 deleted the fix/slotTime_to_be_in_init_config_instead_of_merge branch January 1, 2023 18:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SecondsPerSlot move to BlocksConfig #4944

SecondsPerSlot move to BlocksConfig #4944

smartprogrammer93 commented Nov 29, 2022 •

edited

Loading

asdacap Dec 5, 2022

smartprogrammer93 Dec 5, 2022

LukaszRozmej Dec 6, 2022

smartprogrammer93 Dec 6, 2022

smartprogrammer93 Dec 7, 2022

asdacap Dec 5, 2022

smartprogrammer93 Dec 6, 2022

LukaszRozmej Dec 31, 2022

smartprogrammer93 Jan 1, 2023

rubo commented Dec 12, 2022

MarekM25 Dec 16, 2022

smartprogrammer93 Dec 16, 2022

LukaszRozmej Dec 30, 2022

smartprogrammer93 Jan 1, 2023

MarekM25 Dec 16, 2022

smartprogrammer93 Jan 1, 2023

codecov bot commented Dec 28, 2022 •

edited

Loading

LukaszRozmej Dec 30, 2022

LukaszRozmej Dec 31, 2022

LukaszRozmej Dec 31, 2022

smartprogrammer93 Jan 1, 2023

smartprogrammer93 commented Jan 1, 2023


		namespace Nethermind.Consensus
		namespace Nethermind.Config


		namespace Nethermind.Consensus
		namespace Nethermind.Config

SecondsPerSlot move to BlocksConfig #4944

SecondsPerSlot move to BlocksConfig #4944

Conversation

smartprogrammer93 commented Nov 29, 2022 • edited Loading

Changes:

Types of changes

Testing

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rubo commented Dec 12, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Dec 28, 2022 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smartprogrammer93 commented Jan 1, 2023

smartprogrammer93 commented Nov 29, 2022 •

edited

Loading

codecov bot commented Dec 28, 2022 •

edited

Loading