cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add constantinople.

Browse Source
This commit is contained in:
chriseth 2018-02-27 18:51:12 +01:00
parent 7171ac0124
commit 4ce0e7775d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/interface/EVMVersion.h
View File

@ -45,6 +45,7 @@ public:
static EVMVersion tangerineWhistle() { return {Version::TangerineWhistle}; } static EVMVersion tangerineWhistle() { return {Version::TangerineWhistle}; }
static EVMVersion spuriousDragon() { return {Version::SpuriousDragon}; } static EVMVersion spuriousDragon() { return {Version::SpuriousDragon}; }
static EVMVersion byzantium() { return {Version::Byzantium}; } static EVMVersion byzantium() { return {Version::Byzantium}; }
static EVMVersion constantinople() { return {Version::Constantinople}; }
static boost::optional<EVMVersion> fromString(std::string const& _version) static boost::optional<EVMVersion> fromString(std::string const& _version)
{ {
@ -61,10 +62,11 @@ public:
{ {
switch (m_version) switch (m_version)
{ {
case Version::Byzantium: return "byzantium"; case Version::Homestead: return "homestead";
case Version::TangerineWhistle: return "tangerineWhistle"; case Version::TangerineWhistle: return "tangerineWhistle";
case Version::SpuriousDragon: return "spuriousDragon"; case Version::SpuriousDragon: return "spuriousDragon";
case Version::Homestead: return "homestead"; case Version::Byzantium: return "byzantium";
case Version::Constantinople: return "constantinople";
} }
return "INVALID"; return "INVALID";
} }
@ -78,7 +80,7 @@ public:
bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); } bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
private: private:
enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium }; enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople };
EVMVersion(Version _version): m_version(_version) {} EVMVersion(Version _version): m_version(_version) {}

2
solc/CommandLineInterface.cpp
View File

@ -539,7 +539,7 @@ Allowed options)",
( (
g_strEVMVersion.c_str(), g_strEVMVersion.c_str(),
po::value<string>()->value_name("version"), po::value<string>()->value_name("version"),
"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon or byzantium (default)." "Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, byzantium (default) or constantinople."
) )
(g_argOptimize.c_str(), "Enable bytecode optimizer.") (g_argOptimize.c_str(), "Enable bytecode optimizer.")
( (