AuRa specific changes for themerge #4124
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Nikita Mescheryakov <root@nmescheryakov.com>
* Add test to BlockTreeTests.cs * Add sync test scenarios to BlockTreeTests.cs Co-authored-by: hrugved <whrugved@gmail.com>
# Conflicts: # src/Nethermind/Nethermind.Merge.Plugin/Handlers/V1/NewPayloadV1Handler.cs
LukaszRozmej
reviewed
Jun 9, 2022
|
|
||
| namespace Nethermind.Api.Extensions; | ||
|
|
||
| // Assemblies containing instances of this interface will be the ones |
There was a problem hiding this comment.
Please use documenting comments: https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/documentation-comments
Comment on lines
80
to
86
|
|
||
| if (TrySetState(parent.StateRoot)) | ||
| { | ||
| Block? processed = ProcessPreparedBlock(block, null); | ||
| if (processed != null) | ||
| block = processed; | ||
| } |
There was a problem hiding this comment.
Why are we processing block here?
That looks weird to me, this is not the place for that.
There was a problem hiding this comment.
We need to process here to apply rewards even on empty blocks
src/Nethermind/Nethermind.Merge.Gnosis/InitializationSteps/InitializeBlockchainAuRaMerge.cs
Outdated
Show resolved
Hide resolved
LukaszRozmej
reviewed
Jun 9, 2022
| @@ -21,6 +21,6 @@ namespace Nethermind.Api.Extensions; | |||
|
|
|||
| public interface IPluginConfig : IConfig | |||
| { | |||
| [ConfigItem(Description = "Order of plugin initialization", DefaultValue = "[Clique, Aura, Ethash, Merge, MEV, HealthChecks, Hive]")] | |||
| [ConfigItem(Description = "Order of plugin initialization", DefaultValue = "[Clique, Aura, Ethash, AuRaMerge, Merge, MEV, HealthChecks, Hive]")] | |||
There was a problem hiding this comment.
Please document in AuraMergePlugin that it has to go before the Merge plugin
There was a problem hiding this comment.
I added a note in AuRaMergePlugin
LukaszRozmej
approved these changes
Jun 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Types of changes
What types of changes does your code introduce?
Put an
xin the boxes that applyTesting
Requires testing
In case you checked yes, did you write tests??