mirror of https://github.com/hyperledger/besu
Reuse HardforkId in EvmSpecVersion (#7448)
* Reuse HardforkId in EvmSpecVersion Move the HardforkId into datatypes and re-use the data in EvmSpecVersion, keeping evm specific details in the evm and merging the rest into datatypes. Signed-off-by: Danno Ferrin <danno@numisight.com> * Update evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Danno Ferrin <danno.ferrin@shemnon.com> --------- Signed-off-by: Danno Ferrin <danno@numisight.com> Signed-off-by: Danno Ferrin <danno.ferrin@shemnon.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>pull/7473/head
Danno Ferrin
3 months ago
committed by
GitHub
parent
35faf06b92
commit
51335954c2
@ -0,0 +1,164 @@ |
||||
/* |
||||
* Copyright contributors to Hyperledger Besu. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.datatypes; |
||||
|
||||
/** Description and metadata for a hard fork */ |
||||
public interface HardforkId { |
||||
|
||||
/** |
||||
* The name of the hard fork. |
||||
* |
||||
* @return the name for the fork |
||||
*/ |
||||
String name(); |
||||
|
||||
/** |
||||
* Has the fork been finalized? i.e., could the definition change in future versions of Besu? |
||||
* |
||||
* @return true if the specification is finalized. |
||||
*/ |
||||
boolean finalized(); |
||||
|
||||
/** |
||||
* A brief description of the hard fork, suitable for human consumption |
||||
* |
||||
* @return the description of the fork. |
||||
*/ |
||||
String description(); |
||||
|
||||
/** List of all Ethereum Mainnet hardforks, including future and developmental forks. */ |
||||
enum MainnetHardforkId implements HardforkId { |
||||
/** Frontier fork. */ |
||||
FRONTIER(true, "Frontier"), |
||||
/** Homestead fork. */ |
||||
HOMESTEAD(true, "Homestead"), |
||||
/** DAO Fork fork. */ |
||||
DAO_FORK(true, "DAO Fork"), |
||||
/** Tangerine Whistle fork. */ |
||||
TANGERINE_WHISTLE(true, "Tangerine Whistle"), |
||||
/** Spurious Dragon fork. */ |
||||
SPURIOUS_DRAGON(true, "Spurious Dragon"), |
||||
/** Byzantium fork. */ |
||||
BYZANTIUM(true, "Byzantium"), |
||||
/** Constantinople fork. */ |
||||
CONSTANTINOPLE(true, "Constantinople"), |
||||
/** Petersburg fork. */ |
||||
PETERSBURG(true, "Petersburg"), |
||||
/** Istanbul fork. */ |
||||
ISTANBUL(true, "Istanbul"), |
||||
/** Muir Glacier fork. */ |
||||
MUIR_GLACIER(true, "Muir Glacier"), |
||||
/** Berlin fork. */ |
||||
BERLIN(true, "Berlin"), |
||||
/** London fork. */ |
||||
LONDON(true, "London"), |
||||
/** Arrow Glacier fork. */ |
||||
ARROW_GLACIER(true, "Arrow Glacier"), |
||||
/** Gray Glacier fork. */ |
||||
GRAY_GLACIER(true, "Gray Glacier"), |
||||
/** Paris fork. */ |
||||
PARIS(true, "Paris"), |
||||
/** Shanghai fork. */ |
||||
SHANGHAI(true, "Shanghai"), |
||||
/** Cancun fork. */ |
||||
CANCUN(true, "Cancun"), |
||||
/** Cancun + EOF fork. */ |
||||
CANCUN_EOF(false, "Cancun + EOF"), |
||||
/** Prague fork. */ |
||||
PRAGUE(false, "Prague"), |
||||
/** Prague + EOF fork. */ |
||||
PRAGUE_EOF(false, "Prague + EOF"), |
||||
/** Osaka fork. */ |
||||
OSAKA(false, "Osaka"), |
||||
/** Amsterdam fork. */ |
||||
AMSTERDAM(false, "Amsterdam"), |
||||
/** Bogota fork. */ |
||||
BOGOTA(false, "Bogota"), |
||||
/** Polis fork. (from the greek form of an earlier incarnation of the city of Istanbul. */ |
||||
POLIS(false, "Polis"), |
||||
/** Bangkok fork. */ |
||||
BANGKOK(false, "Bangkok"), |
||||
/** Development fork, for accepted and unscheduled EIPs. */ |
||||
FUTURE_EIPS(false, "Development, for accepted and unscheduled EIPs"), |
||||
/** Developmental fork, for experimental EIPs. */ |
||||
EXPERIMENTAL_EIPS(false, "Developmental, for experimental EIPs"); |
||||
|
||||
final boolean finalized; |
||||
final String description; |
||||
|
||||
MainnetHardforkId(final boolean finalized, final String description) { |
||||
this.finalized = finalized; |
||||
this.description = description; |
||||
} |
||||
|
||||
@Override |
||||
public boolean finalized() { |
||||
return finalized; |
||||
} |
||||
|
||||
@Override |
||||
public String description() { |
||||
return description; |
||||
} |
||||
} |
||||
|
||||
/** List of all Ethereum Classic hard forks. */ |
||||
enum ClassicHardforkId implements HardforkId { |
||||
/** Frontier fork. */ |
||||
FRONTIER(true, "Frontier"), |
||||
/** Homestead fork. */ |
||||
HOMESTEAD(true, "Homestead"), |
||||
/** Classic Tangerine Whistle fork. */ |
||||
CLASSIC_TANGERINE_WHISTLE(true, "Classic Tangerine Whistle"), |
||||
/** Die Hard fork. */ |
||||
DIE_HARD(true, "Die Hard"), |
||||
/** Gotham fork. */ |
||||
GOTHAM(true, "Gotham"), |
||||
/** Defuse Difficulty Bomb fork. */ |
||||
DEFUSE_DIFFICULTY_BOMB(true, "Defuse Difficulty Bomb"), |
||||
/** Atlantis fork. */ |
||||
ATLANTIS(true, "Atlantis"), |
||||
/** Agharta fork. */ |
||||
AGHARTA(true, "Agharta"), |
||||
/** Phoenix fork. */ |
||||
PHOENIX(true, "Phoenix"), |
||||
/** Thanos fork. */ |
||||
THANOS(true, "Thanos"), |
||||
/** Magneto fork. */ |
||||
MAGNETO(true, "Magneto"), |
||||
/** Mystique fork. */ |
||||
MYSTIQUE(true, "Mystique"), |
||||
/** Spiral fork. */ |
||||
SPIRAL(true, "Spiral"); |
||||
|
||||
final boolean finalized; |
||||
final String description; |
||||
|
||||
ClassicHardforkId(final boolean finalized, final String description) { |
||||
this.finalized = finalized; |
||||
this.description = description; |
||||
} |
||||
|
||||
@Override |
||||
public boolean finalized() { |
||||
return finalized; |
||||
} |
||||
|
||||
@Override |
||||
public String description() { |
||||
return description; |
||||
} |
||||
} |
||||
} |
||||
@ -1,61 +0,0 @@ |
||||
/* |
||||
* Copyright contributors to Hyperledger Besu. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.ethereum.mainnet; |
||||
|
||||
public interface HardforkId { |
||||
|
||||
String name(); |
||||
|
||||
enum MainnetHardforkId implements HardforkId { |
||||
FRONTIER, |
||||
HOMESTEAD, |
||||
DAO_FORK, |
||||
TANGERINE_WHISTLE, |
||||
SPURIOUS_DRAGON, |
||||
BYZANTIUM, |
||||
CONSTANTINOPLE, |
||||
PETERSBURG, |
||||
ISTANBUL, |
||||
MUIR_GLACIER, |
||||
BERLIN, |
||||
LONDON, |
||||
ARROW_GLACIER, |
||||
GRAY_GLACIER, |
||||
PARIS, |
||||
SHANGHAI, |
||||
CANCUN, |
||||
CANCUN_EOF, |
||||
PRAGUE, |
||||
PRAGUE_EOF, |
||||
FUTURE_EIPS, |
||||
EXPERIMENTAL_EIPS |
||||
} |
||||
|
||||
enum ClassicHardforkId implements HardforkId { |
||||
FRONTIER, |
||||
HOMESTEAD, |
||||
CLASSIC_TANGERINE_WHISTLE, |
||||
DIE_HARD, |
||||
GOTHAM, |
||||
DEFUSE_DIFFICULTY_BOMB, |
||||
ATLANTIS, |
||||
AGHARTA, |
||||
PHOENIX, |
||||
THANOS, |
||||
MAGNETO, |
||||
MYSTIQUE, |
||||
SPIRAL |
||||
} |
||||
} |
||||
Loading…
Reference in new issue