Support for the Paris hard fork ("The Merge")
#2080
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
fselmo
force-pushed
the
merge-gradual-changes
branch
2 times, most recently
from
5b8e3d1
to
1be70a9
Compare
fselmo
force-pushed
the
merge-gradual-changes
branch
4 times, most recently
from
a06784a
to
541495b
Compare
fselmo
force-pushed
the
merge-gradual-changes
branch
3 times, most recently
from
8beb3fa
to
e20500d
Compare
|
This PR has the rough implementation necessary to pass all the logic behind the merge but I think what comes after this should be the cleaning up of nomenclature around mining, etc... to be a bit more generalized, at least in the I created #2079 to track that. |
fselmo
changed the title
Paris hard fork (Merge)
fselmo
changed the title
Paris hard fork (Merge)Paris hard fork ("The Merge")
fselmo
commented
Sep 30, 2022
fselmo
force-pushed
the
merge-gradual-changes
branch
3 times, most recently
from
ed19891
to
41b7029
Compare
fselmo
added a commit
to fselmo/py-evm
that referenced
this pull request
Sep 30, 2022
3 tasks
fselmo
added a commit
to fselmo/py-evm
that referenced
this pull request
Oct 20, 2022
fselmo
force-pushed
the
merge-gradual-changes
branch
from
3037669
to
68be1f5
Compare
fselmo
added a commit
to fselmo/py-evm
that referenced
this pull request
Oct 20, 2022
fselmo
force-pushed
the
merge-gradual-changes
branch
from
68be1f5
to
22cdd72
Compare
kclowes
approved these changes
Oct 21, 2022
- Use the block header class for the appropriate VM by validating up to the previous VM, extracting the params, and plugging into the appropriate VM class. - Remove unnecessary fields in London state since they are already inheritted and do not need to be re-imported / overwritten
- Add ``Paris`` fork VM classes. - Supplant ``DIFFICULTY`` opcode at ``0x44`` with ``PREVRANDAO``. - Allow ``mix_hash`` to be retrieved from the execution context and add ``mixhash`` opcode logic function to be used in new ``PREVRANDAO`` opcode. - Some renaming of "Mining" nomenclature found within more general classes / methods - created an issue at ethereum#2079 to track more of these changes in a separate PR. - Minor cleanups along the way.
- Turn on ``ethereum/tests`` "Merge" tests to test against ``Paris`` VM implementations. - Skip slow tests related to previous VM tests (london and berlin mostly). - Update ``eth-typing`` and pull in updated ``ForkName`` enum with ``Paris`` added. - Fix some blips and get tests to pass.
- Our header db relied on difficulty to generate keys. Since the merge / PoS, difficulty is always ``0`` so this led to overwriting values due to the same key being generated (e.g. new_score = old_score + block.difficulty). Use the block number instead for PoS (or when difficulty=0). - The ``coinbase`` account is always touched, even when it receives a transaction fee with a value of ``0```. With recent changes for the ``Merge`` implementation, this was creating an issue for "Merge" tests where the ``stateRoot`` did not match. This seems to be because in every case for PoW, the ``coinbase`` account will get a block reward. This means that if the transaction fee was ``0``, it wouldn't matter because the ``coinbase`` would never end up with ``0`` balance, so all tests before PoS pass. Now that we are in a PoS context, there is no block reward, thus, when the transaction fee is ``0``, we will touch the account and leave it at a zeroed state. In order to implement EIP-161 correctly, if the ``coinbase`` account has ``0`` balance, empty code, ``0`` nonce, and no storage, it should be marked for deletion and not be included in the state root calculation.
fselmo
force-pushed
the
merge-gradual-changes
branch
from
d1c4d84
to
6ee3af6
Compare
fselmo
added a commit
that referenced
this pull request
Nov 8, 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.
What was wrong?
Paris"the merge" fork support is needed.How was it fixed?
Support for
Parislogic added:DIFFICULTYopcode withPREVRANDAO.ethereum/tests.0now. This caused issues with overwriting same values for keys.0and going to thecoinbaseaddress never triggeredEIP-161to actually remove the account from state trie calculation if the fee recipient account was in a zero-state at the end of the computation. For the last 15 remaining tests, this ended up being what was causing a wrong state root. (i.e. Thecoinbaseaccount is always touched, so if it is in a zero-state after the computation we have to mark it for deletion)Todo:
Cute Animal Picture