Merge pull request #2837 from ethereum/event-overloading-abi

Include all overloaded events in ABI

3 files changed, 31 insertions, 3 deletions

diff --git a/Changelog.md b/Changelog.md
index 49855369..4af4419d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,9 +5,9 @@ Features:
  * Type Checker: Warn on using literals as tight packing parameters in ``keccak256``, ``sha3``, ``sha256`` and ``ripemd160``.
 
 Bugfixes:
+ * ABI JSON: Include all overloaded events.
  * Parser: Crash fix related to parseTypeName.
 
-
 ### 0.4.16 (2017-08-24)
 
 Features:
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 2e4ae72a..a805322b 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -176,11 +176,19 @@ vector<EventDefinition const*> const& ContractDefinition::interfaceEvents() cons
 		m_interfaceEvents.reset(new vector<EventDefinition const*>());
 		for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
 			for (EventDefinition const* e: contract->events())
-				if (eventsSeen.count(e->name()) == 0)
+			{
+				/// NOTE: this requires the "internal" version of an Event,
+				///       though here internal strictly refers to visibility,
+				///       and not to function encoding (jump vs. call)
+				auto const& function = e->functionType(true);
+				solAssert(function, "");
+				string eventSignature = function->externalSignature();
+				if (eventsSeen.count(eventSignature) == 0)
 				{
-					eventsSeen.insert(e->name());
+					eventsSeen.insert(eventSignature);
 					m_interfaceEvents->push_back(e);
 				}
+			}
 	}
 	return *m_interfaceEvents;
 }
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index 0512ba1f..4b9223de 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -423,6 +423,8 @@ BOOST_AUTO_TEST_CASE(events)
 			function f(uint a) returns(uint d) { return a * 7; }
 			event e1(uint b, address indexed c);
 			event e2();
+			event e2(uint a);
+			event e3() anonymous;
 		}
 	)";
 	char const* interface = R"([
@@ -467,6 +469,24 @@ BOOST_AUTO_TEST_CASE(events)
 		"type": "event",
 		"anonymous": false,
 		"inputs": []
+	},
+	{
+		"name": "e2",
+		"type": "event",
+		"anonymous": false,
+		"inputs": [
+		{
+			"indexed": false,
+			"name": "a",
+			"type": "uint256"
+		}
+		]
+	},
+	{
+		"name": "e3",
+		"type": "event",
+		"anonymous": true,
+		"inputs": []
 	}
 
 	])";