refactor(validation): rename must_call_programs to require_one_of_programs

Author: dev-jodee

crates/lib/src/config.rs

@@ -137,11 +137,11 @@ pub struct ValidationConfig {
     /// When >0, prices with a block_id older than `current_slot - max_price_staleness_slots` are rejected.
     #[serde(default)]
     pub max_price_staleness_slots: u64,
-    /// Programs that must be called by the transaction (at least one must appear).
+    /// Programs where at least one must be called by the transaction (OR semantics).
     /// Each required program must also be listed in `allowed_programs`.
     /// Default: empty (no restriction).
-    #[serde(default)]
-    pub must_call_programs: Vec<String>,
+    #[serde(default, alias = "must_call_programs")]
+    pub require_one_of_programs: Vec<String>,
 }
 
 impl ValidationConfig {
@@ -891,6 +891,32 @@ rate_limit = 1
         );
     }
 
+    #[test]
+    fn test_require_one_of_programs_parsing_alias_must_call_programs() {
+        let legacy_key_alias_toml = r#"
+[validation]
+max_allowed_lamports = 1
+max_signatures = 1
+allowed_programs = ["11111111111111111111111111111111"]
+must_call_programs = ["11111111111111111111111111111111"]
+allowed_tokens = []
+allowed_spl_paid_tokens = []
+disallowed_accounts = []
+price_source = "Mock"
+
+[kora]
+rate_limit = 1
+"#;
+
+        let config = crate::tests::toml_mock::create_invalid_config(legacy_key_alias_toml)
+            .expect("Config with legacy must_call_programs key should parse");
+
+        assert_eq!(
+            config.validation.require_one_of_programs,
+            vec!["11111111111111111111111111111111".to_string()]
+        );
+    }
+
     #[test]
     fn test_token2022_extension_blocking_check() {
         let config = ConfigBuilder::new()

crates/lib/src/tests/config_mock.rs

@@ -94,7 +94,7 @@ impl ConfigMockBuilder {
                     token_2022: Token2022Config::default(),
                     allow_durable_transactions: false,
                     max_price_staleness_slots: 0,
-                    must_call_programs: vec![],
+                    require_one_of_programs: vec![],
                 },
                 kora: KoraConfig {
                     rate_limit: 100,
@@ -165,8 +165,8 @@ impl ConfigMockBuilder {
         self
     }
 
-    pub fn with_must_call_programs(mut self, programs: Vec<String>) -> Self {
-        self.config.validation.must_call_programs = programs;
+    pub fn with_require_one_of_programs(mut self, programs: Vec<String>) -> Self {
+        self.config.validation.require_one_of_programs = programs;
         self
     }
 
@@ -290,7 +290,7 @@ impl ValidationConfigBuilder {
                 token_2022: Token2022Config::default(),
                 allow_durable_transactions: false,
                 max_price_staleness_slots: 0,
-                must_call_programs: vec![],
+                require_one_of_programs: vec![],
             },
         }
     }

crates/lib/src/tests/toml_mock.rs

@@ -31,7 +31,7 @@ struct ValidationSection {
     max_allowed_lamports: u64,
     max_signatures: u64,
     allowed_programs: Vec<String>,
-    must_call_programs: Vec<String>,
+    require_one_of_programs: Vec<String>,
     allowed_tokens: Vec<String>,
     allowed_spl_paid_tokens: SplTokenConfig,
     disallowed_accounts: Vec<String>,
@@ -56,7 +56,7 @@ impl Default for ValidationSection {
             max_allowed_lamports: 1000000000,
             max_signatures: 10,
             allowed_programs: vec!["program1".to_string()],
-            must_call_programs: vec![],
+            require_one_of_programs: vec![],
             allowed_tokens: vec!["token1".to_string()],
             allowed_spl_paid_tokens: SplTokenConfig::Allowlist(vec!["token2".to_string()]),
             disallowed_accounts: vec![],
@@ -91,8 +91,8 @@ impl ConfigBuilder {
         self
     }
 
-    pub fn with_must_call_programs(mut self, programs: Vec<&str>) -> Self {
-        self.validation.must_call_programs = programs.iter().map(|s| s.to_string()).collect();
+    pub fn with_require_one_of_programs(mut self, programs: Vec<&str>) -> Self {
+        self.validation.require_one_of_programs = programs.iter().map(|s| s.to_string()).collect();
         self
     }
 
@@ -289,13 +289,13 @@ impl ConfigBuilder {
             )
         };
 
-        let must_call_list = if self.validation.must_call_programs.is_empty() {
+        let require_one_of_list = if self.validation.require_one_of_programs.is_empty() {
             "[]".to_string()
         } else {
             format!(
                 "[{}]",
                 self.validation
-                    .must_call_programs
+                    .require_one_of_programs
                     .iter()
                     .map(|p| format!("\"{p}\""))
                     .collect::<Vec<_>>()
@@ -308,15 +308,15 @@ impl ConfigBuilder {
             max_allowed_lamports = {}\n\
             max_signatures = {}\n\
             allowed_programs = [{}]\n\
-            must_call_programs = {}\n\
+            require_one_of_programs = {}\n\
             allowed_tokens = [{}]\n\
             allowed_spl_paid_tokens = {}\n\
             disallowed_accounts = {}\n\
             price_source = \"{}\"\n\n",
             self.validation.max_allowed_lamports,
             self.validation.max_signatures,
             programs_list,
-            must_call_list,
+            require_one_of_list,
             tokens_list,
             spl_tokens_config,
             disallowed_list,