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

Author: silaslenihan

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,
 		}),