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.

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

Rename Constantinople2 to Petersburg #196

Merged
merged 1 commit into from
Mar 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [6.2.0] - Unreleased

- Deprecated: [[#196](https://github.com/ethereum/evmc/pull/196)]
The `EVMC_CONSTANTINOPLE2` revision name is deprecated, replaced with `EVMC_PETERSBURG`.

## [6.1.1] - 2019-02-13

- Added: [[#192](https://github.com/ethereum/evmc/pull/192)]
Expand Down Expand Up @@ -111,6 +116,7 @@
Constantinople: Storage status is reported back from `evmc_set_storage()`.


[6.2.0]: https://github.com/ethereum/evmc/compare/v6.1.1...master
[6.1.1]: https://github.com/ethereum/evmc/releases/tag/v6.1.1
[6.1.0]: https://github.com/ethereum/evmc/releases/tag/v6.1.0
[6.0.2]: https://github.com/ethereum/evmc/releases/tag/v6.0.2
Expand Down
2 changes: 1 addition & 1 deletion bindings/go/evmc/evmc.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const (
SpuriousDragon Revision = C.EVMC_SPURIOUS_DRAGON
Byzantium Revision = C.EVMC_BYZANTIUM
Constantinople Revision = C.EVMC_CONSTANTINOPLE
Constantinople2 Revision = C.EVMC_CONSTANTINOPLE2
Petersburg Revision = C.EVMC_PETERSBURG
Istanbul Revision = C.EVMC_ISTANBUL
)

Expand Down
15 changes: 11 additions & 4 deletions include/evmc/evmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -756,12 +756,12 @@ enum evmc_revision
EVMC_CONSTANTINOPLE = 5,

/**
* Reserved for the post-Constantinople upgrade. The name is likely to
* be changed, but the assigned number should stay.
* The Petersburg revision.
*
* The spec draft: https://github.com/ethereum/EIPs/pull/1716.
* Other names: Constantinople2, ConstantinopleFix.
* https://eips.ethereum.org/EIPS/eip-1716
*/
EVMC_CONSTANTINOPLE2 = 6,
EVMC_PETERSBURG = 6,

/**
* The Istanbul revision.
Expand All @@ -774,6 +774,13 @@ enum evmc_revision
EVMC_MAX_REVISION = EVMC_ISTANBUL,


/**
* Reserved for the post-Constantinople upgrade.
*
* @deprecated Replaced with ::EVMC_PETERSBURG.
*/
EVMC_CONSTANTINOPLE2 EVMC_DEPRECATED = EVMC_PETERSBURG,

/**
* The latests EVM revision supported.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/instructions/instruction_metrics.c
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:
case EVMC_CONSTANTINOPLE2:
case EVMC_PETERSBURG:
case EVMC_CONSTANTINOPLE:
return constantinople_metrics;
case EVMC_BYZANTIUM:
Expand Down
2 changes: 1 addition & 1 deletion lib/instructions/instruction_names.c
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:
case EVMC_CONSTANTINOPLE2:
case EVMC_PETERSBURG:
case EVMC_CONSTANTINOPLE:
return constantinople_names;
case EVMC_BYZANTIUM:
Expand Down