Solana LogTrigger: Support Anchor 0.3 and CPI Events

go.mod

@@ -43,7 +43,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.89
 	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10
 	github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
-	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f
+	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260408132951-ec901b7b5b59
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
 	github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260205130626-db2a2aab956b
 	github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0

pkg/chains/solana/proto_helpers.go

@@ -1540,6 +1540,11 @@ func ConvertLPFilterQueryFromProto(p *LPFilterQuery) (*solana.LPFilterQuery, err
 		}
 	}
 
+	cpiFilterConfig, err := ConvertCPIFilterConfigToProto(p.CpiFilterConfig)
+	if err != nil {
+		return nil, fmt.Errorf("convert cpi filter config err: %w", err)
+	}
+
 	return &solana.LPFilterQuery{
 		Name:            p.Name,
 		Address:         addr,
@@ -1551,6 +1556,21 @@ func ConvertLPFilterQueryFromProto(p *LPFilterQuery) (*solana.LPFilterQuery, err
 		Retention:       time.Duration(p.Retention),
 		MaxLogsKept:     p.MaxLogsKept,
 		IncludeReverted: p.IncludeReverted,
+		CPIFilterConfig: cpiFilterConfig,
+	}, nil
+}
+
+func ConvertCPIFilterConfigToProto(c *CPIFilterConfig) (*solana.CPIFilterConfig, error) {
+	if c == nil {
+		return nil, nil
+	}
+	addr, err := ConvertPublicKeyFromProto(c.DestAddress)
+	if err != nil {
+		return nil, fmt.Errorf("convert address err: %w", err)
+	}
+	return &solana.CPIFilterConfig{
+		DestAddress: addr,
+		MethodName:  string(c.MethodName),
 	}, nil
 }
 
@@ -1596,6 +1616,17 @@ func ConvertLPFilterQueryToProto(f *solana.LPFilterQuery) *LPFilterQuery {
 		Retention:       int64(f.Retention),
 		MaxLogsKept:     f.MaxLogsKept,
 		IncludeReverted: f.IncludeReverted,
+		CpiFilterConfig: convertCPIFilterConfigGoToProto(f.CPIFilterConfig),
+	}
+}
+
+func convertCPIFilterConfigGoToProto(c *solana.CPIFilterConfig) *CPIFilterConfig {
+	if c == nil {
+		return nil
+	}
+	return &CPIFilterConfig{
+		DestAddress: c.DestAddress[:],
+		MethodName:  []byte(c.MethodName),
 	}
 }
 

pkg/chains/solana/proto_helpers_test.go

@@ -401,3 +401,61 @@ func TestErrorJoinBehavior_PublicKeys(t *testing.T) {
 	// Ensure errors.Is behaves reasonably (not super strict here)
 	require.True(t, errors.Is(err, err))
 }
+
+func TestConvertCPIFilterConfigToProto(t *testing.T) {
+	t.Run("nil input returns nil", func(t *testing.T) {
+		got, err := conv.ConvertCPIFilterConfigToProto(nil)
+		require.NoError(t, err)
+		require.Nil(t, got)
+	})
+
+	t.Run("valid config converts successfully", func(t *testing.T) {
+		addr := mkBytes(typesolana.PublicKeyLength, 0xAB)
+		methodName := []byte("someMethod")
+		in := &conv.CPIFilterConfig{
+			DestAddress: addr,
+			MethodName:  methodName,
+		}
+		got, err := conv.ConvertCPIFilterConfigToProto(in)
+		require.NoError(t, err)
+		require.NotNil(t, got)
+		require.Equal(t, addr, got.DestAddress[:])
+		require.Equal(t, "someMethod", got.MethodName)
+	})
+
+	t.Run("nil address returns error", func(t *testing.T) {
+		in := &conv.CPIFilterConfig{
+			DestAddress: nil,
+			MethodName:  []byte("method"),
+		}
+		got, err := conv.ConvertCPIFilterConfigToProto(in)
+		require.Error(t, err)
+		require.Nil(t, got)
+		require.Contains(t, err.Error(), "convert address err")
+		require.Contains(t, err.Error(), "address can't be nil")
+	})
+
+	t.Run("invalid address length returns error", func(t *testing.T) {
+		in := &conv.CPIFilterConfig{
+			DestAddress: mkBytes(typesolana.PublicKeyLength-1, 0x01),
+			MethodName:  []byte("method"),
+		}
+		got, err := conv.ConvertCPIFilterConfigToProto(in)
+		require.Error(t, err)
+		require.Nil(t, got)
+		require.Contains(t, err.Error(), "convert address err")
+		require.Contains(t, err.Error(), "invalid public key")
+	})
+
+	t.Run("empty method name is allowed", func(t *testing.T) {
+		addr := mkBytes(typesolana.PublicKeyLength, 0x11)
+		in := &conv.CPIFilterConfig{
+			DestAddress: addr,
+			MethodName:  nil,
+		}
+		got, err := conv.ConvertCPIFilterConfigToProto(in)
+		require.NoError(t, err)
+		require.NotNil(t, got)
+		require.Equal(t, "", got.MethodName)
+	})
+}