-
Notifications
You must be signed in to change notification settings - Fork 788
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
Common: Add new isActivatedEIP() method #1125
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -370,6 +370,30 @@ export default class Common extends EventEmitter { | |
return this.paramByHardfork(topic, name, hardfork) | ||
} | ||
|
||
/** | ||
* Checks if an EIP is activated by either being included in the EIPs | ||
* manually passed in with the `eips` constructor option or in a | ||
* hardfork currently being active | ||
* | ||
* Note: this method only works for EIPs being supported | ||
* by the `eips` constructor option | ||
* @param eip | ||
*/ | ||
isActivatedEIP(eip: number): boolean { | ||
if (this.eips().includes(eip)) { | ||
return true | ||
} | ||
for (const hfChanges of HARDFORK_CHANGES) { | ||
const hf = hfChanges[1] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Had to do a double take here, this is a bit hard to read (but is due to how these hardforks are exposed). But yeah, this looks fine. |
||
if (this.gteHardfork(hf['name']) && 'eips' in hf) { | ||
if (hf['eips'].includes(eip)) { | ||
return true | ||
} | ||
} | ||
} | ||
return false | ||
} | ||
|
||
/** | ||
* Checks if set or provided hardfork is active on block number | ||
* @param hardfork Hardfork name or null (for HF set) | ||
|
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 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.
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.
This is a fix, EIP can technically be applied earlier than
berlin
, this would otherwise not allow to instantiate the VM with istanbul and just activate this single EIP.