WORKED: cargo test --test 08_commit_update restore_ledger_committed_and_updated_accoun --profile test -- --nocapture

Author: snawaz

magicblock-api/src/magic_validator.rs

@@ -707,6 +707,11 @@ impl MagicValidator {
             try_get_remote_accounts_and_rpc_config(&self.config.accounts)?;
         let validator_pubkey = self.bank().get_identity();
 
+        println!(
+            "ensure_validator_funded_on_chain: {}",
+            remote_rpc_config.url().to_string()
+        );
+
         let lamports = RpcClient::new_with_commitment(
             remote_rpc_config.url().to_string(),
             CommitmentConfig {
@@ -723,6 +728,13 @@ impl MagicValidator {
                 err.to_string(),
             )
         })?;
+
+        println!(
+            "validator_pubkey: {}, balance: {}",
+            validator_pubkey,
+            (lamports as f64) / (LAMPORTS_PER_SOL as f64)
+        );
+
         if lamports < MIN_BALANCE_SOL * LAMPORTS_PER_SOL {
             Err(ApiError::ValidatorInsufficientlyFunded(
                 validator_pubkey,

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

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

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

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

test-integration/run-test-validator.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+solana-test-validator \
+  --log \
+  --rpc-port \
+  7799 \
+  -r \
+  --limit-ledger-size \
+  1000000 \
+  --upgradeable-program \
+  DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/schedulecommit/elfs/dlp.so \
+  none \
+  --upgradeable-program \
+  f1exzKGtdeVX3d6UXZ89cY7twiNJe9S5uq84RTA4Rq4 \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/target/deploy/program_flexi_counter.so \
+  none \
+  --upgradeable-program \
+  DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1 \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/schedulecommit/elfs/mdp.so \
+  none \
+  --upgradeable-program \
+  MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/programs/memo/memo.so \
+  none \
+  --url \
+  devnet \
+  --account \
+  tEsT3eV6RFCWs1BZ7AXTzasHqTtMnMLCB2tjQ42TDXD \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/validator-authority.json \
+  --account \
+  LUzidNSiPNjYNkxZcUm5hYHwnWPwsUfh2US1cpWwaBm \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/luzid-authority.json \
+  --account \
+  DUH8h7rYjdTPYyBUEGAUwZv9ffz5wiM45GdYWYzogXjp \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/validator-fees-vault.json \
+  --account \
+  7JrkjmZPprHwtuvtuGTXp9hwfGYFAQLnLeFM52kqAgXg \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/protocol-fees-vault.json \
+  --account \
+  9yXjZTevvMp1XgZSZEaziPRgFiXtAQChpnP2oX9eCpvt \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/non-delegated-cloneable-account1.json \
+  --account \
+  BHBuATGifAD4JbRpM5nVdyhKzPgv3p2CxLEHAqwBzAj5 \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/non-delegated-cloneable-account2.json \
+  --account \
+  2o48ieM95rmHqMWC5B3tTX4DL7cLm4m1Kuwjay3keQSv \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/non-delegated-cloneable-account3.json \
+  --account \
+  2EmfL3MqL3YHABudGNmajjCpR13NNEn9Y4LWxbDm6SwR \
+  /Users/snawaz/projects/mb/magicblock-validator/test-integration/configs/accounts/non-delegated-cloneable-account4.json

test-integration/test-ledger-restore/tests/08_commit_update.rs

@@ -42,6 +42,8 @@ fn restore_ledger_committed_and_updated_account() {
     let (_, ledger_path) = resolve_tmp_dir(TMP_DIR_LEDGER);
     let payer = payer_keypair();
 
+    println!("PAYER: {:?}", payer.pubkey());
+
     let (mut validator, _) = write(&ledger_path, &payer);
     validator.kill().unwrap();
 
@@ -52,7 +54,7 @@ fn restore_ledger_committed_and_updated_account() {
 fn write(ledger_path: &Path, payer: &Keypair) -> (Child, u64) {
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+    let (_tmpdir, mut validator, ctx) = setup_validator_with_local_remote(
         ledger_path,
         Some(programs),
         true,
@@ -166,7 +168,7 @@ fn read(ledger_path: &Path, payer_kp: &Keypair) -> Child {
     let payer = &payer_kp.pubkey();
     let programs = get_programs_with_flexi_counter();
 
-    let (_, mut validator, ctx) = setup_validator_with_local_remote(
+    let (_tmpdir, mut validator, ctx) = setup_validator_with_local_remote(
         ledger_path,
         Some(programs),
         false,

test-integration/test-runner/bin/run_tests.rs

@@ -822,6 +822,8 @@ fn start_validator(
         ValidatorCluster::Chain(program_loader)
             if std::env::var("FORCE_MAGIC_BLOCK_VALIDATOR").is_err() =>
         {
+            panic!("FORCE_MAGIC_BLOCK_VALIDATOR");
+
             start_test_validator_with_config(
                 &test_runner_paths,
                 program_loader,

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

@@ -140,7 +140,7 @@ impl IntegrationTestContext {
 
         // Try this up to 50 times since devnet here returns the version response instead of
         // the EncodedConfirmedTransactionWithStatusMeta at times
-        for idx in 1..=50 {
+        for idx in 1..=100 {
             let status = match rpc_client.get_transaction_with_config(
                 &sig,
                 RpcTransactionConfig {
@@ -156,10 +156,15 @@ impl IntegrationTestContext {
                             label, err
                         );
                     }
+                    // println!(
+                    //     "Failed to fetch transaction from {}: SLEEP for 400ms",
+                    //     label
+                    // );
                     sleep(Duration::from_millis(400));
                     continue;
                 }
             };
+            println!("RETURN LOGS");
             return Option::<Vec<String>>::from(
                 status
                     .transaction
@@ -176,6 +181,7 @@ impl IntegrationTestContext {
                     .clone(),
             );
         }
+        println!("RETURN NONE");
         None
     }
 

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

@@ -195,6 +195,8 @@ impl IntegrationTestContext {
             (logs, sig)
         };
 
+        println!("Find chain commit signatures");
+
         // 2. Find chain commit signatures
         let chain_logs = self
             .fetch_ephemeral_logs(scheduled_commmit_sent_sig)
@@ -205,6 +207,8 @@ impl IntegrationTestContext {
                 )
             })?;
 
+        println!("Found chain commit signatures");
+
         let (included, excluded, feepayers, sigs) =
             extract_sent_commit_info_from_logs(&chain_logs);
 

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

@@ -10,6 +10,7 @@ pub fn resolve_tmp_dir(env_var_override: &str) -> (TempDir, PathBuf) {
     let default_tmpdir = tempdir().unwrap();
     let tmpdir_path = std::env::var(env_var_override)
         .map(|s| PathBuf::from_str(&s).unwrap())
+        //.unwrap_or(default_tmpdir.keep());
         .unwrap_or(default_tmpdir.path().to_path_buf());
     (default_tmpdir, tmpdir_path)
 }

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

@@ -5,7 +5,7 @@ use std::{
 
 use serde::Deserialize;
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 struct Config {
     accounts: AccountsConfig,
     #[serde(default)]
@@ -14,18 +14,18 @@ struct Config {
     program: Vec<Program>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 struct AccountsConfig {
     remote: RemoteConfig,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 struct RemoteConfig {
     cluster: Option<String>,
     url: Option<String>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 struct Rpc {
     port: u16,
 }
@@ -36,7 +36,7 @@ impl Default for Rpc {
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 struct Program {
     id: String,
     path: String,