feat: add checks to make sure indexes are set

Author: ali-behjati

runtime/src/bank/pyth_accumulator.rs

@@ -139,6 +139,10 @@ pub fn update_v1(
     let v1_messages = if use_message_buffers {
         let mut measure = Measure::start("update_v1_load_program_accounts");
 
+        assert!(
+            bank.account_indexes_include_key(&*MESSAGE_BUFFER_PID),
+            "MessageBuffer program account index missing"
+        );
         message_buffer_accounts = bank
             .get_filtered_indexed_accounts(
                 &IndexKey::ProgramId(*MESSAGE_BUFFER_PID),
@@ -384,6 +388,11 @@ fn post_accumulator_attestation(
 pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV1> {
     let mut measure = Measure::start("update_v2_load_program_accounts");
 
+    assert!(
+        bank.account_indexes_include_key(&*ORACLE_PID),
+        "Oracle program account index missing"
+    );
+
     let accounts = bank
         .get_filtered_indexed_accounts(
             &IndexKey::ProgramId(*ORACLE_PID),

validator/src/main.rs

@@ -52,6 +52,7 @@ use {
             AccountIndex, AccountSecondaryIndexes, AccountSecondaryIndexesIncludeExclude,
             AccountsIndexConfig, IndexLimitMb,
         },
+        bank::pyth_accumulator::{MESSAGE_BUFFER_PID, ORACLE_PID},
         hardened_unpack::MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
         runtime_config::RuntimeConfig,
         snapshot_config::SnapshotConfig,
@@ -3193,6 +3194,24 @@ fn process_account_indexes(matches: &ArgMatches) -> AccountSecondaryIndexes {
     let exclude_keys = !account_indexes_exclude_keys.is_empty();
     let include_keys = !account_indexes_include_keys.is_empty();
 
+    if include_keys {
+        if !account_indexes_include_keys.contains(&*ORACLE_PID) || !account_indexes_include_keys.contains(&*MESSAGE_BUFFER_PID) {
+            panic!(
+                "The oracle program id and message buffer program id must be included in the account index. Add the following flags\n\
+                --account-index program-id\n\
+                --account-index-include-key {}\n\
+                --account-index-include-key {}\n",
+                &*ORACLE_PID, &*MESSAGE_BUFFER_PID
+            );
+        }
+    }
+
+    if exclude_keys {
+        if account_indexes_exclude_keys.contains(&*ORACLE_PID) || account_indexes_exclude_keys.contains(&*MESSAGE_BUFFER_PID) {
+            panic!("The oracle program id and message buffer program id must *not* be excluded from the account index.");
+        }
+    }
+
     let keys = if !account_indexes.is_empty() && (exclude_keys || include_keys) {
         let account_indexes_keys = AccountSecondaryIndexesIncludeExclude {
             exclude: exclude_keys,