Make chainId first class, not under sub structure in JSON

Signed-off-by: Matthew Whitehead <[email protected]>

Author: matthew1001

internal/ethereum/event_enricher.go

@@ -19,7 +19,6 @@ package ethereum
 import (
 	"bytes"
 	"context"
-	"fmt"
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-common/pkg/i18n"
@@ -64,9 +63,7 @@ func (ee *eventEnricher) filterEnrichEthLog(ctx context.Context, f *eventFilter,
 
 	info := eventInfo{
 		logJSONRPC: *ethLog,
-		ChainIdentifier: fftypes.JSONAnyPtr(fmt.Sprintf(`{
-			"chainId": "%s"
-		}`, ee.connector.chainID)),
+		ChainId:    ee.connector.chainID,
 	}
 
 	var timestamp *fftypes.FFTime

internal/ethereum/event_stream.go

@@ -45,10 +45,10 @@ type eventFilter struct {
 // eventInfo is the top-level structure we pass to applications for each event (through the FFCAPI framework)
 type eventInfo struct {
 	logJSONRPC
-	InputMethod     string                 `json:"inputMethod,omitempty"`     // the method invoked, if it matched one of the signatures in the listener definition
-	InputArgs       *fftypes.JSONAny       `json:"inputArgs,omitempty"`       // the method parameters, if the method matched one of the signatures in the listener definition
-	InputSigner     *ethtypes.Address0xHex `json:"inputSigner,omitempty"`     // the signing `from` address of the transaction
-	ChainIdentifier *fftypes.JSONAny       `json:"chainIdentifier,omitempty"` // an identifier for the chain this event relates to
+	InputMethod string                 `json:"inputMethod,omitempty"` // the method invoked, if it matched one of the signatures in the listener definition
+	InputArgs   *fftypes.JSONAny       `json:"inputArgs,omitempty"`   // the method parameters, if the method matched one of the signatures in the listener definition
+	InputSigner *ethtypes.Address0xHex `json:"inputSigner,omitempty"` // the signing `from` address of the transaction
+	ChainId     string                 `json:"chainId,omitempty"`     // an identifier for the chain this event relates to
 }
 
 // eventStream is the state we hold in memory for each eventStream