mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Actually allow eofVersion as standard json key.
This commit is contained in:
parent
d584e53077
commit
8719f86ea9
@ -438,7 +438,7 @@ std::optional<Json::Value> checkAuxiliaryInputKeys(Json::Value const& _input)
|
||||
|
||||
std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
|
||||
{
|
||||
static set<string> keys{"parserErrorRecovery", "debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
|
||||
static set<string> keys{"parserErrorRecovery", "debug", "evmVersion", "eofVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
|
||||
return checkKeys(_input, keys, "settings");
|
||||
}
|
||||
|
||||
@ -804,7 +804,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
|
||||
{
|
||||
if (!settings["eofVersion"].isUInt())
|
||||
return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
|
||||
auto eofVersion = settings["evmVersion"].asUInt();
|
||||
auto eofVersion = settings["eofVersion"].asUInt();
|
||||
if (eofVersion != 1)
|
||||
return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
|
||||
ret.eofVersion = 1;
|
||||
@ -1103,6 +1103,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
|
||||
compilerStack.addSMTLib2Response(smtLib2Response.first, smtLib2Response.second);
|
||||
compilerStack.setViaIR(_inputsAndSettings.viaIR);
|
||||
compilerStack.setEVMVersion(_inputsAndSettings.evmVersion);
|
||||
compilerStack.setEOFVersion(_inputsAndSettings.eofVersion);
|
||||
compilerStack.setParserErrorRecovery(_inputsAndSettings.parserErrorRecovery);
|
||||
compilerStack.setRemappings(std::move(_inputsAndSettings.remappings));
|
||||
compilerStack.setOptimiserSettings(std::move(_inputsAndSettings.optimiserSettings));
|
||||
|
Loading…
Reference in New Issue
Block a user