Skip to content
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.

Sign up for GitHub

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

Add Constantinople2 to evmc_revision #186

Merged
merged 2 commits into from
Jan 21, 2019
Merged

Add Constantinople2 to evmc_revision #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc3f21
Reserve post-Constantinople EVM revision number as Constantinople2
axic Jan 21, 2019
97e40ac
Changelog: Add entry about Constantinople2
chfast Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
The **Istanbul** EVM revision.
- Added: [[#182](https://github.com/ethereum/evmc/pull/182)]
The `is_zero()` C++ helper for basic data types.
- Added: [[#186](https://github.com/ethereum/evmc/pull/186)]
Reserved the post-Constantinople EVM revision number.
- Deprecated: [[#184](https://github.com/ethereum/evmc/pull/184)]
The `EVMC_LATEST_REVISION` is deprecated, replaced with `EVMC_MAX_REVISION`.

Expand Down
1 change: 1 addition & 0 deletions bindings/go/evmc/evmc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ const (
SpuriousDragon Revision = C.EVMC_SPURIOUS_DRAGON
Byzantium Revision = C.EVMC_BYZANTIUM
Constantinople Revision = C.EVMC_CONSTANTINOPLE
Constantinople2 Revision = C.EVMC_CONSTANTINOPLE2
Istanbul Revision = C.EVMC_ISTANBUL
)

Expand Down
9 changes: 8 additions & 1 deletion include/evmc/evmc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,14 @@ enum evmc_revision
EVMC_SPURIOUS_DRAGON = 3,
EVMC_BYZANTIUM = 4,
EVMC_CONSTANTINOPLE = 5,
EVMC_ISTANBUL = 6,

/**
* Reserved for the post-Constantinople upgrade. The name is likely to
* be changed, but the assigned number should stay.
*/
EVMC_CONSTANTINOPLE2 = 6,

EVMC_ISTANBUL = 7,

/** The maximum EVM revision supported. */
EVMC_MAX_REVISION = EVMC_ISTANBUL,
Expand Down
2 changes: 1 addition & 1 deletion lib/instructions/instruction_metrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ const struct evmc_instruction_metrics* evmc_get_instruction_metrics_table(
switch (revision)
{
case EVMC_ISTANBUL:
/* Currently the same as Costantinople */
case EVMC_CONSTANTINOPLE2:
case EVMC_CONSTANTINOPLE:
return constantinople_metrics;
case EVMC_BYZANTIUM:
Expand Down
2 changes: 1 addition & 1 deletion lib/instructions/instruction_names.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ const char* const* evmc_get_instruction_names_table(enum evmc_revision revision)
switch (revision)
{
case EVMC_ISTANBUL:
/* Currently the same as Costantinople */
case EVMC_CONSTANTINOPLE2:
case EVMC_CONSTANTINOPLE:
return constantinople_names;
case EVMC_BYZANTIUM:
Expand Down