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

Author: cameel

libevmasm/Assembly.cpp

@@ -536,30 +536,28 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			"Member 'sourceList' may only be present in the root JSON object."
 		);
 
-	std::vector<std::string> sourceList;
+	std::vector<std::string> parsedSourceList;
 	if (_json.isMember("sourceList"))
 	{
 		solAssert(_level == 0);
 		solAssert(_sourceList.empty());
 		for (Json::Value const& sourceName: _json["sourceList"])
 		{
 			solRequire(
-				std::find(sourceList.begin(), sourceList.end(), sourceName.asString()) == sourceList.end(),
+				std::find(parsedSourceList.begin(), parsedSourceList.end(), sourceName.asString()) == parsedSourceList.end(),
 				AssemblyImportException,
 				"Items in 'sourceList' array are not unique."
 			);
-			sourceList.emplace_back(sourceName.asString());
+			parsedSourceList.emplace_back(sourceName.asString());
 		}
 	}
-	else
-		sourceList = _sourceList;
 
 	solRequire(_json.isMember(".code"), AssemblyImportException, "Member '.code' is missing.");
 	solRequire(_json[".code"].isArray(), AssemblyImportException, "Member '.code' is not an array.");
 	for (Json::Value const& codeItem: _json[".code"])
 		solRequire(codeItem.isObject(), AssemblyImportException, "The '.code' array contains an item that is not an object.");
 
-	result->importAssemblyItemsFromJSON(_json[".code"], sourceList);
+	result->importAssemblyItemsFromJSON(_json[".code"], _level == 0 ? parsedSourceList : _sourceList);
 
 	if (_json[".auxdata"])
 	{
@@ -608,8 +606,9 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 
 				if (result->m_subs.size() <= index)
 					result->m_subs.resize(index + 1);
-				std::shared_ptr<Assembly> subassembly(Assembly::fromJSON(dataItem, sourceList, _level + 1).first);
+				auto [subassembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
 				solAssert(subassembly);
+				solAssert(emptySourceList.empty());
 				result->m_subs[index] = subassembly;
 			}
 			else
@@ -618,7 +617,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	}
 	if (_level == 0)
 		result->updatePaths();
-	return std::make_pair(result, sourceList);
+	return std::make_pair(result, _level == 0 ? parsedSourceList : std::vector<std::string>{});
 }
 
 void Assembly::updatePaths(std::vector<Assembly*> const& _parents, std::vector<size_t> const& _absolutePathFromRoot)

libevmasm/Assembly.h

@@ -161,7 +161,7 @@ class Assembly
 	///     at level 0 and the value increases down the tree. Necessary to distinguish between creation
 	///     and deployed objects.
 	/// @returns Created @a Assembly and the source list read from the 'sourceList' field of the root
-	///     assembly.
+	///     assembly or an empty list (in recursive calls).
 	static std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> fromJSON(
 		Json::Value const& _json,
 		std::vector<std::string> const& _sourceList = {},