[DO NOT MERGE] v1.0.0 rc.2 taiko #6
Open
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
# Conflicts: # Cargo.lock # Cargo.toml # crates/chainspec/src/lib.rs # crates/ethereum/evm/Cargo.toml # crates/ethereum/evm/src/execute.rs # crates/evm/src/execute.rs # crates/evm/src/lib.rs # crates/primitives/Cargo.toml # crates/primitives/src/block.rs # crates/primitives/src/lib.rs # crates/revm/Cargo.toml # crates/revm/src/test_utils.rs # crates/rpc/rpc/src/eth/error.rs # crates/storage/errors/src/provider.rs # crates/trie/trie/src/proof.rs # testing/ef-tests/Cargo.toml # testing/ef-tests/src/cases/blockchain_test.rs
johntaiko
force-pushed
the
v1.0.0-rc.2-taiko
branch
from
0eb09a3
to
d20c700
Compare
johntaiko
reviewed
Jul 5, 2024
| if res.is_err() { | ||
| // Clear the state for the next tx | ||
| evm.context.evm.journaled_state = JournaledState::new(evm.context.evm.journaled_state.spec, HashSet::new()); | ||
|
|
There was a problem hiding this comment.
if is_taiko && is_anchor {
return Err(BlockExecutionError::Validation(res.err().unwrap()));
}There was a problem hiding this comment.
needs to assert anchor before optimistic
There was a problem hiding this comment.
In the optimistic case, I think the anchor transaction is allowed to fail. Otherwise this would stop the execution of the execution of the blcok, which would postpone data gathering of all transactions until the anchor tx is valid.
There was a problem hiding this comment.
Ok, I misunderstood the optimistic function
Signed-off-by: smtmfft <smtm@taiko.xyz>
add taiko_dev chain spec
Signed-off-by: smtmfft <smtm@taiko.xyz>
Signed-off-by: smtmfft <smtm@taiko.xyz>
Co-authored-by: Brecht Devos <Brechtp.Devos@gmail.com>
prepare for ontake upgrade
Signed-off-by: smtmfft <smtm@taiko.xyz>
sync anchorV2 structure with taiko-mono
feat(chainspec): read ontake fork height from env
Signed-off-by: smtmfft <smtm@taiko.xyz>
fix hekla ontake fork height
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.
Diff tracking PR
DO NOT MERGE