-
Notifications
You must be signed in to change notification settings - Fork 14
fix: missing EIP-2718 support checking tx type #21
Conversation
@sorpaas, here's a new one for you :) |
jsontests/Cargo.toml
Outdated
@@ -9,7 +9,8 @@ keywords = ["no_std", "ethereum"] | |||
edition = "2018" | |||
|
|||
[dependencies] | |||
evm = { path = "../evm" } | |||
# evm = { path = "../evm" } | |||
evm = { git = "https://github.com/mandreyel/evm", branch = "feat/eip-4399" } |
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.
TODO: Merge evm PR and then revert these changes.
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.
Please just revert this now. We only have CI in evm
repo.
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.
Done, ready for merging.
9c3c82f
to
a258c94
Compare
a258c94
to
08fdea3
Compare
@sorpaas ser, wen merge? :) |
Cargo.lock
Outdated
@@ -581,6 +584,7 @@ dependencies = [ | |||
[[package]] | |||
name = "evm-runtime" | |||
version = "0.37.0" | |||
source = "git+https://github.com/mandreyel/evm?branch=feat/eip-4399#d8324b41b5baf0a6f4221c3cacc3a1828a191e60" |
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.
Those should be reverted also.
Just run cargo build
and commit the Cargo.lock
file.
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.
You're right, that was my bad. I reverted that and also added another fix for a sputnik fix I'm going to push soon. Please check the diff, it's small.
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, while I have your attention, can we merge rust-ethereum/evm#162? It's been sitting open for a while but it's done.
08fdea3
to
fd5c445
Compare
fd5c445
to
4a66053
Compare
This PR fixes the test suite runner in light of new failing geth tests checking for whether on pre-Berlin forks non-legacy transactions are properly rejected. This was not the case for sputnik's evm-tests, because the Berlin hardfork implementation (rust-ethereum/evm#40) opted to shift responsibility of implementing EIP-2718 (tx type filtering) to the layer hosting sputnik. In this case, the host is evm-test, which was missing that check.
IMPORTANT: This PR depends on rust-ethereum/evm#162, which needs to be merged, and then the git submodule on this branch needs to be updated to master of rust-blockchain/evm.