cleanup

Author: silaslenihan

go.mod

@@ -27,16 +27,16 @@ require (
 	github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20251215152504-b1e41f508340
 	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260521164805-26d78d5e1243
 	github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20260521164805-26d78d5e1243
-	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260526195338-adcf8013a1b7
+	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260602131523-5168ac1ba014
 	github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad
 	github.com/smartcontractkit/libocr v0.0.0-20260403184524-b6409238958d
 	github.com/stretchr/testify v1.11.1
 	go.opentelemetry.io/otel v1.43.0
 	go.opentelemetry.io/otel/metric v1.43.0
 	go.uber.org/zap v1.27.1
-	golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa
+	golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a
 	golang.org/x/sync v0.20.0
-	golang.org/x/text v0.35.0
+	golang.org/x/text v0.37.0
 )
 
 require (
@@ -155,7 +155,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.9 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.4 // indirect
-	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260518142424-bacfb6ba4146 // indirect
+	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260528204832-58c7145c53f8 // indirect
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
 	github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260319180422-b5808c964785 // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
@@ -200,14 +200,14 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.3.1 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
-	golang.org/x/term v0.41.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	golang.org/x/crypto v0.52.0 // indirect
+	golang.org/x/mod v0.36.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	golang.org/x/telemetry v0.0.0-20260519152614-eab6ae52b5e2 // indirect
+	golang.org/x/term v0.43.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
+	golang.org/x/tools v0.45.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
@@ -220,4 +220,5 @@ require (
 retract v1.1.0 // tag moved - checksum mismatch
 
 replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20251014124537-af6b1684fe15
+
 replace github.com/smartcontractkit/chainlink-common => ../chainlink-common

go.sum

@@ -234,10 +234,26 @@ func (a *SolanaAccessor) registerFilterIfNotExists(
 
 	eventName := filterConfig.chainSpecificName
 
-	filter := filterFromConfig(filterConfig, sourceAddr, destAddr)
-	filter.StartingBlock = conf.GetStartingBlock()
-	filter.Retention = conf.GetRetention()
-	filter.MaxLogsKept = conf.GetMaxLogsKept()
+	subKeyPaths := processSubKeyPaths(filterConfig)
+
+	filter := logpollertypes.Filter{
+		Address:         logpollertypes.PublicKey(sourceAddr),
+		EventName:       eventName,
+		EventSig:        logpollertypes.NewEventSignatureFromName(eventName),
+		ContractIdl:     filterConfig.idl,
+		SubkeyPaths:     subKeyPaths,
+		StartingBlock:   conf.GetStartingBlock(),
+		Retention:       conf.GetRetention(),
+		MaxLogsKept:     conf.GetMaxLogsKept(),
+		IncludeReverted: filterConfig.includeReverted,
+	}
+
+	if filterConfig.isCPIFilter() {
+		filter.SetCPIFilterConfig(logpollertypes.ExtraFilterConfig{
+			DestProgram:     logpollertypes.PublicKey(destAddr),
+			MethodSignature: logpollertypes.NewMethodSignatureFromName(filterConfig.methodName),
+		})
+	}
 
 	filterName, err := deriveName(filter)
 	if err != nil {
@@ -274,27 +290,6 @@ func (a *SolanaAccessor) registerFilterIfNotExists(
 	return nil
 }
 
-func filterFromConfig(filterConfig filterConfig, sourceAddr solana.PublicKey, destAddr solana.PublicKey) logpollertypes.Filter {
-	eventName := filterConfig.chainSpecificName
-	filter := logpollertypes.Filter{
-		Address:         logpollertypes.PublicKey(sourceAddr),
-		EventName:       eventName,
-		EventSig:        logpollertypes.NewEventSignatureFromName(eventName),
-		ContractIdl:     filterConfig.idl,
-		SubkeyPaths:     processSubKeyPaths(filterConfig),
-		IncludeReverted: filterConfig.includeReverted,
-	}
-
-	if filterConfig.isCPIFilter() {
-		filter.SetCPIFilterConfig(logpollertypes.ExtraFilterConfig{
-			DestProgram:     logpollertypes.PublicKey(destAddr),
-			MethodSignature: logpollertypes.NewMethodSignatureFromName(filterConfig.methodName),
-		})
-	}
-
-	return filter
-}
-
 // convertCCIPMessageSent converts a Solana-specific CCIPMessageSent event to a generic
 // ccipocr3.SendRequestedEvent. This function is idempotent and performs a
 // one-to-one mapping of event fields from the Solana format to the standard CCIP format.

pkg/solana/ccip/chainaccessor/event.go

@@ -1,9 +1,6 @@
 package chainaccessor
 
 import (
-	"crypto/sha3"
-	"encoding/json"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -12,14 +9,16 @@ import (
 )
 
 func Test_deriveName(t *testing.T) {
+	const legacyFalseName = "MyEvent.11111111111111111111111111111111.c6962b9b24636b9e8a6ab96d9cb3934e03905cd657cb872452720c7338420f69"
+
 	f1 := types.Filter{
 		EventName:       "MyEvent",
 		SubkeyPaths:     [][]string{{"a"}, {"b"}, {"c"}},
 		IncludeReverted: false,
 	}
 	name1, err := deriveName(f1)
 	require.NoError(t, err)
-	require.Equal(t, legacyDerivedNameForTest(t, f1), name1)
+	require.Equal(t, legacyFalseName, name1)
 
 	f2 := f1
 	f2.SubkeyPaths = [][]string{{"a"}, {"b", "c"}}
@@ -33,29 +32,3 @@ func Test_deriveName(t *testing.T) {
 	require.NoError(t, err3)
 	require.NotEqual(t, name1, name3)
 }
-
-func legacyDerivedNameForTest(t *testing.T, filter types.Filter) string {
-	t.Helper()
-
-	data := filter.EventSig[:]
-	data = append(data, filter.Address.ToSolana().Bytes()...)
-	data = append(data, []byte(filter.EventName)...)
-
-	if len(filter.SubkeyPaths) > 0 {
-		b, err := json.Marshal(filter.SubkeyPaths)
-		require.NoError(t, err)
-		data = append(data, b...)
-	}
-
-	if filter.IsCPIFilter() {
-		data = append(data, filter.ExtraFilterConfig.DestProgram[:]...)
-		data = append(data, filter.ExtraFilterConfig.MethodSignature[:]...)
-	}
-
-	hash := sha3.Sum256(data)
-	if filter.IsCPIFilter() {
-		return fmt.Sprintf("cpi.%s.%s.%x", filter.EventName, filter.Address.String(), hash[:])
-	}
-
-	return fmt.Sprintf("%s.%s.%x", filter.EventName, filter.Address.String(), hash[:])
-}