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

Include all overloaded events in ABI
This commit is contained in:
Alex Beregszaszi 2017-08-28 20:43:55 +01:00 committed by GitHub
commit b364bd048f
3 changed files with 31 additions and 3 deletions

View File

@ -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:

View File

@ -176,12 +176,20 @@ 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)
{
eventsSeen.insert(e->name());
/// 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(eventSignature);
m_interfaceEvents->push_back(e);
}
}
}
return *m_interfaceEvents;
}

View File

@ -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": []
}
])";