Disable experimental EOF support

Author: yanghang8612

.circleci/soltest_all.sh

@@ -40,7 +40,7 @@ IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
 
 DEFAULT_EVM=cancun
 OPTIMIZE_VALUES=(0 1)
-EOF_VERSIONS=(0 1)
+EOF_VERSIONS=(0)
 
 # Run for ABI encoder v1, without SMTChecker tests.
 EVM="${DEFAULT_EVM}" \

libsolidity/interface/CompilerStack.cpp

@@ -241,6 +241,7 @@ void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
 void CompilerStack::setEOFVersion(std::optional<uint8_t> _version)
 {
 	solAssert(m_stackState < CompilationSuccessful, "Must set EOF version before compiling.");
+	solUnimplementedAssert(!_version.has_value(), "EOF is currently disabled for TRON solidity compiler.");
 	solAssert(!_version || _version == 1, "Invalid EOF version.");
 	m_eofVersion = _version;
 }

libsolidity/interface/StandardCompiler.cpp

@@ -838,14 +838,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json> StandardCompiler::parseI
 	}
 
 	if (settings.contains("eofVersion"))
-	{
-		if (!settings["eofVersion"].is_number_unsigned())
-			return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
-		auto eofVersion = settings["eofVersion"].get<uint8_t>();
-		if (eofVersion != 1)
-			return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
-		ret.eofVersion = 1;
-	}
+		return formatFatalError(Error::Type::JSONError, "\"settings.eofVersion\" is currently disabled for TRON solidity compiler.");
 
 	if (ret.eofVersion.has_value() && !ret.evmVersion.supportsEOF())
 		return formatFatalError(Error::Type::JSONError, "EOF is not supported by EVM versions earlier than " + EVMVersion::firstWithEOF().name() + ".");

solc/CommandLineParser.cpp

@@ -1244,13 +1244,10 @@ void CommandLineParser::processArgs()
 	}
 
 	if (m_args.count(g_strEOFVersion))
-	{
-		// Request as uint64_t, since uint8_t will be parsed as character by boost.
-		uint64_t versionOption = m_args[g_strEOFVersion].as<uint64_t>();
-		if (versionOption != 1)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEOFVersion + ": " + std::to_string(versionOption));
-		m_options.output.eofVersion = 1;
-	}
+		solThrow(
+			CommandLineValidationError,
+			"The --" + g_strEOFVersion + " option is currently disabled for TRON solidity compiler."
+		);
 
 	if (m_options.output.eofVersion.has_value() && !m_options.output.evmVersion.supportsEOF())
 		solThrow(CommandLineValidationError, "EOF is not supported by EVM versions earlier than " + EVMVersion::firstWithEOF().name() + ".");

test/Common.cpp

@@ -182,13 +182,7 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 		po::store(parsedOptions, arguments);
 		po::notify(arguments);
 		if (arguments.count("eof-version"))
-		{
-			// Request as uint64_t, since uint8_t will be parsed as character by boost.
-			uint64_t eofVersion = arguments["eof-version"].as<uint64_t>();
-			if (eofVersion != 1)
-				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EOF version: " + std::to_string(eofVersion)));
-			m_eofVersion = 1;
-		}
+			BOOST_THROW_EXCEPTION(std::runtime_error("The --eof-version option is currently disabled for TRON solidity compiler."));
 
 		for (auto const& parsedOption: parsedOptions.options)
 			if (parsedOption.position_key >= 0)

test/cmdlineTests/eof_unavailable_before_osaka/err

@@ -1 +1 @@
-Error: EOF is not supported by EVM versions earlier than osaka.
+Error: The --experimental-eof-version option is currently disabled for TRON solidity compiler.

test/cmdlineTests/ethdebug_eof_container_osaka/err

@@ -1 +1 @@
-Error: ethdebug does not yet support EOF.
+Error: The --experimental-eof-version option is currently disabled for TRON solidity compiler.

test/cmdlineTests/ethdebug_eof_container_osaka/output

@@ -2,8 +2,8 @@
     "errors": [
         {
             "component": "general",
-            "formattedMessage": "EOF is not supported by EVM versions earlier than osaka.",
-            "message": "EOF is not supported by EVM versions earlier than osaka.",
+            "formattedMessage": "\"settings.eofVersion\" is currently disabled for TRON solidity compiler.",
+            "message": "\"settings.eofVersion\" is currently disabled for TRON solidity compiler.",
             "severity": "error",
             "type": "JSONError"
         }

test/cmdlineTests/standard_eof_unavailable_before_osaka/output.json

@@ -2,8 +2,8 @@
     "errors": [
         {
             "component": "general",
-            "formattedMessage": "EOF is not supported by EVM versions earlier than osaka.",
-            "message": "EOF is not supported by EVM versions earlier than osaka.",
+            "formattedMessage": "\"settings.eofVersion\" is currently disabled for TRON solidity compiler.",
+            "message": "\"settings.eofVersion\" is currently disabled for TRON solidity compiler.",
             "severity": "error",
             "type": "JSONError"
         }