aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-02-28 01:51:12 +0800
committerchriseth <chris@ethereum.org>2018-03-02 00:19:35 +0800
commit4ce0e7775d86076b2f1d0e1d1390f7a76636d257 (patch)
treec1a5a01ede1cf5de480dbf4a8abcbffd0caf86a7
parent7171ac0124b9a23be9f631b8d8191aae07a52516 (diff)
downloaddexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar.gz
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar.bz2
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar.lz
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar.xz
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.tar.zst
dexon-solidity-4ce0e7775d86076b2f1d0e1d1390f7a76636d257.zip
Add constantinople.
-rw-r--r--libsolidity/interface/EVMVersion.h8
-rw-r--r--solc/CommandLineInterface.cpp2
2 files changed, 6 insertions, 4 deletions
diff --git a/libsolidity/interface/EVMVersion.h b/libsolidity/interface/EVMVersion.h
index 954a9f8f..738bf203 100644
--- a/libsolidity/interface/EVMVersion.h
+++ b/libsolidity/interface/EVMVersion.h
@@ -45,6 +45,7 @@ public:
static EVMVersion tangerineWhistle() { return {Version::TangerineWhistle}; }
static EVMVersion spuriousDragon() { return {Version::SpuriousDragon}; }
static EVMVersion byzantium() { return {Version::Byzantium}; }
+ static EVMVersion constantinople() { return {Version::Constantinople}; }
static boost::optional<EVMVersion> fromString(std::string const& _version)
{
@@ -61,10 +62,11 @@ public:
{
switch (m_version)
{
- case Version::Byzantium: return "byzantium";
+ case Version::Homestead: return "homestead";
case Version::TangerineWhistle: return "tangerineWhistle";
case Version::SpuriousDragon: return "spuriousDragon";
- case Version::Homestead: return "homestead";
+ case Version::Byzantium: return "byzantium";
+ case Version::Constantinople: return "constantinople";
}
return "INVALID";
}
@@ -78,7 +80,7 @@ public:
bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
private:
- enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium };
+ enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople };
EVMVersion(Version _version): m_version(_version) {}
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index caa564bc..fd079656 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -539,7 +539,7 @@ Allowed options)",
(
g_strEVMVersion.c_str(),
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.")
(