Failing: cargo test --test 02_commit_and_undelegate test_committing_and_undelegating_one_account --profile test -- --nocapture

Author: snawaz

test-integration/configs/run-test-validator.sh

@@ -4,9 +4,9 @@ solana-test-validator \
   --log \
   --rpc-port 7799 \
   -r \
-  --account tEsT3eV6RFCWs1BZ7AXTzasHqTtMnMLCB2tjQ42TDXD \
+  --account mAGicPQYBMvcYveUZA5F5UNNwyHvfYh5xkLS2Fr1mev \
   $DIR/accounts/validator-authority.json \
-  --account DUH8h7rYjdTPYyBUEGAUwZv9ffz5wiM45GdYWYzogXjp \
+  --account EpJnX7ueXk7fKojBymqmVuCuwyhDQsYcLVL1XMsBbvDX \
   $DIR/accounts/validator-fees-vault.json \
   --account 7JrkjmZPprHwtuvtuGTXp9hwfGYFAQLnLeFM52kqAgXg \
   $DIR/accounts/protocol-fees-vault.json \

test-integration/programs/flexi-counter/src/processor.rs

@@ -342,7 +342,7 @@ fn process_add_and_schedule_commit(
     // Request the PDA counter account to be committed
     if undelegate {
         msg!("invoke commit_and_undelegate_accounts");
-        commit_diff_and_undelegate_accounts(
+        commit_and_undelegate_accounts(
             payer_info,
             vec![counter_pda_info],
             magic_context_info,

test-integration/run-test-validator.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
+#--log \
 solana-test-validator \
-  --log \
   --rpc-port \
   7799 \
   -r \

test-integration/test-tools/src/scheduled_commits.rs

@@ -27,6 +27,20 @@ pub fn extract_scheduled_commit_sent_signature_from_logs(
     None
 }
 
+pub fn extract_base_chain_commit_signature_from_logs(
+    logs: &[String],
+) -> Option<Signature> {
+    // ScheduledCommitSent signature: <signature>
+    for log in logs {
+        if log.starts_with("ScheduledCommitSent signature[0]: ") {
+            let commit_sig =
+                log.split_whitespace().last().expect("No signature found");
+            return Signature::from_str(commit_sig).ok();
+        }
+    }
+    None
+}
+
 #[allow(clippy::type_complexity)]
 pub fn extract_sent_commit_info_from_logs(
     logs: &[String],
@@ -208,9 +222,38 @@ impl IntegrationTestContext {
                     ephem_logs, scheduled_commmit_sent_sig
                 )
             })?;
+        // let (chain_logs, base_sig) = {
+        //     let logs = self
+        //         .fetch_ephemeral_logs(scheduled_commmit_sent_sig)
+        //         .with_context(|| {
+        //             format!(
+        //                 "Logs {:#?}\nScheduled commit sent sig {:?}",
+        //                 ephem_logs, scheduled_commmit_sent_sig
+        //             )
+        //         })?;
+        //     let sig =
+        //         extract_base_chain_commit_signature_from_logs(&logs)
+        //             .with_context(|| {
+        //                 format!("ScheduledCommitSent signature not found in logs, {:#?}", logs)
+        //             })?;
+
+        //     (logs, sig)
+        // };
+
+        // println!("CHAIN_LOGS: {:#?}", chain_logs);
+        // println!("Found chain commit signatures: {scheduled_commmit_sent_sig} / {base_sig}");
+
+        // self.dump_ephemeral_logs(base_sig);
+        // self.dump_chain_logs(base_sig);
+
+        // let base_logs = self.fetch_chain_logs(base_sig).with_context(|| {
+        //     format!(
+        //         "\x1b[31m{:#?} \n {:#?} \n {} / {}\n\x1b[0m",
+        //         ephem_logs, chain_logs, scheduled_commmit_sent_sig, base_sig
+        //     )
+        // })?;
 
-        println!("CHAIN_LOGS: {:#?}", chain_logs);
-        println!("Found chain commit signatures");
+        // println!("BASE CHAIN_LOGS: {:#?}", base_logs);
 
         let (included, excluded, feepayers, sigs) =
             extract_sent_commit_info_from_logs(&chain_logs);