-
Notifications
You must be signed in to change notification settings - Fork 412
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
[WIP] TheMerge - Kiln #3805
Merged
Merged
[WIP] TheMerge - Kiln #3805
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
* Add pre-merge test in MergePeerAllocationStrategyTests * Add allocate by speed post merge test Co-authored-by: hrugved <whrugved@gmail.com>
* Jwt auth implementation using microsoft library * Todos removed * Old library removed * Authentication logging * Filename added * Additional log info Co-authored-by: Nikita Mescheryakov <root@nmescheryakov.com>
# Conflicts: # src/Nethermind/Nethermind.Core/BlockInfo.cs # src/Nethermind/Nethermind.Merge.Plugin/Handlers/V1/ForkchoiceUpdatedV1Handler.cs # src/Nethermind/Nethermind.Network/P2P/Subprotocols/Snap/Messages/ByteCodesMessage.cs
* Configs * cosmetic * cosmetic v2
# Conflicts: # src/Nethermind/Nethermind.Consensus.Ethash/EthashDifficultyCalculator.cs # src/Nethermind/Nethermind.Consensus.Ethash/EthashPlugin.cs # src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs
* fix gossip policy according to spec changes * refactor * fix test * refactor Co-authored-by: Marcin Sobczak <marcindsobczak@gmail.com>
* Add finalized tag and ForkChoiceUpdate method to block tree * Add unit test for block tree forkChoiceUpdate of finalized hash * Add finalized update test to EngineModuleTests.V1.cs * Update finalized block update test * Add safe tag and metadataDb to BlockTree.cs * Remove BlockConfirmationManager from ForkchoiceUpdatedV1Handler.cs * Fix failing EngineModuleTests * Add missing metadataDb fields to tests * add json rpc changes * fix BlockFinderExtensions.cs * update BlockFinderExtensions.cs * update BlockTreeTests.cs ForkChoiceUpdated function
* fix gossip policy according to spec changes * working on tests * refactor * fix test * refactor * changing the way of handling metadata * adjusted invalid status to the new spec * Ignoring old payloads in NewPayloadV1Handler * changed ConfiguredTerminalBlockNumber * FinalTotalDifficulty * fixed tests * preTTD pivot config * change workflow? * added test * update fcu TryGetBranch * removed beacon pivot exists check * remove ignored fcu * refactor fcu TryGetBranch * reverted workflow * fix * fix test Co-authored-by: Marcin Sobczak <marcindsobczak@gmail.com> Co-authored-by: hrugved <whrugved@gmail.com>
* ugly hack for restarts * more logs * fix? * fix build * fix? * fix? * fix * fix tests * small changes * Reverted NLog.config * one more condition * fix NLog.config * multisyncmodeselector logs * reverted NLog Co-authored-by: Marcin Sobczak <marcindsobczak@gmail.com>
* Revert Ethash mining * Don't revert useful things
LukaszRozmej
approved these changes
May 26, 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.
This branch shouldn't be merged to the master now. The code requires solid cleanup before review.
Build:
Running kiln:
Running against test vectors:
Test vectors: https://notes.ethereum.org/rmVErCfCRPKGqGkUe89-Kg?both
Running - M2 with the transition (TTD = 100)
Authentication:
All Nethermind merge configs are configured in this way:
Port 8545 could be a public port for public RPC modules eth, trace etc
Port 8550 is engine without auth
Port 8551 is engine with auth
The default config:
The config for secret file:
--JsonRpc.JwtSecretFile with default value keystore/jwt-secret
Connect kiln
https://notes.ethereum.org/qrDBhhydTsyKFmGaBl2COQ?view