accounts/abi/abigen: create ContractEventName method

accounts/abi/abigen/source2.go.tpl

@@ -141,6 +141,10 @@ var (
 
 		const {{$contract.Type}}{{.Normalized.Name}}EventName = "{{.Original.Name}}"
 
+		func ({{$contract.Type}}{{.Normalized.Name}}) ContractEventName() string {
+			return {{$contract.Type}}{{.Normalized.Name}}EventName
+		}
+
 		func ({{ decapitalise $contract.Type}} *{{$contract.Type}}) Unpack{{.Normalized.Name}}Event(log *types.Log) (*{{$contract.Type}}{{.Normalized.Name}}, error) {
 			event := "{{.Original.Name}}"
 			if log.Topics[0] != {{ decapitalise $contract.Type}}.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/crowdsale.go.txt

@@ -254,6 +254,10 @@ type CrowdsaleFundTransfer struct {
 
 const CrowdsaleFundTransferEventName = "FundTransfer"
 
+func (CrowdsaleFundTransfer) ContractEventName() string {
+	return CrowdsaleFundTransferEventName
+}
+
 func (crowdsale *Crowdsale) UnpackFundTransferEvent(log *types.Log) (*CrowdsaleFundTransfer, error) {
 	event := "FundTransfer"
 	if log.Topics[0] != crowdsale.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/dao.go.txt

@@ -431,6 +431,10 @@ type DAOChangeOfRules struct {
 
 const DAOChangeOfRulesEventName = "ChangeOfRules"
 
+func (DAOChangeOfRules) ContractEventName() string {
+	return DAOChangeOfRulesEventName
+}
+
 func (dAO *DAO) UnpackChangeOfRulesEvent(log *types.Log) (*DAOChangeOfRules, error) {
 	event := "ChangeOfRules"
 	if log.Topics[0] != dAO.abi.Events[event].ID {
@@ -464,6 +468,10 @@ type DAOMembershipChanged struct {
 
 const DAOMembershipChangedEventName = "MembershipChanged"
 
+func (DAOMembershipChanged) ContractEventName() string {
+	return DAOMembershipChangedEventName
+}
+
 func (dAO *DAO) UnpackMembershipChangedEvent(log *types.Log) (*DAOMembershipChanged, error) {
 	event := "MembershipChanged"
 	if log.Topics[0] != dAO.abi.Events[event].ID {
@@ -499,6 +507,10 @@ type DAOProposalAdded struct {
 
 const DAOProposalAddedEventName = "ProposalAdded"
 
+func (DAOProposalAdded) ContractEventName() string {
+	return DAOProposalAddedEventName
+}
+
 func (dAO *DAO) UnpackProposalAddedEvent(log *types.Log) (*DAOProposalAdded, error) {
 	event := "ProposalAdded"
 	if log.Topics[0] != dAO.abi.Events[event].ID {
@@ -534,6 +546,10 @@ type DAOProposalTallied struct {
 
 const DAOProposalTalliedEventName = "ProposalTallied"
 
+func (DAOProposalTallied) ContractEventName() string {
+	return DAOProposalTalliedEventName
+}
+
 func (dAO *DAO) UnpackProposalTalliedEvent(log *types.Log) (*DAOProposalTallied, error) {
 	event := "ProposalTallied"
 	if log.Topics[0] != dAO.abi.Events[event].ID {
@@ -569,6 +585,10 @@ type DAOVoted struct {
 
 const DAOVotedEventName = "Voted"
 
+func (DAOVoted) ContractEventName() string {
+	return DAOVotedEventName
+}
+
 func (dAO *DAO) UnpackVotedEvent(log *types.Log) (*DAOVoted, error) {
 	event := "Voted"
 	if log.Topics[0] != dAO.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/eventchecker.go.txt

@@ -59,6 +59,10 @@ type EventCheckerDynamic struct {
 
 const EventCheckerDynamicEventName = "dynamic"
 
+func (EventCheckerDynamic) ContractEventName() string {
+	return EventCheckerDynamicEventName
+}
+
 func (eventChecker *EventChecker) UnpackDynamicEvent(log *types.Log) (*EventCheckerDynamic, error) {
 	event := "dynamic"
 	if log.Topics[0] != eventChecker.abi.Events[event].ID {
@@ -90,6 +94,10 @@ type EventCheckerEmpty struct {
 
 const EventCheckerEmptyEventName = "empty"
 
+func (EventCheckerEmpty) ContractEventName() string {
+	return EventCheckerEmptyEventName
+}
+
 func (eventChecker *EventChecker) UnpackEmptyEvent(log *types.Log) (*EventCheckerEmpty, error) {
 	event := "empty"
 	if log.Topics[0] != eventChecker.abi.Events[event].ID {
@@ -123,6 +131,10 @@ type EventCheckerIndexed struct {
 
 const EventCheckerIndexedEventName = "indexed"
 
+func (EventCheckerIndexed) ContractEventName() string {
+	return EventCheckerIndexedEventName
+}
+
 func (eventChecker *EventChecker) UnpackIndexedEvent(log *types.Log) (*EventCheckerIndexed, error) {
 	event := "indexed"
 	if log.Topics[0] != eventChecker.abi.Events[event].ID {
@@ -156,6 +168,10 @@ type EventCheckerMixed struct {
 
 const EventCheckerMixedEventName = "mixed"
 
+func (EventCheckerMixed) ContractEventName() string {
+	return EventCheckerMixedEventName
+}
+
 func (eventChecker *EventChecker) UnpackMixedEvent(log *types.Log) (*EventCheckerMixed, error) {
 	event := "mixed"
 	if log.Topics[0] != eventChecker.abi.Events[event].ID {
@@ -189,6 +205,10 @@ type EventCheckerUnnamed struct {
 
 const EventCheckerUnnamedEventName = "unnamed"
 
+func (EventCheckerUnnamed) ContractEventName() string {
+	return EventCheckerUnnamedEventName
+}
+
 func (eventChecker *EventChecker) UnpackUnnamedEvent(log *types.Log) (*EventCheckerUnnamed, error) {
 	event := "unnamed"
 	if log.Topics[0] != eventChecker.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/nameconflict.go.txt

@@ -99,6 +99,10 @@ type NameConflictLog struct {
 
 const NameConflictLogEventName = "log"
 
+func (NameConflictLog) ContractEventName() string {
+	return NameConflictLogEventName
+}
+
 func (nameConflict *NameConflict) UnpackLogEvent(log *types.Log) (*NameConflictLog, error) {
 	event := "log"
 	if log.Topics[0] != nameConflict.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/numericmethodname.go.txt

@@ -90,6 +90,10 @@ type NumericMethodNameE1TestEvent struct {
 
 const NumericMethodNameE1TestEventEventName = "_1TestEvent"
 
+func (NumericMethodNameE1TestEvent) ContractEventName() string {
+	return NumericMethodNameE1TestEventEventName
+}
+
 func (numericMethodName *NumericMethodName) UnpackE1TestEventEvent(log *types.Log) (*NumericMethodNameE1TestEvent, error) {
 	event := "_1TestEvent"
 	if log.Topics[0] != numericMethodName.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/overload.go.txt

@@ -79,6 +79,10 @@ type OverloadBar struct {
 
 const OverloadBarEventName = "bar"
 
+func (OverloadBar) ContractEventName() string {
+	return OverloadBarEventName
+}
+
 func (overload *Overload) UnpackBarEvent(log *types.Log) (*OverloadBar, error) {
 	event := "bar"
 	if log.Topics[0] != overload.abi.Events[event].ID {
@@ -112,6 +116,10 @@ type OverloadBar0 struct {
 
 const OverloadBar0EventName = "bar0"
 
+func (OverloadBar0) ContractEventName() string {
+	return OverloadBar0EventName
+}
+
 func (overload *Overload) UnpackBar0Event(log *types.Log) (*OverloadBar0, error) {
 	event := "bar0"
 	if log.Topics[0] != overload.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/token.go.txt

@@ -270,6 +270,10 @@ type TokenTransfer struct {
 
 const TokenTransferEventName = "Transfer"
 
+func (TokenTransfer) ContractEventName() string {
+	return TokenTransferEventName
+}
+
 func (token *Token) UnpackTransferEvent(log *types.Log) (*TokenTransfer, error) {
 	event := "Transfer"
 	if log.Topics[0] != token.abi.Events[event].ID {

accounts/abi/abigen/testdata/v2/tuple.go.txt

@@ -149,6 +149,10 @@ type TupleTupleEvent struct {
 
 const TupleTupleEventEventName = "TupleEvent"
 
+func (TupleTupleEvent) ContractEventName() string {
+	return TupleTupleEventEventName
+}
+
 func (tuple *Tuple) UnpackTupleEventEvent(log *types.Log) (*TupleTupleEvent, error) {
 	event := "TupleEvent"
 	if log.Topics[0] != tuple.abi.Events[event].ID {
@@ -181,6 +185,10 @@ type TupleTupleEvent2 struct {
 
 const TupleTupleEvent2EventName = "TupleEvent2"
 
+func (TupleTupleEvent2) ContractEventName() string {
+	return TupleTupleEvent2EventName
+}
+
 func (tuple *Tuple) UnpackTupleEvent2Event(log *types.Log) (*TupleTupleEvent2, error) {
 	event := "TupleEvent2"
 	if log.Topics[0] != tuple.abi.Events[event].ID {