refactor(config): consolidate scroll flags #262
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
HAOYUatHZ
force-pushed
the
consolidate
branch
5 times, most recently
from
6ad4822
to
57c7eee
Compare
HAOYUatHZ
changed the title
HAOYUatHZ
force-pushed
the
consolidate
branch
6 times, most recently
from
7708d06
to
0bc0b32
Compare
|
not sure which version number should I use? |
Thegaram
reviewed
Apr 11, 2023
Thegaram
previously approved these changes
Apr 15, 2023
I'd consider this a backward compatible change (using l2geth on non-scroll networks was not supported anyway). So bump path or no bump is enough. |
NazariiDenha
approved these changes
Apr 17, 2023
icemelon
reviewed
Apr 17, 2023
| // Scroll genesis extension: enable scroll rollup-related traces & state transition | ||
| // TODO: merge with these config: Zktrie, FeeVaultAddress, EnableEIP2718, EnableEIP1559 & MaxTxPerBlock | ||
| UsingScroll bool `json:"usingScroll,omitempty"` | ||
| func (s ScrollConfig) L1FeeEnabled() bool { |
There was a problem hiding this comment.
The function name is a bit inaccurate. Using fee vault & enable L1 fee is different. Fee vault collects the tx fee that includes both L2 exec fee and L1 rollup fee, right?
colinlyguo
reviewed
Apr 18, 2023
| if api.backend.ChainConfig().UsingScroll { | ||
| blockTrace.WithdrawTrieRoot = withdrawtrie.ReadWTRSlot(rcfg.L2MessageQueueAddress, env.state) | ||
| } | ||
| blockTrace.WithdrawTrieRoot = withdrawtrie.ReadWTRSlot(rcfg.L2MessageQueueAddress, env.state) |
There was a problem hiding this comment.
This is not controlled by any config now. Is it compatible with other geth configs?
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.
baseFee & EIP-2718 & EIP-1559 related PRs:
we can also move
FeeVaultAddressintorollup/rcfg/config.go, but that's a bigger refactor so can be left for future