Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 9 insertions, 3 deletions

diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
index 8b7d9e06..6eec54ea 100644
--- a/libevmasm/LinkerObject.cpp
+++ b/libevmasm/LinkerObject.cpp
@@ -21,6 +21,7 @@
 
 #include <libevmasm/LinkerObject.h>
 #include <libdevcore/CommonData.h>
+#include <libdevcore/Keccak256.h>
 
 using namespace dev;
 using namespace dev::eth;
@@ -50,14 +51,19 @@ string LinkerObject::toHex() const
 	for (auto const& ref: linkReferences)
 	{
 		size_t pos = ref.first * 2;
-		string const& name = ref.second;
+		string hash = libraryPlaceholder(ref.second);
 		hex[pos] = hex[pos + 1] = hex[pos + 38] = hex[pos + 39] = '_';
 		for (size_t i = 0; i < 36; ++i)
-			hex[pos + 2 + i] = i < name.size() ? name[i] : '_';
+			hex[pos + 2 + i] = hash.at(i);
 	}
 	return hex;
 }
 
+string LinkerObject::libraryPlaceholder(string const& _libraryName)
+{
+	return "$" + keccak256(_libraryName).hex().substr(0, 34) + "$";
+}
+
 h160 const*
 LinkerObject::matchLibrary(
 	string const& _linkRefName,
@@ -68,7 +74,7 @@ LinkerObject::matchLibrary(
 	if (it != _libraryAddresses.end())
 		return &it->second;
 	// If the user did not supply a fully qualified library name,
-	// try to match only the simple libary name
+	// try to match only the simple library name
 	size_t colon = _linkRefName.find(':');
 	if (colon == string::npos)
 		return nullptr;