addressed feedback

Author: silaslenihan

core/services/relay/evm/write_target.go

@@ -7,6 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -117,7 +118,7 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
 		ContractReader:   cr,
 		ChainWriter:      cw,
 		ConfigValidateFn: evaluate,
-		NodeAddress:      "nil",
+		NodeAddress:      config.FromAddress().String(),
 		ForwarderAddress: config.ForwarderAddress().String(),
 		TargetStrategy:   NewEVMTargetStrategy(cr, cw, config.ForwarderAddress().String(), gasLimitDefault, lggr),
 	}
@@ -262,15 +263,29 @@ func getChainInfo(chainID uint64) (monitor.ChainInfo, error) {
 		return monitor.ChainInfo{}, fmt.Errorf("failed to get chain details for chain %d and family %s: %w", chainID, chainFamily, err)
 	}
 
+	neworkName, err := ExtractNetwork(chainDetails.ChainName)
+	if err != nil {
+		return monitor.ChainInfo{}, fmt.Errorf("failed to get network name for chain %d: %w", chainID, err)
+	}
+
 	return monitor.ChainInfo{
 		ChainFamilyName: chainFamily,
 		ChainID:         strconv.Itoa(int(chainID)),
-		NetworkName:     chainDetails.ChainName,
-		// TODO: not sure what the difference between NetworkName and NetworkNameFull is
-		NetworkNameFull: "",
+		NetworkName:     neworkName,
+		NetworkNameFull: chainDetails.ChainName,
 	}, nil
 }
 
+func ExtractNetwork(selector string) (string, error) {
+	// Create a regexp pattern that matches any of the three.
+	re := regexp.MustCompile(`(mainnet|testnet|devnet)`)
+	name := re.FindString(selector)
+	if name == "" {
+		return "", fmt.Errorf("failed to extract network name from selector: %s", selector)
+	}
+	return name, nil
+}
+
 func GenerateWriteTargetName(chainID uint64) string {
 	id := fmt.Sprintf("write_%v@1.0.0", chainID)
 	chainName, err := chainselectors.NameFromChainId(chainID)

core/services/relay/evm/write_target_test.go

@@ -300,3 +300,49 @@ func TestEvmWrite(t *testing.T) {
 		assert.Empty(t, l)
 	})
 }
+
+func TestExtractNetwork(t *testing.T) {
+	testCases := []struct {
+		networkName  string
+		expectedName string
+		expectedErr  bool
+	}{
+		{
+			networkName:  "ethereum-testnet-goerli",
+			expectedName: "testnet",
+			expectedErr:  false,
+		},
+		{
+			networkName:  "ethereum-mainnet",
+			expectedName: "mainnet",
+			expectedErr:  false,
+		},
+		{
+			networkName:  "polygon-devnet",
+			expectedName: "devnet",
+			expectedErr:  false,
+		},
+		{
+			networkName:  "ethereum_test",
+			expectedName: "",
+			expectedErr:  true,
+		},
+		{
+			networkName:  "ethereum",
+			expectedName: "",
+			expectedErr:  true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.networkName, func(t *testing.T) {
+			networkName, err := evm.ExtractNetwork(tc.networkName)
+			if tc.expectedErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.Equal(t, tc.expectedName, networkName)
+		})
+	}
+}