Merge branch 'PLEX-1920_add_defaults' into solana-logtrigger-cap-bump

Author: silaslenihan

go.mod

@@ -38,10 +38,10 @@ require (
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.67
+	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-20260128193424-4b6c859e4e0b
+	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260202141300-eb2d1a0d35ae
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
 	github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
 	github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260106052706-6dd937cb5ec6

go.sum

@@ -326,14 +326,14 @@ github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTKTZEPyEU1YufO1admnw=
-github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
+github.com/smartcontractkit/chain-selectors v1.0.89 h1:L9oWZGqQXWyTPnC6ODXgu3b0DFyLmJ9eHv+uJrE9IZY=
+github.com/smartcontractkit/chain-selectors v1.0.89/go.mod h1:qy7whtgG5g+7z0jt0nRyii9bLND9m15NZTzuQPkMZ5w=
 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg=
 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY=
 github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4 h1:GCzrxDWn3b7jFfEA+WiYRi8CKoegsayiDoJBCjYkneE=
 github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
-github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260128193424-4b6c859e4e0b h1:SFlS50BiFDtTqB/t3k4SQQXGkOVvwa217CnDRgt7elU=
-github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260128193424-4b6c859e4e0b/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
+github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260202141300-eb2d1a0d35ae h1:FCNGzGp3cSUdoOyg9KLkaWFT3t2I+HPnbuWlMWpBAcg=
+github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260202141300-eb2d1a0d35ae/go.mod h1:Jqt53s27Tr0jDl8mdBXg1xhu6F8Fci8JOuq43tgHOM8=
 github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b h1:QuI6SmQFK/zyUlVWEf0GMkiUYBPY4lssn26nKSd/bOM=
 github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY=
 github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 h1:B7itmjy+CMJ26elVw/cAJqqhBQ3Xa/mBYWK0/rQ5MuI=

pkg/chains/solana/proto_helpers.go

@@ -1419,15 +1419,15 @@ func ConvertValueComparatorsToProto(comparators []solprimitives.IndexedValueComp
 		return nil
 	}
 
-	out := make([]*IndexedValueComparator, len(comparators))
+	out := make([]*IndexedValueComparator, 0)
 	for _, c := range comparators {
 		out = append(out, &IndexedValueComparator{
 			Value:    c.Value,
 			Operator: chaincommonpb.ComparisonOperator(c.Operator),
 		})
 	}
 
-	return nil
+	return out
 }
 
 func ConvertValueCompraratorsFromProto(comparators []*IndexedValueComparator) []solprimitives.IndexedValueComparator {

pkg/chains/solana/proto_helpers_test.go

@@ -291,17 +291,17 @@ func TestExpressions_Roundtrip_SolanaPrimitives(t *testing.T) {
 		{Value: typesolana.IndexedValue{1, 2, 3}, Operator: 0},
 	})
 
-	root := query.Or(query.And(a, e), evBy)
-
+	expressions := []query.Expression{a, e, evBy}
 	// to proto
-	pb, err := conv.ConvertExpressionsToProto([]query.Expression{root})
+	pb, err := conv.ConvertExpressionsToProto(expressions)
 	require.NoError(t, err)
-	require.Len(t, pb, 1)
+	require.Len(t, pb, 3)
 
 	// from proto
 	round, err := conv.ConvertExpressionsFromProto(pb)
 	require.NoError(t, err)
-	require.Len(t, round, 1)
+	require.Len(t, round, 3)
+	require.Equal(t, expressions, round)
 }
 
 func TestLPFilterAndSubkeysConverters(t *testing.T) {

pkg/settings/cresettings/defaults.json

@@ -38,6 +38,7 @@
 		"ChainAllowed": {
 			"Default": "false",
 			"Values": {
+				"12463857294658392847": "true",
 				"12922642891491394802": "true",
 				"3379446385462418246": "true"
 			}

pkg/settings/cresettings/defaults.toml

@@ -40,6 +40,7 @@ LogEventLimit = '1000'
 Default = 'false'
 
 [PerWorkflow.ChainAllowed.Values]
+12463857294658392847 = 'true'
 12922642891491394802 = 'true'
 3379446385462418246 = 'true'
 

pkg/settings/cresettings/settings.go

@@ -100,13 +100,13 @@ var Default = Schema{
 		LogLineLimit:                  Size(config.KByte),
 		LogEventLimit:                 Int(1_000),
 		ChainAllowed: PerChainSelector(Bool(false), map[string]bool{
-			// geth-testnet
-			"3379446385462418246": true,
 			// geth-devnet2
 			"12922642891491394802": true,
 			// solana-devnet
 			"16423721717087811551": true,
-			// solana-test (TEST_22222222222222222222222222222222222222222222)
+			// geth-testnet
+			"3379446385462418246": true,
+			// solana-testnet
 			"12463857294658392847": true,
 		}),