fixup! [libevmasm] Add support to import evm assembly json.

Author: cameel

libevmasm/Assembly.cpp

@@ -37,6 +37,8 @@
 #include <libsolutil/JSON.h>
 #include <libsolutil/StringUtils.h>
 
+#include <fmt/format.h>
+
 #include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/view/enumerate.hpp>
 
@@ -101,24 +103,19 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std:
 		solRequire(
 			validMembers.count(member),
 			AssemblyImportException,
-			"Unknown member '" + member + "'. Valid members are: " +
-			solidity::util::joinHumanReadable(validMembers, ", ") + "."
+			fmt::format(
+				"Unknown member '{}'. Valid members are: {}.",
+				member,
+				solidity::util::joinHumanReadable(validMembers, ", ")
+			)
 		);
 	solRequire(isOfType<std::string>(_json["name"]), AssemblyImportException, "Member 'name' missing or not of type string.");
 	solRequire(isOfTypeIfExists<int>(_json, "begin"), AssemblyImportException, "Optional member 'begin' not of type int.");
 	solRequire(isOfTypeIfExists<int>(_json, "end"), AssemblyImportException, "Optional member 'end' not of type int.");
 	solRequire(isOfTypeIfExists<int>(_json, "source"), AssemblyImportException, "Optional member 'source' not of type int.");
 	solRequire(isOfTypeIfExists<std::string>(_json, "value"), AssemblyImportException, "Optional member 'value' not of type string.");
-	solRequire(
-		isOfTypeIfExists<int>(_json, "modifierDepth"),
-		AssemblyImportException,
-		"Optional member 'modifierDepth' not of type int."
-	);
-	solRequire(
-		isOfTypeIfExists<std::string>(_json, "jumpType"),
-		AssemblyImportException,
-		"Optional member 'jumpType' not of type string."
-	);
+	solRequire(isOfTypeIfExists<int>(_json, "modifierDepth"), AssemblyImportException, "Optional member 'modifierDepth' not of type int.");
+	solRequire(isOfTypeIfExists<std::string>(_json, "jumpType"), AssemblyImportException, "Optional member 'jumpType' not of type string.");
 
 	std::string name = get<std::string>(_json["name"]);
 	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
@@ -508,9 +505,13 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 	return root;
 }
 
-std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList, size_t _level)
+std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(
+	Json::Value const& _json,
+	std::vector<std::string> const& _sourceList,
+	size_t _level
+)
 {
-	auto result = std::make_shared<Assembly>(langutil::EVMVersion(), _level == 0, "");
+	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, "" /* _name */);
 	if (_json.isNull())
 		return std::make_pair(result, std::vector<std::string>());
 
@@ -532,7 +533,8 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			for (Json::Value const& sourceListItem: _json["sourceList"])
 				solRequire(sourceListItem.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
 		}
-	} else
+	}
+	else
 		solRequire(
 			!_json.isMember("sourceList"),
 			AssemblyImportException,
@@ -552,16 +554,16 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			);
 			sourceList.emplace_back(it.asString());
 		}
-	} else
+	}
+	else
 		sourceList = _sourceList;
 
 	result->importAssemblyItemsFromJSON(_json[".code"], sourceList);
 	if (_json[".auxdata"])
 	{
 		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
-		bytes auxdata{fromHex(_json[".auxdata"].asString())};
-		solRequire(!auxdata.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
-		result->m_auxiliaryData = auxdata;
+		result->m_auxiliaryData = fromHex(_json[".auxdata"].asString());
+		solRequire(!result->m_auxiliaryData.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
 	}
 
 	if (_json.isMember(".data"))
@@ -575,14 +577,11 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			Json::Value const& code = data[dataItemID];
 			if (code.isString())
 			{
-				if (!code.asString().empty())
-				{
-					bytes data_value{fromHex(code.asString())};
-					solRequire(
-						!data_value.empty(),
-						AssemblyImportException,
-						"Member '.data' contains a value for '" + dataItemID + "' that is not a valid hexadecimal string.");
-				}
+				solRequire(
+					code.asString().empty() || !fromHex(code.asString()).empty(),
+					AssemblyImportException,
+					"Member '.data' contains a value for '" + dataItemID + "' that is not a valid hexadecimal string."
+				);
 				result->m_data[h256(fromHex(dataItemID))] = fromHex(code.asString());
 			}
 			else if (code.isObject())
@@ -606,7 +605,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 void Assembly::updatePaths(std::vector<Assembly*> const& _parents, std::vector<size_t> const& _absolutePathFromRoot)
 {
 	size_t subId = 0;
-	for (std::shared_ptr<Assembly> assembly: this->m_subs)
+	for (std::shared_ptr<Assembly> assembly: m_subs)
 	{
 		std::vector<Assembly*> parents{_parents};
 		parents.push_back(this);