Query if we don't have chain ID, then add to events

Author: matthew1001

internal/ethereum/ethereum.go

@@ -51,6 +51,7 @@ type ethConnector struct {
 	blockListener              *blockListener
 	eventFilterPollingInterval time.Duration
 	traceTXForRevertReason     bool
+	chainID                    string
 
 	mux          sync.Mutex
 	eventStreams map[fftypes.UUID]*eventStream

internal/ethereum/event_enricher.go

@@ -19,6 +19,7 @@ package ethereum
 import (
 	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-common/pkg/i18n"
@@ -54,9 +55,18 @@ func (ee *eventEnricher) filterEnrichEthLog(ctx context.Context, f *eventFilter,
 	log.L(ctx).Infof("detected event '%s'", protoID)
 	data, decoded := ee.decodeLogData(ctx, f.Event, ethLog.Topics, ethLog.Data)
 
+	if len(ee.connector.chainID) == 0 {
+		resp, _, err := ee.connector.IsReady(ctx)
+		if !resp.Ready || err != nil {
+			return nil, matched, decoded, err
+		}
+	}
+
 	info := eventInfo{
-		logJSONRPC:      *ethLog,
-		ChainIdentifier: fftypes.JSONAnyPtr("asd"),
+		logJSONRPC: *ethLog,
+		ChainIdentifier: fftypes.JSONAnyPtr(fmt.Sprintf(`{
+			"chainId": "%s"
+		}`, ee.connector.chainID)),
 	}
 
 	var timestamp *fftypes.FFTime

internal/ethereum/statuses.go

@@ -30,16 +30,15 @@ func (c *ethConnector) IsLive(_ context.Context) (*ffcapi.LiveResponse, ffcapi.E
 }
 
 func (c *ethConnector) IsReady(ctx context.Context) (*ffcapi.ReadyResponse, ffcapi.ErrorReason, error) {
-	var chainID string
-	err := c.backend.CallRPC(ctx, &chainID, "net_version")
+	err := c.backend.CallRPC(ctx, &c.chainID, "net_version")
 	if err != nil {
 		return &ffcapi.ReadyResponse{
 			Ready: false,
 		}, mapError(netVersionRPCMethods, err.Error()), err.Error()
 	}
 
 	details := &fftypes.JSONObject{
-		"chainID": chainID,
+		"chainID": c.chainID,
 	}
 
 	return &ffcapi.ReadyResponse{